test

src/components/chartView/index.vue

@@ -6,7 +6,7 @@
           {{ data.title }}
         </div>
         <div class="tip">
-          <span v-for="item in data.option" :key="item.key" class="item">
+          <span v-for="item in data.option" :key="item.key" class="item" @click="$emit('changeList', item.code)">
             <span class="title">{{ item.key }}：</span>
             <span class="num">{{ item.value }}</span>
           </span>
@@ -120,6 +120,7 @@ export default {
       .item {
         display: inline-block;
         margin-right: 15px;
+        cursor: pointer;
         .title {
           font-size: 14px;
           color: #444;

src/components/filterModal/index.vue

@@ -61,7 +61,7 @@ export default {
   /deep/.el-dialog {
     margin: 0px!important;
     margin-left: calc(100% - 470px)!important;
-    top: 110px;
+    top: 60px;
   }
   .dialog-title {
     font-size: 16px;
@@ -72,6 +72,9 @@ export default {
     padding: 10px 20px 10px;
     border-top: 1px solid #e2e2e2;
   }
+  /deep/.el-dialog__body {
+    padding: 20px
+  }
   /deep/.el-dialog__header {
     border-bottom: 1px solid #e2e2e2;
     padding: 15px;

src/views/projectManage/requirement/list/index.vue

@@ -717,27 +717,52 @@ export default {
       this.getFilterList()
     },
     reset() {
-      this.$set(this.searchForm, 'id', '')
-      this.$set(this.searchForm, 'pm', '')
-      this.$set(this.searchForm, 'priorityList', [])
-      this.$set(this.searchForm, 'belongingProject', '')
-      this.$set(this.searchForm, 'sourceType', '')
-      this.$set(this.searchForm, 'creator', '')
-      this.$set(this.searchForm, 'type', '')
-      this.$set(this.searchForm, 'containStatus', [])
-      this.$set(this.searchForm, 'comparisonOperator', '')
-      this.$set(this.searchForm, 'days', '')
-      this.$set(this.searchForm, 'rqmtProposer', '')
-      this.$set(this.searchForm, 'sourceTypeList', [])
-      this.$set(this.searchForm, 'isFromDpm', '')
-      this.$set(this.searchForm, 'date', [])
-      this.$message({
-        message: '已重置',
-        type: 'success',
-        duration: 1000,
-        offset: 150
-      })
-      this.getTableData()
+      // this.$set(this.searchForm, 'id', '')
+      // this.$set(this.searchForm, 'pm', '')
+      // this.$set(this.searchForm, 'priorityList', [])
+      // this.$set(this.searchForm, 'belongingProject', '')
+      // this.$set(this.searchForm, 'sourceType', '')
+      // this.$set(this.searchForm, 'creator', '')
+      // this.$set(this.searchForm, 'type', '')
+      // this.$set(this.searchForm, 'containStatus', [])
+      // this.$set(this.searchForm, 'comparisonOperator', '')
+      // this.$set(this.searchForm, 'days', '')
+      // this.$set(this.searchForm, 'rqmtProposer', '')
+      // this.$set(this.searchForm, 'sourceTypeList', [])
+      // this.$set(this.searchForm, 'isFromDpm', '')
+      // this.$set(this.searchForm, 'date', [])
+      // this.$message({
+      //   message: '已重置',
+      //   type: 'success',
+      //   duration: 1000,
+      //   offset: 150
+      // })
+      // 重置
+      this.searchForm = {
+        ...this.searchForm,
+        id: '',
+        pm: '',
+        priorityList: [],
+        belongingProject: '',
+        sourceType: '',
+        creator: '',
+        type: '',
+        containStatus: [],
+        comparisonOperator: '',
+        days: '',
+        rqmtProposer: '',
+        sourceTypeList: [],
+        isFromDpm: '',
+        date: []
+      }
+      if (this.nowTab === 'charts') {
+        this.searchForm = { ...this.searchForm, rqmtOrntIds: [], name: '', statusList: [] }
+      }
+      if (this.nowTab === 'charts') {
+        this.get_charts()
+      } else {
+        this.getTableData()
+      }
     },
     async remoteMethod(query) {
       // 人员查询

src/views/projectManage/taskList/taskIndex.vue

@@ -707,12 +707,17 @@ export default {
         this.form_task = { ...this.form_task, moduleIds: [], name: '', statusList: [] }
       }
       this.updateChartSearchFormValue()
-      this.$message({
-        message: '已重置',
-        type: 'success',
-        duration: 1000,
-        offset: 150
-      })
+      if (this.nowTab === 'charts') {
+        this.get_charts()
+      } else {
+        this.get_taskList()
+      }
+      // this.$message({
+      //   message: '已重置',
+      //   type: 'success',
+      //   duration: 1000,
+      //   offset: 150
+      // })
     },
     handleSizeChange(size) {
       //  分页