列表处理

src/api/shared.js

@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+// 我的申请
+export function GetApplicationlist(params) {
+    return request({
+        url: '/apply/my/application/list',
+        method: 'get',
+        params
+    })
+}
+export function revoke(data) {
+    return request({
+        url: '/apply/my/application',
+        method: 'put',
+        data
+    })
+}
+// 我的审批
+export function Getexaminelist(params) {
+    return request({
+        url: '/apply/my/examine/list',
+        method: 'get',
+        params
+    })
+}
+//资源审批
+export function examine(data) {
+    return request({
+        url: '/apply/my/examine',
+        method: 'put',
+        data
+    })
+}
+
+// 共享位置
+export function Getfiledslist(params) {
+    return request({
+        url: '/apply/share/configuration/fileds/list',
+        method: 'get',
+        params
+    })
+}
+export function fileds(data) {
+    return request({
+        url: '/apply/share/configuration/fileds',
+        method: 'put',
+        data
+    })
+}
+

src/components/mapView/custom-detailsInfo.vue

@@ -34,7 +34,7 @@
                       popper-class="tooltipLight"
                       :content="model[item.value] + ''"
                       :disabled="
-                        model[item.value] && model[item.value].length < 10
+                        model[item.value] && model[item.value].length < 20
                       "
                       placement="top"
                     >
