From f0032ece16f53462766e1f4420401de10a4f4cad Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 25 十一月 2022 17:50:52 +0800
Subject: [PATCH] 1

---
 src/api/api.js                        |    3 +
 src/views/datamanage/dataLoader.vue   |   65 ++++++++++++++++++---
 src/components/navMenu.vue            |   13 ++++
 src/views/datamanage/domainManage.vue |   14 ++--
 src/views/datamanage/dataUpdata.vue   |   36 +++++++++++
 5 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index cb378b1..6fcce81 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -537,6 +537,9 @@
 export function dataLoader_selectFiles(params) {
   return request.get('/dataLoader/selectFiles?path=' + params);
 }
+export function dataLoader_InsertFiles(params) {
+  return request.post('/dataLoader/insertFiles', params);
+}
 //鏁版嵁鍏ュ簱=>鑾峰彇鏌ヨ鏄犲皠
 export function dataLoader_selectMappers(params) {
   return request.get('/dataLoader/selectMappers?path=' + params);
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 0d4895a..9825020 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -494,5 +494,18 @@
   /deep/ .el-link.el-link--default {
     color: white !important;
   }
+  /deep/ ul.el-menu-vertical-demo.el-menu {
+    // 娣诲姞鑳屾櫙棰滆壊
+    background-image: rgba(255, 255, 255, 0.1) !important;
+  }
+
+  /deep/ li.el-menu-item.is-active {
+    // 娣诲姞鏍峰紡锛屽彧閽堝瀵艰埅鏍忛鑿滃崟
+    background-color: transparent;
+  }
+  .el-submenu /deep/.el-submenu__title:hover {
+    color: #2e95fb !important;
+    background: linear-gradient(#112f57, #122344) !important;
+  }
 }
 </style>
diff --git a/src/views/datamanage/dataLoader.vue b/src/views/datamanage/dataLoader.vue
index bd6e1d7..0be226f 100644
--- a/src/views/datamanage/dataLoader.vue
+++ b/src/views/datamanage/dataLoader.vue
@@ -137,6 +137,11 @@
               type="info"
               >{{ $t('common.reset') }}</el-button
             >
+              <el-button @click="setWarehouseDel"
+              icon="el-icon-folder-delete"
+              type="danger"
+              >{{ $t('common.delete') }}</el-button
+            >
           </el-form-item>
         </el-form>
       </div>
@@ -146,7 +151,12 @@
 
         style="width:99%"
         height="92%"
+         @selection-change="handleDelteChange"
  >
+   <el-table-column
+      type="selection"
+      width="55">
+    </el-table-column>
         <el-table-column
           align="center"
           type="index"
@@ -297,10 +307,11 @@
   dataLoader_selectVerByDirid,
   dataLoader_selectFiles,
   dataUploadDeleteFiles,
-  dataUploadInsertFiles,
+  dataLoader_InsertFiles,
   dataLoader_selectMappers,
   dataLoader_SelectTabs,
-  dataLoader_selectByPageForUpload
+  dataLoader_selectByPageForUpload,
+  deleteMeta
 } from '../../api/api';
 export default {
   name: 'dataUpdata',
@@ -357,6 +368,7 @@
       activeName2: '',
       activeName3: '',
       wareTableFlag: null,
+      multipleDelete:[],
     };
   },
 
@@ -435,6 +447,27 @@
             }
             this.getAllWareTable();
     },
