From 0a722969a72ced13136b82d8c01939bea2c43745 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 27 七月 2023 17:21:53 +0800
Subject: [PATCH] 项目管理,数据发布修改

---
 src/views/datamanage/metadataManage.vue |    2 
 src/views/datamanage/uploadmanage.vue   |  125 ++++++++++++++++++++++++++++++++++++++++-
 src/views/datamanage/dataUpdata.vue     |    2 
 3 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 9d8762d..b4921f3 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -642,7 +642,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="listData.pageIndex"
-              :page-sizes="[10, 50, 100, 200]"
+              :page-sizes="[10, 50, 100, 200,500]"
               :page-size="listData.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="count"
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 8ee4f93..7da6dd5 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -752,7 +752,7 @@
             @size-change="handleMetaSizeChange"
             @current-change="handMetaCurrentChange"
             :current-page="listMetaData.pageIndex"
-            :page-sizes="[10, 50, 100, 200]"
+            :page-sizes="[10, 50, 100, 200,500]"
             :page-size="listMetaData.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listMetaData.count"
diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue
index f185022..7d78f65 100644
--- a/src/views/datamanage/uploadmanage.vue
+++ b/src/views/datamanage/uploadmanage.vue
@@ -93,6 +93,28 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!-- 鐩綍 -->
+        <el-form-item v-if="active == 'second'">
+          <el-select
+            size="small"
+            v-model="formInline.dirid2"
+            placeholder="璇烽�夋嫨椤圭洰鐩綍..."
+          >
+            <el-option
+              :value="formInline.dirid2"
+              :label="formInline.dirName2"
+              style="height: auto"
+            >
+              <el-tree
+                ref="tree"
+                :data="dirOption2"
+                node-key="id"
+                :props="defaultProps"
+                @node-click="handleDirChange2"
+              />
+            </el-option>
+          </el-select>
+        </el-form-item>
         <!-- 鐗堟湰 -->
         <el-form-item v-if="active == 'first'">
           <el-select
@@ -117,6 +139,22 @@
           >
             <el-option
               v-for="item in typeOption"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="active == 'second'">
+          <el-select
+            size="small"
+            v-model="formInline.type1"
+            @change="handleTypeChange1"
+            placeholder="璇烽�夋嫨鏁版嵁绫诲埆..."
+          >
+            <el-option
+              v-for="item in typeOption1"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -779,12 +817,15 @@
       active: 'first',
       formInline: {
         dirid: null,
+        dirid2: null,
         dirName: null,
+        dirName2: null,
         depid: null,
         verid: null,
         depName: null,
         name: "",
-        type: ""
+        type: "",
+        type1: "All",
       },
       listData: {
         pageIndex: 1,
@@ -794,10 +835,39 @@
       multipleSelection: [],
       tableData: [],
       depOption: [],
+      dirOption2: [],
       dirOption: [],
       verOption: [],
       modelOptions: [],
       typeOption: [{
+        value: 'DOM',
+        label: '褰卞儚鏁版嵁(.tif, .img)'
+      }, {
+        value: 'DEM',
+        label: '楂樼▼鏁版嵁(.tif)'
+      }, {
+        value: 'MPT',
+        label: '鍦烘櫙鏁版嵁(.mpt)'
+      }, {
+        value: 'OSGB',
+        label: '鍊炬枩鏁版嵁(.osgb)'
+      }, {
+        value: 'LAS',
+        label: '鐐逛簯鏁版嵁(.las, .laz)'
+      }, {
+        value: 'CPT',
+        label: '鐐逛簯鏁版嵁(.cpt)'
+      }, {
+        value: '3DML',
+        label: '涓夌淮妯″瀷(.3dml)'
+      }, {
+        value: 'BIM',
+        label: '涓夌淮妯″瀷(.fbx, .ifc, .rvt)'
+      }],
+      typeOption1: [{
+        value: 'All',
+        label: '鍏ㄩ儴'
+      }, {
         value: 'DOM',
         label: '褰卞儚鏁版嵁(.tif, .img)'
       }, {
@@ -1323,12 +1393,15 @@
     setPageStart() {
       this.formInline = {
         dirid: null,
+        dirid2: null,
         dirName: null,
+        dirName2: null,
         depid: null,
         verid: null,
         depName: null,
         name: "",
-        type: ""
+        type: "",
+        type1: "All"
       }
       if (this.active == "first") {
         this.listData = {
@@ -1343,7 +1416,10 @@
           pageSize: 10,
           count: 0
         }
-        this.showPageSize = [10, 50, 100, 200]
+        this.showPageSize = [10, 50, 100, 200, 500]
+        this.formInline.type1 = this.typeOption1[0].value;
+        this.formInline.dirid2 = this.dirOption2[0].code;
+        this.formInline.dirName2 = this.dirOption2[0].name;
       }
 
       this.formInline.type = this.typeOption[0].value;
@@ -1357,9 +1433,25 @@
         this.$message.error("鍗曚綅鍒楄〃鑾峰彇澶辫触")
         return
       }
+      var res = JSON.parse(JSON.stringify(data.result));
+      var res_val = res.filter((rs) => {
+        if (rs.pid == 0) {
+          return rs
+        }
+      })
+
+      res_val.unshift({
+        name: '鍏ㄩ儴',
+        id: 'All',
+        pid: 0,
+        code: "All"
+      })
+      this.dirOption2 = this.treeData(res_val)
       this.dirOption = this.treeData(data.result);
       this.formInline.dirid = this.dirOption[0].code;
       this.formInline.dirName = this.dirOption[0].name;
+      this.formInline.dirid2 = this.dirOption2[0].code;
+      this.formInline.dirName2 = this.dirOption2[0].name;
       this.getVerList(this.dirOption[0].id)
     },
     //鑾峰彇鐗堟湰鍒楄〃
@@ -1384,6 +1476,10 @@
       this.formInline.type = value;
       this.getTableData();
     },
+    handleTypeChange1(value) {
+      this.formInline.type1 = value;
+      this.getTableData();
+    },
     //鍗曚綅鍒楄〃鍒囨崲
     handleDepChange(data, node, nodeData) {
       this.formInline.depid = data.code
@@ -1396,6 +1492,16 @@
       this.formInline.dirName = data.name
       this.getVerList(data.id)
     },
+    //鐩綍鍒楄〃鍒囨崲
+    handleDirChange2(data, node, nodeData) {
+      this.formInline.dirid2 = data.code
+      this.formInline.dirName2 = data.name
+      this.getTableData();
+    },
+
+
+
+
     //鑾峰彇Table琛ㄦ牸鏁版嵁
     async getTableData() {
 
@@ -1436,9 +1542,18 @@
         }
       }
       else {
-        if (this.formInline.name) {
-          this.listData.name = this.formInline.name
+        this.listData.name = this.formInline.name
+        if (this.formInline.dirid2 == 'All') {
+          this.listData.dircode = this.formInline.dirid2.replace('All', '');
+        } else {
+          this.listData.dircode = this.formInline.dirid2
         }
+        if (this.formInline.type1 == 'All') {
+          this.listData.type = this.formInline.type1.replace('All', '');
+        } else {
+          this.listData.type = this.formInline.type1
+        }
+
 
         const data = await publish_selectByPage(this.listData);
 

--
Gitblit v1.9.3