驾驶舱 问题整改 只显示 待整改、已整改、逾期整改、已逾期

src/views/board/charts/question/report.vue

@@ -146,7 +146,7 @@ export default {
 
       // 基于准备好的dom，初始化echarts实例
       this.myChart = echarts.init(document.getElementById("question_Chart"));
-      let { unconfirm, dissent, closed, unreform, reformed, overdue } =
+      let { unconfirm, dissent, closed, unreform, reformed,overdueReformed, overdue } =
         this.data;
       if (
         !unconfirm &&
@@ -154,6 +154,7 @@ export default {
         !closed &&
         !unreform &&
         !reformed &&
+        !overdueReformed &&
         !overdue
       ) {
         //如果全是0，饼图显示有问题
@@ -162,24 +163,25 @@ export default {
         closed = 1;
         unreform = 1;
         reformed = 1;
+        overdueReformed=1;
         overdue = 1;
       }
       let chartData = [
-        {
-          name: "待确认",
-          origin: this.data.unconfirm,
-          value: unconfirm,
-        },
-        {
-          name: "有异议",
-          origin: this.data.dissent,
-          value: dissent,
-        },
-        {
-          name: "已关闭",
-          origin: this.data.closed,
-          value: closed,
-        },
+        // {
+        //   name: "待确认",
+        //   origin: this.data.unconfirm,
+        //   value: unconfirm,
+        // },
+        // {
+        //   name: "有异议",
+        //   origin: this.data.dissent,
+        //   value: dissent,
+        // },
+        // {
+        //   name: "已关闭",
+        //   origin: this.data.closed,
+        //   value: closed,
+        // },
         {
           name: "待整改",
           origin: this.data.unreform,
@@ -191,17 +193,23 @@ export default {
           value: reformed,
         },
         {
+          name: "逾期整改",
+          origin: this.data.overdueReformed,
+          value: overdueReformed,
+        },
+        {
           name: "已逾期",
           origin: this.data.overdue,
           value: overdue,
         },
         {
           value: this.sum(
-            unconfirm,
-            dissent,
-            closed,
+            // unconfirm,
+            // dissent,
+            // closed,
             unreform,
             reformed,
+            overdueReformed,
             overdue
           ),
           itemStyle: {
@@ -229,7 +237,7 @@ export default {
         },
         title: {
           text: `总数： ${this.data.total}`,
-          subtext: `整改率： ${Math.round(this.data.reformed * 100)}%`,
+          subtext: `整改率： ${Math.round((this.data.reformed+this.data.overdueReformed) * 100)}%`,
           left: "center",
           top: "50%",
           textStyle: {

src/views/core/drill/task/index.vue

@@ -149,13 +149,13 @@
             />
             <el-table-column
               label="地区"
-              width="100"
+              width="80"
               align="center"
               prop="affiliatedArea"
             />
             <el-table-column
               label="行社名称"
-              width="200"
+              width="150"
               align="center"
               prop="affiliatedBank"
             />
@@ -239,6 +239,7 @@
               align="center"
               class-name="small-padding fixed-width"
               width="380"
+              fixed="right"
             >
               <template slot-scope="scope">
                 <el-button

src/views/core/reportForms/drill.vue

@@ -161,6 +161,26 @@ export default {
 
       //this.getList();
     },
+     //单选框状态改变
+    //  checkChange(state) {
+    //   this.queryParams.checkSub = state;
+    //   this.getList();
+    // },
+        // 节点单击事件
+      clickTreeNode(data) {
+      if(data==null){
+        return;
+      }
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      // this.loadPlanList();
+     // this.loadRoles(data.id);
+      this.getList();
+    },
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+    },
     /** 查询机构树数据 */
     getDeptTree() {
       deptTreeSelect().then((response) => {

src/views/core/reportForms/eduTraining.vue

@@ -187,6 +187,24 @@ export default {
         children: node.children,
       };
     },
+     //单选框状态改变
+    // checkChange(state) {
+    //   this.queryParams.checkSub = state;
+    //   this.getList();
+    // },
+        // 节点单击事件
+    clickTreeNode(data) {
+      if(data==null){
+        return;
+      }
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      this.getList();
+    },
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+    },
     //获取列表
     getList() {
       this.loading = true;

src/views/question/list/index.vue

@@ -46,7 +46,7 @@
                   clearable
                 >
                   <el-option
-                    v-for="dict in dict.type.question_confirm_status"
+                    v-for="dict in dict.type.app_question_status"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -217,8 +217,8 @@
               <template slot-scope="scope">
                 <span>{{
                   getLabel(
-                    dict.type.question_confirm_status,
-                    scope.row.overdueStatus
+                    dict.type.app_question_status,
+                    scope.row.reformStatus ? scope.row.reformStatus : scope.row.overdueStatus
                       ? scope.row.overdueStatus
                       : scope.row.confirmStatus
                   )
@@ -330,7 +330,7 @@ export default {
       ],
     };
   },
-  dicts: ["question_confirm_status"],
+  dicts: ["question_confirm_status","app_question_status"],
   components: { OrgTree, Dialog, DataRangePicker },
   computed: {
     ...mapGetters(["orgId", "userId", "orgName"]),

src/views/question/reform/index.vue

@@ -126,7 +126,7 @@
               label="地区"
               prop="affiliatedArea"
               show-overflow-tooltip
-              min-width="80"
+              min-width="60"
               v-if="columns[6].visible"
             />
             <el-table-column
@@ -134,7 +134,7 @@
               label="行社名称"
               prop="affiliatedBank"
               show-overflow-tooltip
-              min-width="120"
+              min-width="80"
               v-if="columns[7].visible"
             />
             <el-table-column
@@ -167,7 +167,7 @@
               align="center"
               label="整改期限"
               prop="submitTime"
-              width="140"
+              width="150"
               v-if="columns[4].visible"
             >
               <template slot-scope="scope">
@@ -187,7 +187,7 @@
                 <span>{{
                   getLabel(
                     dict.type.question_reform_status,
-                    scope.row.overdueStatus
+                    scope.row.overdueStatus && scope.row.reformStatus!=13
                       ? scope.row.overdueStatus
                       : scope.row.reformStatus
                   )