+   async setWarehouseDel(){
+var std = [];
+          for (var i in this.multipleDelete) {
+            std.push(this.multipleDelete[i].id);
+          }
+          const res = await deleteMeta({ids: std.toString() })
+          if(res.code != 200){
+            this.$message.error('鍒犻櫎澶辫触');
+          }else{
+               this.$message({
+          message: '鍒犻櫎鎴愬姛',
+          type: 'success'
+        });
+        this.listData.pageIndex=1;
+        this.listData.pageSize = 10;
+           this.getAllWareTable();
+          }
+    },
+    handleDelteChange(val){
+    this.multipleDelete = val;
+    },
     setWarehouseReset(){
      this.formWarehousing.name='';
    this.listData={
@@ -486,10 +519,11 @@
    async setInsrtWareTable(){
       var obj = {
                   metaEntity: this.formInline,
-                  fileEntities: this.tableWareThree
+                      fileEntities: this.tableData,
+                  tabEntities: this.tableWareThree
                 };
+            const res = await dataLoader_InsertFiles(JSON.stringify(obj));
 
-            const res = await dataUploadInsertFiles(JSON.stringify(obj));
              if (res.code != 200) {
         this.$message.error('鏁版嵁鍏ュ簱澶辫触');
         return;
@@ -558,28 +592,34 @@
       var value1 = this.tableWareThree[res];
       value1.entity = null;
         value1.tabDesc= null;
-      this.tableWareOne.push(value1);
+        if(this.tableWareOne.indexOf(value1)!=-1 ){
+
+        }else{
+            this.tableWareOne.push(value1);
       this.tableWareThree.splice(res, 1)
       this.activeName = '';
       this.activeName2 = '';
       this.activeName3 = '';
+        }
+
     },
     setWareTableChangeRight() {
 
       this.wareSelectOne.entity = this.wareSelectTwo.entity;
           this.wareSelectOne.tabDesc = this.wareSelectTwo.tabDesc;
+  if(this.tableWareThree.indexOf(this.wareSelectOne) != -1){
 
-      this.tableWareThree.push(this.wareSelectOne)
-
+  }else{
+ this.tableWareThree.push(this.wareSelectOne)
       this.tableWareOne.forEach((value, index, array) => {
         if (value.tab == this.wareSelectOne.tab) {
           this.tableWareOne.splice(index, 1)
         }
-
       })
    this.activeName = '';
       this.activeName2 = '';
       this.activeName3 = '';
+  }
     },
     singleElection(row) {
       this.wareSelectOne = row;
@@ -650,7 +690,7 @@
       //             fileEntities: this.multipleSelection
       //           };
 
-      //       const res = await dataUploadInsertFiles(JSON.stringify(obj));
+      //       const res = await dataLoader_InsertFiles(JSON.stringify(obj));
 
       //        if (res.code != 200) {
       //       this.$message.error('鏂囦欢鍏ュ簱澶辫触');
@@ -698,11 +738,14 @@
 
           this.getFileLength();
 
-          alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+           this.$message({
+          message: '鏁版嵁涓婁紶鎴愬姛',
+          type: 'success'
+        });
 
         },
         error: (rs) => {
-          alert("涓婁紶鏂囦欢澶辫触锛�");
+          this.$message.error('鏁版嵁涓婁紶澶辫触');
         }
       });
 
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index b465ab4..5925249 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -152,16 +152,24 @@
               type="info"
               >{{ $t('common.reset') }}</el-button
             >
+             <el-button @click="setWarehouseDel"
+              icon="el-icon-folder-delete"
+              type="danger"
+              >{{ $t('common.delete') }}</el-button
+            >
           </el-form-item>
         </el-form>
       </div>
    <div class="contentTable" style="height:500px">
    <el-table
      :data="waretableData"
-
+   @selection-change="handleDelteChange"
         style="width:99%"
         height="92%"
  >
+    <el-table-column
+      type="selection"
+      width="55"/>
         <el-table-column
           align="center"
           type="index"
@@ -266,7 +274,7 @@
 import MyBread from '../../components/MyBread.vue';
 import { getToken } from '@/utils/auth';
 import { selectdirTab, queryDepTree, dataUploadSelectVerByDirid, dataUploadSelectPath, dataUploadSelectFiles, dataUploadDeleteFiles, dataUploadInsertFiles,
-dataUpload_selectByPageForUpload} from '../../api/api';
+dataUpload_selectByPageForUpload,deleteMeta} from '../../api/api';
 export default {
   name: 'dataUpdata',
   components: {
@@ -347,10 +355,34 @@
       },
       deep: true,
       immediate: true,
+      multipleDelete:[]
     },
   },
 
   methods: {
+
+  async setWarehouseDel(){
+          var std = [];
+          for (var i in this.multipleDelete) {
+            std.push(this.multipleDelete[i].id);
+          }
+          const res = await deleteMeta({ids: std.toString() })
+          if(res.code != 200){
+            this.$message.error('鍒犻櫎澶辫触');
+          }else{
+               this.$message({
+          message: '鍒犻櫎鎴愬姛',
+          type: 'success'
+        });
+        this.listData.pageIndex=1;
+        this.listData.pageSize = 10;
+           this.getAllWareTable();
+          }
+    },
+    handleDelteChange(val){
+    this.multipleDelete = val;
+    },
+
     changetimeFile(res){
 
 //shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue
index 6a5cb82..2c00b88 100644
--- a/src/views/datamanage/domainManage.vue
+++ b/src/views/datamanage/domainManage.vue
@@ -19,10 +19,7 @@
       <div class="right">
         <div class="inquire">
           <el-form ref="queryForm" :model="queryForm" :inline="true">
-            <el-form-item
-              :label="$t('dataManage.domainManage.domCode')"
-              prop="name"
-            >
+            <el-form-item :label="$t('dataManage.vmobj.keyword')" prop="name">
               <el-input
                 v-model="queryForm.code"
                 :placeholder="$t('common.pleaseInput')"
@@ -375,6 +372,8 @@
       this.fullscreenLoading = true;
       this.listData.ns = data.ns;
       this.listData.tab = data.tab;
+      this.listData.pageIndex = 1;
+      this.listData.pageSize = 10;
       const res = await domain_selectDomainNames(data);
       if (res.code != 200) {
         this.$message.error('domain璋冪敤澶辫触');
@@ -388,6 +387,7 @@
       }
       this.domainOptions = std;
       this.editForm.domName = res.result[0];
+
       getSingleTab(this.listData).then((res) => {
         setTimeout(() => {
           if (res.code == 200) {
@@ -429,7 +429,7 @@
 
     queryInfo() {
       let searchData = {
-        code: this.queryForm.code,
+        name: this.queryForm.code,
         ns: this.listData.ns,
         tab: this.listData.tab,
         pageIndex: this.listData.pageIndex,
@@ -452,7 +452,9 @@
       this.queryForm = {};
       this.$store.state.verCateNode = {};
       this.$bus.$emit('clearTressLabel', true);
-      this.getAllTabelData();
+      this.listData.pageIndex = 1;
+      this.listData.pageSize = 10;
+      this.queryInfo();
     },
     // 鍒犻櫎澶氭潯
     deleteInfo() {

--
Gitblit v1.9.3