Merge pull request #3023 from dataease/pr@dev_station_msg

Pr@dev station msg

frontend/src/components/widget/DeWidget/DeDate.vue

@@ -325,7 +325,7 @@ export default {
   }
 
   .el-picker-panel__link-btn:nth-child(2) {
-    color: #FFFFFF;
+    color: var(--DateColor, #409eff);
     background: var(--BgDateColor, #FFFFFF) !important;
     border:1px solid var(--BrDateColor, #dfe4ed) !important;
   }

frontend/src/views/panel/template/index.vue

@@ -257,7 +257,7 @@ export default {
       if (id) {
         templateDelete(id).then((response) => {
           this.openMessageSuccess("commons.delete_success");
-          this.getTree();
+          this.showCurrentTemplate(this.currentTemplateId, this.currentTemplateLabel);
         });
       }
     },
@@ -343,7 +343,7 @@ export default {
             this.$refs.templateList.nodeClick(obj);
           });
         } else {
-          this.showCurrentTemplate(this.currentTemplateId);
+          this.showCurrentTemplate(this.currentTemplateId, this.currentTemplateLabel);
         }
       } else {
         this.currentTemplateShowList = [];

frontend/src/views/system/task/DatasetTaskList.vue

@@ -115,7 +115,6 @@
           <template slot-scope="scope">
             <span>
               <el-link
-                style="font-size: 12px"
                 @click="jumpTaskRecord(scope.row)"
                 >{{ scope.row.name }}</el-link
               >
@@ -124,7 +123,6 @@
         </el-table-column>
         <el-table-column
           min-width="178"
-          class-name="f14"
           key="datasetName"
           prop="datasetName"
           :label="$t('dataset.task.dataset')"
@@ -665,10 +663,6 @@ export default {
   word-wrap: break-word;
   overflow: hidden;
 }
-
-span {
-  font-size: 12px;
-}
 </style>
 <style lang="scss" scoped>
 .dataset-on-time {
@@ -918,9 +912,4 @@ span {
     cursor: pointer;
   }
 }
-.f14:not(.is-leaf) {
-  .cell {
-    font-size: 12px !important;
-  }
-}
 </style>

frontend/src/views/system/task/filterUser.vue

@@ -232,12 +232,6 @@ export default {
       const datasetIdx = this.selectDatasets.findIndex((ele) => ele.id === id);
       if (datasetIdx !== -1) {
         this.selectDatasets.splice(datasetIdx, 1);
-        this.selectDatasetsCahe = this.selectDatasetsCahe.filter(
-          (ele) => ele.id !== id
-        );
-        this.datasetCahe = this.datasetCahe.filter((ele) => ele.id !== id);
-        this.$refs.datasetTreeRef.filter(id);
-        return;
       }
       this.activeDataset.push(id);
       this.selectDatasetsCahe.push({ id, name });
@@ -248,9 +242,13 @@ export default {
       const dataset = this.datasetCahe.find((ele) => ele.id === id);
       this.selectDatasets.push(dataset);
       this.activeDataset = this.activeDataset.filter((ele) => ele !== id);
+      this.datasetCahe = this.datasetCahe.filter(
+        (ele) => ele.id !== id
+      );
       this.selectDatasetsCahe = this.selectDatasetsCahe.filter(
         (ele) => ele.id !== id
       );
+      this.$refs.datasetTreeRef.filter(true);
     },
     search() {
       this.userDrawer = false;

frontend/src/views/system/user/userEditer.vue

@@ -580,7 +580,7 @@ export default {
   display: none !important;
 }
 .user-popper {
-  background: transparent;
+  background: #fff;
   padding: 0;
   .popper__arrow {
     display: none;