共享字段

src/api/shared.js

@@ -31,6 +31,14 @@ export function examine(data) {
     })
 }
 
+// 查询数据资源目录列表
+export function listZyml(params) {
+    return request({
+        url: '/system/zyml/list',
+        method: 'get',
+        params
+    })
+}
 // 共享位置
 export function Getfiledslist(params) {
     return request({
@@ -39,6 +47,7 @@ export function Getfiledslist(params) {
         params
     })
 }
+
 export function fileds(data) {
     return request({
         url: '/apply/share/configuration/fileds',

src/views/ResourceShare/myApplication/config.js

@@ -117,11 +117,11 @@ export const shjlInfos = [
 export const chInfos = [
   [[
     { flag: 'label', value: '撤回时间', span: 4 },
-    { flag: 'value', value: 'carNo', span: 20 }
+    { flag: 'value', value: 'sqRevokeTime', span: 20 }
   ]],
   [[
     { flag: 'label', value: '撤回原因', span: 4 },
-    { flag: 'value', value: 'carTypeName', span: 20 }
+    { flag: 'value', value: 'sqRevokeReason', span: 20 }
   ]],
 ]
 

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

@@ -19,20 +19,20 @@
             <el-tab-pane label="审核" name="sh">
               <div>
                 <div class="create" @click="generate">生成并查看服务</div>
-                服务地址：{{ formData.url }}
+                服务地址：{{ formData.ymlUrl }}
               </div>
               <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
-                <el-form-item label="审核结论:" prop="shjl">
-                  <el-radio v-model="ruleForm.shjl" label="1">
+                <el-form-item label="审核结论:" prop="state">
+                  <el-radio v-model="ruleForm.state" label="3">
                     申请通过
                   </el-radio>
-                  <el-radio v-model="ruleForm.shjl" label="2">
+                  <el-radio v-model="ruleForm.state" label="4">
                     申请不通过
                   </el-radio>
                 </el-form-item>
-                <el-form-item label="使用截止日期:" prop="jzrq">
+                <el-form-item label="使用截止日期:" prop="deadline">
                   <el-date-picker
-                    v-model="ruleForm.jzrq"
+                    v-model="ruleForm.deadline"
                     type="date"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期"
@@ -40,9 +40,9 @@
                   </el-date-picker>
                   (默认一年)
                 </el-form-item>
-                <el-form-item label="审核意见:" prop="xmmc">
+                <el-form-item label="审核意见:" prop="spReason">
                   <el-input
-                    v-model="ruleForm.xmmc"
+                    v-model="ruleForm.spReason"
                     :rows="5"
                     type="textarea"
                     placeholder="描述"
@@ -50,20 +50,20 @@
                 </el-form-item>
                 <el-row :gutter="20" class="elrow">
                   <el-col :span="12">
-                    <el-form-item label="审核时间" prop="shsj">
+                    <el-form-item label="审核时间" prop="spTime">
                       <el-date-picker
-                        v-model="ruleForm.shsj"
-                        type="date"
-                        value-format="yyyy-MM-dd"
+                        v-model="ruleForm.spTime"
+                        type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss"
                         placeholder="自动读取"
                       >
                       </el-date-picker>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="审核人" prop="shr">
+                    <el-form-item label="审核人" prop="spUserBy">
                       <el-input
-                        v-model="ruleForm.shr"
+                        v-model="ruleForm.spUserBy"
                         placeholder="自动读取"
                       ></el-input>
                     </el-form-item>
@@ -71,7 +71,7 @@
                 </el-row>
               </el-form>
             </el-tab-pane>
-            <el-tab-pane label="审核记录" name="shjl">
+            <!-- <el-tab-pane label="审核记录" name="state">
               <el-tabs
                 type="border-card"
                 class="xz_box"
@@ -88,7 +88,7 @@
                   </CustomDetails>
                 </el-tab-pane>
               </el-tabs>
-            </el-tab-pane>
+            </el-tab-pane> -->
           </el-tabs>
         </div>
       </div>
@@ -116,7 +116,14 @@ export default {
 
       modelType: "info",
       formData: {},
-      ruleForm: {},
+      ruleForm: {
+        id: "",
+        state: "",
+        deadline: "",
+        spReason: "",
+        spTime: "",
+        spUserBy: "",
+      },
       dialogVisible: false,
       activeTabs: "sh",
       activetime: "",
@@ -129,23 +136,35 @@ export default {
       this.dialogVisible = false;
       this.$emit("close");
     },
+    reset(id) {
+      var dateTime = new Date().getFullYear();
+      this.ruleForm = {
+        id: id,
+        state: "",
+        deadline: moment(new Date(new Date().setFullYear(dateTime + 1))).format(
+          "YYYY-MM-DD"
+        ),
+        spReason: "",
+        spTime: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+        spUserBy: "admin",
+      };
+    },
     Init(type, rowdata) {
       this.dialogVisible = true;
       this.activeTabs = "sh";
       // this.modelType = type;
       this.formData = rowdata;
-      if (this.formData.list && this.formData.list.length)
-        this.activetime = this.formData.list[0].time;
-      var dateTime = new Date().getFullYear();
-      this.ruleForm.jzrq = moment(
-        new Date(new Date().setFullYear(dateTime + 1))
-      ).format("YYYY-MM-DD");
+      this.reset(rowdata.id);
+      // this.formData.list = [rowdata];
+      // this.activetime = this.formData.list[0].spTime;
+    },
+    generate() {
+      window.open(this.formData.ymlUrl);
     },
-    generate() {},
     async submit() {
       examine(this.ruleForm).then((res) => {
-        if (res.success) {
-          this.$message.success("撤回成功！");
+        if (res.code == 200) {
+          this.$message.success("审核成功！");
           this.close();
         }
       });

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

@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { fileds } from "@/api/shared.js";
+import { Getfiledslist, fileds } from "@/api/shared.js";
 export default {
   components: {},
   props: {},
@@ -61,6 +61,18 @@ export default {
       this.formData = rowdata;
       this.dialogVisible = true;
     },
+    async getTableData(page = { pageIndex: 1, size: 10 }) {
+      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 Getfiledslist(this.model);
+      // this.active_dableData = data.data;
+      this.table = {
+        data: data.rows,
+        total: data.total,
+      };
+    },
     async submit() {
       fileds(this.ruleForm).then((res) => {
         if (res.success) {

src/views/ResourceShare/sharedLocation/config.js

@@ -28,9 +28,9 @@ export const FormConfig = [
 
 export const TableHeader = [
   // 序号
-  { label: "数据服务名称", prop: "JGMC" },
-  { label: "服务类型", prop: "XQNAME" },
-  { label: "注册时间", prop: "time" },
+  { label: "数据服务名称", prop: "name" },
+  { label: "服务类型", prop: "type" },
+  { label: "注册时间", prop: "createTime" },
   { label: "服务地址", prop: "url" },
   { label: "数据范围", prop: "PHONE", },
   { label: "共享状态", prop: "PROPERTYNAME", slot: "type" },

src/views/ResourceShare/sharedLocation/index.vue

@@ -40,12 +40,10 @@
         class="tablePage"
         :cloumn="cloumn"
         :table="table"
+        :showTotal="false"
         ref="tableDialogRef"
         @currentChange="searchFun"
       >
-        <template #state="{ row }">
-          <div :class="`type${row.type}`">{{ row.typeN }}</div>
-        </template>
         <template #type="{ row }">
           <el-checkbox v-model="row.checked" @change="changeShare(row)">
             共享
@@ -66,7 +64,8 @@ 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";
+import { Getfiledslist, listZyml } from "@/api/shared.js";
+import { handleTree } from "@/utils/ruoyi.js";
 export default {
   components: {
     tablePage,
@@ -76,15 +75,23 @@ export default {
   props: {},
   data() {
     return {
+      queryParams: {
+        name: null,
+        type: null,
+        state: null,
+        year: null,
+      },
       model: {
-        carNo: "", //网格名称
+        id: "23fa916114494640b71988d9858474c3",
         regionCode: "", //地区编码
         placeCode: "", //所属小区
+        startTime: "",
+        endTime: "",
+        sj: ["", ""],
       },
       formConfig: FormConfig,
-      tableData: null,
-      details: {},
       cloumn: TableHeader,
+      table: { data: [], total: 0 },
       table: {
         data: [
           { JGMC: "ssmdmm", type: 0, typeN: "正在审核", checked: false },
@@ -117,30 +124,66 @@ export default {
   },
   methods: {
     searchFun(page) {
-      this.getTableData({ pageNo: page.pageIndex, pageSize: page.size });
+      this.getList(page);
+    },
+    /** 查询数据资源目录列表 */
+    getList() {
+      this.loading = true;
+      listZyml(this.queryParams).then((response) => {
+        // this.zymlList = handleTree(response.data, "bsm", "pbsm");
+        // this.loading = false;
+        this.table = {
+          data: handleTree(response.data, "bsm", "pbsm"),
+        };
+        console.log(this.zymlList);
+      });
+    },
+    getTreeselect() {
+      listZyml().then((response) => {
+        this.zymlOptions = [];
+        const data = { bsm: 0, name: "根节点", children: [] };
+        data.children = handleTree(response.data, "bsm", "pbsm");
+        this.zymlOptions.push(data);
+      });
     },
-    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 = { pageIndex: 1, size: 10 }) {
+      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 Getfiledslist(this.model);
+      // this.active_dableData = data.data;
+      this.table = {
+        data: data.rows,
+        total: data.total,
       };
-      let data = await Getfiledslist(obj);
-      this.active_dableData = data.data;
-      this.tableData = data.data;
+    },
+    reset() {
+      this.model = {
+        zymlBy: "",
+        state: "",
+        startTime: "",
+        endTime: "",
+        sj: ["", ""],
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.searchFun();
     },
     // 详情
     fieldset(row) {
       this.$refs.fieldSetModal.Init(row);
     },
     changeShare(row) {},
-    closeMdel() {},
+    closeMdel() {
+      this.searchFun();
+    },
   },
   computed: {},
   watch: {},
-  mounted() {},
+  mounted() {
+    this.searchFun();
+  },
 };
 </script>
 <style lang="scss" scoped>