fix bug

src/views/sensitive-control/data-in.vue

@@ -16,7 +16,7 @@
       </el-form-item>
 
       <el-form-item label="申请日期" prop="dingdingDate">
-        <el-select v-model="queryParams.dingdingDate" placeholder="请选择" @change="handleDatechange">
+        <el-select v-model="queryParams.dingdingDate" placeholder="请选择" @change="handleDatechange" clearable>
           <el-option v-for="item in dingdingDateList" :key="item" :label="item" :value="item"></el-option>
         </el-select>
       </el-form-item>
@@ -26,6 +26,7 @@
           v-model="queryParams.dataSheetName"
           placeholder="请选择"
           @change="handleSheetchange"
+          clearable
         >
           <el-option v-for="item in sheetList" :key="item" :label="item" :value="item"></el-option>
         </el-select>
@@ -415,7 +416,7 @@ export default {
               type: "success",
               message: "关闭成功!"
             });
-            this.getDataList(this.currentPage, {});
+            this.getDataList(this.currentPage, this.queryParams);
           }
         );
       });
@@ -450,7 +451,7 @@ export default {
               type: "success",
               message: "通知成功!"
             });
-            this.getDataList(this.currentPage, {});
+            this.getDataList(this.currentPage, this.queryParams);
           }
         );
       });
@@ -487,7 +488,7 @@ export default {
     },
     // 数据导入成功之后的通知方法
     saveSuccess() {
-      this.getDataList(this.currentPage, {});
+      this.getDataList(this.currentPage, this.queryParams);
     },
     // 封装一下请求通用的方法
     getData(type, url, req, callback) {

src/views/sensitive-control/data-statistic.vue

@@ -2,7 +2,7 @@
   <div class="data-in-wrap">
     <el-form ref="form" :model="queryParams" label-width="100px" :inline="true" :rules="rules">
       <el-form-item label="项目名称" prop="projectMainId">
-        <el-select v-model="queryParams.projectMainId" placeholder="请选择项目">
+        <el-select v-model="queryParams.projectMainId" placeholder="请选择项目" clearable>
           <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
@@ -22,7 +22,12 @@
       </el-form-item>
 
       <el-form-item label="申请日期" prop="dingdingDate">
-        <el-select v-model="queryParams.dingdingDate" placeholder="请选择" @change="handleDatechange">
+        <el-select
+          v-model="queryParams.dingdingDate"
+          placeholder="请选择"
+          @change="handleDatechange"
+          clearable
+        >
           <el-option v-for="item in dingdingDateList" :key="item" :label="item" :value="item"></el-option>
         </el-select>
       </el-form-item>
@@ -32,6 +37,7 @@
           v-model="queryParams.dataSheetName"
           placeholder="请选择"
           @change="handleSheetchange"
+          clearable
         >
           <el-option v-for="item in sheetList" :key="item" :label="item" :value="item"></el-option>
         </el-select>
@@ -74,7 +80,12 @@
 
     <el-dialog :visible.sync="setTagVisible" :close-on-click-modal="false" width="500px">
       <p class="dialog-title">项目标签设置</p>
-      <el-select v-model="queryParams.projectMainId" placeholder="请选择项目" style="margin-left: 110px">
+      <el-select
+        v-model="queryParams.projectMainId"
+        @change="handleLabelchange"
+        placeholder="请选择项目"
+        style="margin-left: 110px"
+      >
         <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
       </el-select>
       <div style="margin-top: 20px; margin-left: 110px">
@@ -251,6 +262,7 @@ export default {
       tag03: "",
       tag04: "",
       tag05: "",
+      tagList: [this.tag01, this.tag02, this.tag03, this.tag04, this.tag05],
       labelCount: 1,
       labelList: [],
       allLabelList: [],
@@ -374,6 +386,7 @@ export default {
   },
   created() {
     //获取项目名称列表
+    console.log("created() : enter");
     this.getProjectNameList();
     // 初始化获取数据列表
     // this.getDataList(this.currentPage, {});
@@ -393,6 +406,7 @@ export default {
     //项目标签设置
     showProjectTag() {
       this.setTagVisible = true;
+      this.getHistoryLabel();
       this.getAllLabel();
     },
     getAllLabel() {
@@ -405,6 +419,27 @@ export default {
         }
       );
     },
+    getHistoryLabel() {
+      // this.getData(
+      //   "get",
+      //   `/sensitive/dataStatistics/getLabel?projectMainId=${this.queryParams.projectMainId}`,
+      //   {},
+      //   (data) => {
+      //     this.labelList = data.data;
+      //     if (this.labelList) {
+      //       this.labelCount = this.labelList.length;
+      //       if (this.labelCount > 0) {
+      //         for(let item in labelList) {
+      //           this.tagList[item] = this.labelList[item];
+      //         }
+      //       }
+      //     }
+      //   }
+      // );
+    },
+    handleLabelchange() {
+      this.getHistoryLabel();
+    },
     addTagNew() {
       this.labelCount++;
     },
@@ -489,11 +524,11 @@ export default {
     },
     setStatusSave() {
       this.statusList = [
-        {id:0, value:this.status01},
-        {id:1, value:this.status02},
-        {id:2, value:this.status03},
-        {id:3, value:this.status04},
-        {id:4, value:this.status05},
+        { id: 0, value: this.status01 },
+        { id: 1, value: this.status02 },
+        { id: 2, value: this.status03 },
+        { id: 3, value: this.status04 },
+        { id: 4, value: this.status05 },
       ];
       let req = {
         list: this.statusList,
@@ -590,7 +625,7 @@ export default {
         );
       } else {
         this.dingdingDateList = [];
-        this.projectList = [];
+        // this.projectList = [];
         this.sheetList = [];
         this.queryParams.dingdingDate = "";
         this.queryParams.dataSheetName = "";

src/views/sensitive-control/data-view.vue

@@ -32,7 +32,7 @@
           <el-option v-for="item in sheetsList" :key="item" :label="item" :value="item"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="标记状态" prop="sheet">
+      <el-form-item label="标记状态">
         <el-select v-model="ruleForm.labelStatus" size="small" placeholder="请选择" clearable>
           <el-option
             v-for="item in dataProjectStates"