@@ -93,11 +93,12 @@ export default {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    line-height: 39px;
   }
   .information {
     font-size: 14px;
     font-weight: 400;
-    color: #fff;
+    // color: #fff;
     height: 39px;
     line-height: 39px;
     // white-space: nowrap;

src/views/Idleland/components/list.vue

@@ -51,7 +51,7 @@
       </div>
       <div class="item">
         <p>土地面积（亩）</p>
-        <span>{{ table.area || 0 }} </span>
+        <span>{{ table.area.toFixed(2) || 0 }} </span>
       </div>
     </div>
     <tablePage

src/views/ResourceShare/myApplication/components/addEdtModal.vue

@@ -18,12 +18,16 @@
           >
             <el-tab-pane label="申请记录" name="sqjl">
               <CustomDetails :model="formData" :config="detailInfos">
+                <template #attachment>
+                  <span>{{ formData.attachment }}</span>
+                  <i class="usable el-icon-tickets" @click="download"></i>
+                </template>
               </CustomDetails>
             </el-tab-pane>
             <el-tab-pane
               label="审核记录"
               name="shjl"
-              v-if="formData.type == 1 || formData.type == 2"
+              v-if="formData.state == 3 || formData.state == 4"
             >
               <el-tabs
                 type="border-card"
@@ -34,15 +38,22 @@
                 <el-tab-pane
                   v-for="(il, i) in formData.list"
                   :key="i"
-                  :label="il.time"
-                  :name="il.time"
+                  :label="il.sqTime"
+                  :name="il.sqTime"
                 >
                   <CustomDetails :model="il" :config="shjlInfos">
+                    <template #jg>
+                      <span> {{ stateMap[il.state].name }}</span>
+                    </template>
                   </CustomDetails>
                 </el-tab-pane>
               </el-tabs>
             </el-tab-pane>
-            <el-tab-pane label="撤回记录" name="chjl" v-if="formData.type == 3">
+            <el-tab-pane
+              label="撤回记录"
+              name="chjl"
+              v-if="formData.state == 2"
+            >
               <CustomDetails :model="formData" :config="chInfos">
               </CustomDetails>
             </el-tab-pane>
@@ -51,9 +62,9 @@
         <div v-else-if="modelType === 'withdraw'">
           <!-- :rules="rules" -->
           <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
-            <el-form-item label="撤回原因:" prop="xmmc">
+            <el-form-item label="撤回原因:" prop="sqRevokeReason">
               <el-input
-                v-model="ruleForm.xmmc"
+                v-model="ruleForm.sqRevokeReason"
                 :rows="5"
                 type="textarea"
                 placeholder="理由描述"
@@ -78,7 +89,8 @@
 
 <script>
 import CustomDetails from "@/components/mapView/custom-detailsInfo.vue";
-import { detailInfos, shjlInfos, chInfos } from "../config";
+import { detailInfos, shjlInfos, chInfos, stateMap } from "../config";
+import { revoke } from "@/api/shared.js";
 export default {
   components: {
     CustomDetails,
@@ -91,14 +103,18 @@ export default {
       chInfos: chInfos,
       modelType: "info",
       formData: {},
-      ruleForm: {},
+      ruleForm: { id: "", sqRevokeReason: "" },
       dialogVisible: false,
       activeTabs: "sqjl",
       activetime: "",
+      stateMap: stateMap,
     };
   },
   created() {},
   methods: {
+    download(obj) {
+      window.open(obj.fileUrl);
+    },
     // 关闭弹窗
     close() {
       this.dialogVisible = false;
@@ -109,11 +125,18 @@ export default {
       this.activeTabs = "sqjl";
       this.modelType = type;
       this.formData = rowdata;
-      if (this.formData.list && this.formData.list.length)
-        this.activetime = this.formData.list[0].time;
+      this.ruleForm.id = rowdata.id;
+      this.formData.list = [rowdata];
+      this.activetime = this.formData.list[0].sqTime;
+      console.log(this.formData,this.activetime)
     },
     async submit() {
-      this.close();
+      revoke(this.ruleForm).then((res) => {
+        if (res.success) {
+          this.$message.success("撤回成功！");
+          this.close();
+        }
+      });
     },
   },
 };

src/views/ResourceShare/myApplication/config.js

@@ -7,12 +7,12 @@ export const FormConfig = [
     },
     {
       label: '申请状态：',
-      prop: 'type',
+      prop: 'state',
       span: 5
     },
     {
       label: '数据服务名称：',
-      prop: 'carNo',
+      prop: 'zymlBy',
       span: 5,
       component: 'ElInput',
       componentProps: {
@@ -25,86 +25,93 @@ export const FormConfig = [
     }
   ]
 ]
+export const stateMap = [
+  { code: 0, name: "申请" },
+  { code: 1, name: "正在审核" },
+  { code: 2, name: "已撤回" },
+  { code: 3, name: "审批通过" },
+  { code: 4, name: "审批不通过" },
 
+]
 export const TableHeader = [
   // 序号
-  { label: "数据服务名称", prop: "JGMC" },
-  { label: "申请时间", prop: "XQNAME" },
-  { label: "申请状态", prop: "type", slot: "apptype" },
-  { label: "服务类型", prop: "PROPERTYNAME", slot: "type" },
-  { label: "服务地址", prop: "CARMASTER", slot: "url" },
-  { label: "截止有效期", prop: "PHONE", slot: "phone" },
-  { label: "操作", prop: "PHONE", slot: "action" },
+  { label: "数据服务名称", prop: "zymlBy" },
+  { label: "申请时间", prop: "sqTime" },
+  { label: "申请状态", prop: "state", slot: "state" },
+  { label: "服务类型", prop: "zymlTypeName", },
+  { label: "服务地址", prop: "ymlUrl", slot: "url" },
+  { label: "截止有效期", prop: "deadline", },
+  { label: "操作", slot: "action" },
 ]
 // 详情字段
 export const detailInfos = [
   [
     [
       { flag: 'label', value: '申请时间', span: 8 },
-      { flag: 'value', value: 'time', span: 16 }
+      { flag: 'value', value: 'sqTime', span: 16 }
     ],
     [
       { flag: 'label', value: '申请部门', span: 8 },
-      { flag: 'value', value: 'carTypeName', span: 16 }
+      { flag: 'value', value: 'sqDepartmentBy', span: 16 }
     ]
   ],
   [
     [
       { flag: 'label', value: '数据服务', span: 8 },
-      { flag: 'value', value: 'carColorName', span: 16 }
+      { flag: 'value', value: 'zymlBy', span: 16 }
     ],
     [
       { flag: 'label', value: '数据类型', span: 8 },
-      { flag: 'value', value: 'carBrand', span: 16 }
+      { flag: 'value', value: 'zymlTypeName', span: 16 }
     ]
   ],
   [
     [
-      { flag: 'label', value: ' 申请范围', span: 4 },
-      { flag: 'value', value: 'carPropertyName', span: 20 }
+      { flag: 'label', value: '申请范围', span: 4 },
+      { flag: 'value', value: 'sqFw', span: 20 }
     ],
   ],
   [[
     { flag: 'label', value: '申请理由', span: 4 },
-    { flag: 'value', value: 'carModel', span: 20 }
+    { flag: 'value', value: 'sqReason', span: 20 }
   ]],
   [[
     { flag: 'label', value: '系统名称', span: 4 },
-    { flag: 'value', value: 'vehicleNumber', unit: '人', span: 20 }
+    { flag: 'value', value: 'systemName', span: 20 }
   ]],
   [[
     { flag: 'label', value: '调用IP', span: 4 },
-    { flag: 'value', value: 'owner', span: 20 }
+    { flag: 'value', value: 'callIp', span: 20 }
   ]],
   [[
     { flag: 'label', value: '预期使用时间', span: 4 },
-    { flag: 'value', value: 'ownerPhone', span: 20 }
+    { flag: 'value', value: 'sqDeadline', span: 20 }
   ]],
   [[
     { flag: 'label', value: '附件', span: 4 },
-    { flag: 'value', value: 'companyImage', span: 20, isslot: true }
+    { flag: 'value', value: 'attachment', span: 20, isslot: true }
   ]]
 ]
 export const shjlInfos = [
   [[
     { flag: 'label', value: '审核结果', span: 4 },
-    { flag: 'value', value: 'jg', span: 20 }
+    { flag: 'value', value: 'jg', span: 20, isslot: true }
   ]],
   [[
     { flag: 'label', value: '审核意见', span: 4 },
-    { flag: 'value', value: 'carTypeName', span: 20 }
+    { flag: 'value', value: 'spReason', span: 20 }
   ]],
   [[
     { flag: 'label', value: '有效截止日期', span: 4 },
-    { flag: 'value', value: 'carColorName', span: 20 }
+    { flag: 'value', value: 'deadline', span: 20 }
   ]],
   [[
     { flag: 'label', value: '审核人', span: 4 },
-    { flag: 'value', value: 'carPropertyName', span: 20 }
+    { flag: 'value', value: 'sqUserBy', span: 20 }
   ]],
   [[
     { flag: 'label', value: '审核时间', span: 4 },
-    { flag: 'value', value: 'carModel', span: 20 }
+    { flag: 'value', value: 'sqTime', span: 20 }
   ]],
 ]
 export const chInfos = [

src/views/ResourceShare/myApplication/index.vue

@@ -16,8 +16,8 @@
           >
           </el-date-picker>
         </template>
-        <template #type>
-          <el-select v-model="model.placeCode" placeholder="申请状态">
+        <template #state>
+          <el-select v-model="model.state" placeholder="申请状态" clearable>
             <el-option
               v-for="item in optionList"
               :key="item.code"
@@ -43,18 +43,20 @@
         ref="tableDialogRef"
         @currentChange="searchFun"
       >
-        <template #apptype="{ row }">
-          <div :class="`type${row.type}`">{{ row.typeN }}</div>
+        <template #state="{ row }">
+          <div :class="`state${row.state}`">
+            {{ optionList[row.state].name }}
+          </div>
         </template>
         <template #url="{ row }">
-          <div v-if="row.url" @click="copyText(row.url)">
-            {{ row.url }}
+          <div v-if="row.ymlUrl" @click="copyText(row.ymlUrl)">
+            {{ row.ymlUrl }}
             <i class="el-icon-document-copy usable"></i>
           </div>
         </template>
         <template #action="{ row }">
           <span class="usable" @click="detail(row)">详情</span>
-          <span :class="{ usable: row.type == 0 }" @click="reset(row)"
+          <span :class="{ usable: row.state == 1 }" @click="revoke(row)"
             >撤回</span
           >
         </template>
@@ -69,7 +71,8 @@ import Clipboard from "clipboard";
 import tablePage from "@/components/mapView/tablePage.vue";
 import customForm from "@/components/mapView/custom-form.vue";
 import addEdt from "./components/addEdtModal.vue";
-import { FormConfig, TableHeader } from "./config";
+import { stateMap, FormConfig, TableHeader } from "./config";
+import { GetApplicationlist } from "@/api/shared.js";
 export default {
   components: {
     tablePage,
@@ -80,63 +83,54 @@ export default {
   data() {
     return {
       model: {
-        carNo: "", //网格名称
-        regionCode: "", //地区编码
-        placeCode: "", //所属小区
+        zymlBy: "",
+        state: "",
+        startTime: "",
+        endTime: "",
+        sj: ["", ""],
+        pageNum: 1,
+        pageSize: 10,
       },
       formConfig: FormConfig,
       cloumn: TableHeader,
-      table: {
-        data: [
-          { JGMC: "ssmdmm", type: 0, typeN: "正在审核" },
-          {
-            JGMC: "ssmdmm",
-            type: 1,
-            time: "2024/9/3",
-            typeN: "审核通过",
-            url: "snsd",
-            list: [
-              { time: "2024/9/3", jg: "申请通过" },
-              { time: "2024/8/13", jg: "申请通过" },
-            ],
-          },
-          {
-            JGMC: "ssmdmm",
-            type: 2,
-            typeN: "审核不通过",
-            list: [
-              { time: "2024/9/3", jg: "申请通过" },
-              { time: "2024/8/13", jg: "申请通过" },
-            ],
-          },
-          { JGMC: "ssmdmm", type: 3, typeN: "已撤回" },
-        ],
-        total: 0,
-      },
+      optionList: stateMap,
+      table: { data: [], total: 0 },
     };
   },
   methods: {
     searchFun(page) {
-      this.getTableData({ pageNo: page.pageIndex, pageSize: page.size });
+      this.getTableData(page);
     },
-    async getTableData(params) {
-      let obj = {
-        jscType: store.state.cockpit_vector.tablejscType,
-        beginTime: store.state.cockpit_date[0],
-        endTime: store.state.cockpit_date[1],
-        id: store.state.cockpit_region.id,
-        ...params,
+    async getTableData(page) {
+      this.model.pageNum = page.pageIndex;
+      this.model.pageSize = page.size;
+      this.model.startTime = this.model.sj[0];
+      this.model.endTime = this.model.sj[1];
+      let data = await GetApplicationlist(this.model);
+      // this.active_dableData = data.data;
+      this.table = {
+        data: data.rows,
+        total: data.total,
       };
-      let data = await QueryList(obj);
-      this.active_dableData = data.data;
-      this.tab.data = data.data;
+    },
+    reset() {
+      this.model = {
+        zymlBy: "",
+        state: "",
+        startTime: "",
+        endTime: "",
+        sj: ["", ""],
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.searchFun();
     },
     // 详情
     detail(row) {
       this.$refs.addEdtModal.Init("info", row);
     },
-    reset(row) {
-      if (row.type == 0) this.$refs.addEdtModal.Init("withdraw", row);
+    revoke(row) {
+      if (row.state == 1) this.$refs.addEdtModal.Init("withdraw", row);
     },
     copyText(text) {
       this.$copyText(text).then(
@@ -152,7 +146,9 @@ export default {
   },
   computed: {},
   watch: {},
-  mounted() {},
+  mounted() {
+    this.searchFun({ pageIndex: 1, size: 10 });
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/ResourceShare/myReview/components/reviewModal.vue

@@ -103,6 +103,7 @@
 <script>
 import CustomDetails from "@/components/mapView/custom-detailsInfo.vue";
 import { shjlInfos } from "../../myApplication/config";
+import { examine } from "@/api/shared.js";
 import moment from "moment";
 export default {
   components: {
@@ -142,7 +143,12 @@ export default {
     },
     generate() {},
     async submit() {
-      this.close();
+      examine(this.ruleForm).then((res) => {
+        if (res.success) {
+          this.$message.success("撤回成功！");
+          this.close();
+        }
+      });
     },
   },
 };

src/views/ResourceShare/myReview/index.vue

@@ -16,8 +16,8 @@
           >
           </el-date-picker>
         </template>
-        <template #type>
-          <el-select v-model="model.placeCode" placeholder="申请状态">
+        <template #state>
+          <el-select v-model="model.state" placeholder="申请状态" clearable>
             <el-option
               v-for="item in optionList"
               :key="item.code"
@@ -43,35 +43,37 @@
         ref="tableDialogRef"
         @currentChange="searchFun"
       >
-        <template #apptype="{ row }">
-          <div :class="`type${row.type}`">{{ row.typeN }}</div>
+        <template #state="{ row }">
+          <div :class="`state${row.state}`">
+            {{ optionList[row.state].name }}
+          </div>
         </template>
         <template #url="{ row }">
-          <div v-if="row.url" @click="copyText(row.url)">
-            {{ row.url }}
+          <div v-if="row.ymlUrl" @click="copyText(row.ymlUrl)">
+            {{ row.ymlUrl }}
             <i class="el-icon-document-copy usable"></i>
           </div>
         </template>
         <template #action="{ row }">
-          <span class="usable" @click="detail(row)">申请详情</span>
-          <span :class="{ usable: row.type == 3 }" @click="review(row)"
-            >审核</span
+          <span class="usable" @click="detail(row)">详情</span>
+          <span :class="{ usable: row.state == 2 }" @click="review(row)"
+            >撤回</span
           >
         </template>
       </tablePage>
     </div>
     <addEdt ref="addEdtModal" @close="closeMdel"></addEdt>
-    <review ref="reviewModal" @close="closeMdel"></review>
   </div>
 </template>
 
 <script>
-// import Clipboard from "clipboard";
+import Clipboard from "clipboard";
 import tablePage from "@/components/mapView/tablePage.vue";
 import customForm from "@/components/mapView/custom-form.vue";
 import addEdt from "../myApplication/components/addEdtModal.vue";
 import review from "./components/reviewModal";
-import { FormConfig, TableHeader } from "../myApplication/config";
+import { stateMap, FormConfig, TableHeader } from "../myApplication/config";
+import { Getexaminelist } from "@/api/shared.js";
 export default {
   components: {
     tablePage,
@@ -83,65 +85,54 @@ export default {
   data() {
     return {
       model: {
-        carNo: "", //网格名称
-        regionCode: "", //地区编码
-        placeCode: "", //所属小区
+        zymlBy: "",
+        state: "",
+        startTime: "",
+        endTime: "",
+        sj: ["", ""],
+        pageNum: 1,
+        pageSize: 10,
       },
       formConfig: FormConfig,
-      tableData: null,
-      details: {},
       cloumn: TableHeader,
-      table: {
-        data: [
-          { JGMC: "ssmdmm", type: 0, typeN: "正在审核" },
-          {
-            JGMC: "ssmdmm",
-            type: 1,
-            time: "2024/9/3",
-            typeN: "审核通过",
-            url: "snsd",
-            list: [
-              { time: "2024/9/3", jg: "申请通过" },
-              { time: "2024/8/13", jg: "申请通过" },
-            ],
-          },
-          {
-            JGMC: "ssmdmm",
-            type: 2,
-            typeN: "审核不通过",
-            list: [
-              { time: "2024/9/3", jg: "申请通过" },
-              { time: "2024/8/13", jg: "申请通过" },
-            ],
-          },
-          { JGMC: "ssmdmm", type: 3, typeN: "已撤回" },
-        ],
-        total: 0,
-      },
+      optionList: stateMap,
+      table: { data: [], total: 0 },
     };
   },
   methods: {
     searchFun(page) {
-      this.getTableData({ pageNo: page.pageIndex, pageSize: page.size });
+      this.getTableData(page);
     },
-    async getTableData(params) {
-      let obj = {
-        jscType: store.state.cockpit_vector.tablejscType,
-        beginTime: store.state.cockpit_date[0],
-        endTime: store.state.cockpit_date[1],
-        id: store.state.cockpit_region.id,
-        ...params,
+    async getTableData(page) {
+      this.model.pageNum = page.pageIndex;
+      this.model.pageSize = page.size;
+      this.model.startTime = this.model.sj[0];
+      this.model.endTime = this.model.sj[1];
+      let data = await Getexaminelist(this.model);
+      // this.active_dableData = data.data;
+      this.table = {
+        data: data.rows,
+        total: data.total,
       };
-      let data = await QueryList(obj);
-      this.active_dableData = data.data;
-      this.tableData = data.data;
+    },
+    reset() {
+      this.model = {
+        zymlBy: "",
+        state: "",
+        startTime: "",
+        endTime: "",
+        sj: ["", ""],
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.searchFun();
     },
     // 详情
     detail(row) {
       this.$refs.addEdtModal.Init("info", row);
     },
     review(row) {
-      if (row.type == 3) this.$refs.reviewModal.Init("review", row);
+      if (row.state == 2) this.$refs.reviewModal.Init("reviewModal", row);
     },
     copyText(text) {
       this.$copyText(text).then(
@@ -157,7 +148,9 @@ export default {
   },
   computed: {},
   watch: {},
-  mounted() {},
+  mounted() {
+    this.searchFun({ pageIndex: 1, size: 10 });
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/ResourceShare/resource.scss

@@ -18,14 +18,14 @@
     .tablePage {
       margin-top: 20px;
       height: calc(100% - 100px);
-      .type0,
-      .type3 {
+      .state1,
+      .state2 {
         color: #e6a23c;
       }
-      .type1 {
+      .state3 {
         color: #67c23a;
       }
-      .type2 {
+      .state4 {
         color: #f56c6c;
       }
       .usable {

src/views/ResourceShare/sharedLocation/components/fieldSetModal.vue

@@ -39,6 +39,7 @@
 </template>
 
 <script>
+import { fileds } from "@/api/shared.js";
 export default {
   components: {},
   props: {},
@@ -61,7 +62,12 @@ export default {
       this.dialogVisible = true;
     },
     async submit() {
-      this.close();
+      fileds(this.ruleForm).then((res) => {
+        if (res.success) {
+          this.$message.success("撤回成功！");
+          this.close();
+        }
+      });
     },
   },
 };

src/views/ResourceShare/sharedLocation/index.vue

@@ -43,7 +43,7 @@
         ref="tableDialogRef"
         @currentChange="searchFun"
       >
-        <template #apptype="{ row }">
+        <template #state="{ row }">
           <div :class="`type${row.type}`">{{ row.typeN }}</div>
         </template>
         <template #type="{ row }">
@@ -66,6 +66,7 @@ import tablePage from "@/components/mapView/tablePage.vue";
 import customForm from "@/components/mapView/custom-form.vue";
 import fieldSet from "./components/fieldSetModal.vue";
 import { FormConfig, TableHeader } from "./config";
+import { Getfiledslist } from "@/api/shared.js";
 export default {
   components: {
     tablePage,
@@ -126,7 +127,7 @@ export default {
         id: store.state.cockpit_region.id,
         ...params,
       };
-      let data = await QueryList(obj);
+      let data = await Getfiledslist(obj);
       this.active_dableData = data.data;
       this.tableData = data.data;
     },

static/Config/config.js

@@ -1,5 +1,5 @@
 //后台地址配置
-window.axiosURI = "http://192.168.100.30:8080";
+window.axiosURI = "http://192.168.60.2:8080";
 window.ZTaxiosURI = "http://localhost:9300";
 window.aiURI = "http://192.168.60.2:4000";
 //倾斜模型高度配置