From 414647aa49baf3f4989ea2dfca7df7ba76a32a00 Mon Sep 17 00:00:00 2001
From: loveflow <5269966+loveflow@user.noreply.gitee.com>
Date: Mon, 8 Apr 2024 00:28:34 +0800
Subject: [PATCH] update

---
 .../enterpriseRiskIndex/synthetical/index.js  |   2 +-
 .../enterpriseTeamWork/riskOverview/index.js  |   8 +
 src/loveflow/assets/reset.less                |   1 +
 src/loveflow/components/echart/bar/three.vue  |  22 +-
 src/loveflow/components/echart/pie/dPie.vue   |  51 ++--
 src/loveflow/mixins/commonMixins.js           |  46 +++-
 src/views/enterpriseRiskIndex/analysis.vue    | 115 ++++++--
 .../components/tableCard.vue                  |   6 +-
 src/views/enterpriseRiskIndex/estimate.vue    |  15 +-
 .../enterpriseRiskIndex/estimateDetail.vue    |  14 +
 src/views/enterpriseRiskIndex/synthetical.vue | 252 +++++++----------
 .../components/timeSelect.vue                 |   8 +-
 .../problemAnalysis/index.vue                 | 205 +++++++-------
 .../enterpriseTeamWork/riskHandle/index.vue   |  38 ++-
 .../enterpriseTeamWork/riskOverview/dpie.vue  |  43 ++-
 .../enterpriseTeamWork/riskOverview/index.vue | 253 +++++++++---------
 .../riskOverview/indexDuty.vue                |  58 ++--
 .../riskOverview/indexRisk.vue                | 147 ++++++----
 .../enterpriseTeamWork/riskOverview/pie.vue   |   2 +-
 19 files changed, 709 insertions(+), 577 deletions(-)

diff --git a/src/api/enterpriseRiskIndex/synthetical/index.js b/src/api/enterpriseRiskIndex/synthetical/index.js
index 969e1c8..1a38ced 100644
--- a/src/api/enterpriseRiskIndex/synthetical/index.js
+++ b/src/api/enterpriseRiskIndex/synthetical/index.js
@@ -2,7 +2,7 @@ import request from "@/utils/request";
 //企业综合风险雷达图
 export function enterpriseComprehensiveRisk() {
   return request({
-    url: "/IntegratedRisk/EnterpriseComprehensiveRisk",
+    url: "/IntegratedRisk/RadarMap",
     method: "post",
   });
 }
diff --git a/src/api/enterpriseTeamWork/riskOverview/index.js b/src/api/enterpriseTeamWork/riskOverview/index.js
index 9b06114..b58cc1c 100644
--- a/src/api/enterpriseTeamWork/riskOverview/index.js
+++ b/src/api/enterpriseTeamWork/riskOverview/index.js
@@ -84,6 +84,14 @@ export function typeanstreetcount() {
     method: "get",
   });
 }
+//统计企业类型与所属街道
+export function listingsupervision(params) {
+  return request({
+    url: "/synergism/listingsupervision",
+    method: "post",
+    params,
+  });
+}
 
 // 已办任务查询
 export function testFlow(data) {
diff --git a/src/loveflow/assets/reset.less b/src/loveflow/assets/reset.less
index 98c53ce..f9879cb 100644
--- a/src/loveflow/assets/reset.less
+++ b/src/loveflow/assets/reset.less
@@ -76,6 +76,7 @@
       .el-input-number {
         .el-input-number__decrease,
         .el-input-number__increase {
+          color: #eaf6ff;
           height: 34px;
           line-height: 34px;
           border-right: 0.1px solid #495e70;
diff --git a/src/loveflow/components/echart/bar/three.vue b/src/loveflow/components/echart/bar/three.vue
index c492c4f..741bdf1 100644
--- a/src/loveflow/components/echart/bar/three.vue
+++ b/src/loveflow/components/echart/bar/three.vue
@@ -19,11 +19,14 @@ export default {
     };
   },
   mounted() {
-    this.setOption();
+    setTimeout(() => {
+      this.setOption();
+    }, 500);
   },
   methods: {
     setOption() {
-      let data = this.chartObj.data;
+      let data = JSON.parse(JSON.stringify(this.chartObj.data));
+      console.log(data);
       let total = 0;
       for (let i = 0; i < data.length; i++) {
         total += data[i].value;
@@ -159,6 +162,12 @@ export default {
       };
     },
     pyramidChart(data = [], dom, option = {}) {
+      if (data.length > 3) {
+        data[0]["value"] = 334;
+        data[1]["value"] = 234;
+        data[2]["value"] = 134;
+        data[3]["value"] = 84;
+      }
       let domHeight = dom ? dom.clientHeight : 0;
       let domWidth = dom ? dom.clientWidth : 0;
       // 默认获取一个正方形空间
@@ -314,5 +323,14 @@ export default {
       });
     },
   },
+  watch: {
+    chartObj: {
+      handler(newval) {
+        this.setOption();
+      },
+      deep: true,
+      // immediate: true,
+    },
+  },
 };
 </script>
diff --git a/src/loveflow/components/echart/pie/dPie.vue b/src/loveflow/components/echart/pie/dPie.vue
index adda418..a2605bf 100644
--- a/src/loveflow/components/echart/pie/dPie.vue
+++ b/src/loveflow/components/echart/pie/dPie.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="dpiePanel">
     <div class="dpieLegend">
-      <div class="dpieCol" v-for="item in data" :key="item.name">
+      <div
+        class="dpieCol"
+        v-for="(item, index) in chartObj.list"
+        :key="item.name + index"
+      >
         <span>
           <div class="dpieRow">
             <div
@@ -12,7 +16,7 @@
           </div>
           <div class="dpieRow">
             <div class="dpieRate">
-              {{ parseInt((item.value * 100) / total) }}%
+              {{ parseInt((item.value * 100) / chartObj.total) }}%
             </div>
           </div>
         </span>
@@ -29,41 +33,24 @@
 import * as echarts from "echarts";
 import "echarts-gl";
 export default {
+  props: {
+    chartObj: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
   data() {
     return {
-      data: [
-        {
-          name: "危险化学品",
-          value: 134,
-          itemStyle: {
-            color: "rgba(55,141,255,1)",
-          },
-        },
-        {
-          name: "重点人员",
-          value: 156,
-          itemStyle: {
-            color: "rgba(72,238,189,1)",
-          },
-        },
-        {
-          name: "民爆物品",
-          value: 127,
-          itemStyle: {
-            color: "rgba(255,209,106,1)",
-          },
-        },
-      ],
-      total: 1,
+      data: [],
     };
   },
   mounted() {
-    this.total = 1;
-    for (let i = 0; i < this.data.length; i++) {
-      this.total += this.data[i].value;
-    }
-
-    this.setOption();
+    this.data = JSON.parse(JSON.stringify(this.chartObj.list));
+    setTimeout(() => {
+      this.setOption();
+    }, 500);
   },
   methods: {
     setOption() {
diff --git a/src/loveflow/mixins/commonMixins.js b/src/loveflow/mixins/commonMixins.js
index 81ffc44..b0b0f70 100644
--- a/src/loveflow/mixins/commonMixins.js
+++ b/src/loveflow/mixins/commonMixins.js
@@ -134,16 +134,20 @@ export const commonMixins = {
       //状态
       stateList: [
         {
-          name: "未完成",
-          value: "0",
+          name: "已整改",
+          value: "已整改",
         },
         {
-          name: "整改中",
-          value: "1",
+          name: "按照要求整改",
+          value: "按照要求整改",
         },
         {
-          name: "已完成",
-          value: "2",
+          name: "正在整改",
+          value: "正在整改",
+        },
+        {
+          name: "未按要求整改",
+          value: "未按要求整改",
         },
       ],
       //企业类型
@@ -165,8 +169,8 @@ export const commonMixins = {
           value: "合成材料企业",
         },
         {
-          name: "其他类型",
-          value: "其他类型",
+          name: "其他",
+          value: "其他",
         },
       ],
       //处置方式
@@ -209,18 +213,34 @@ export const commonMixins = {
           name: "镇海区公安局",
           value: "镇海区公安局",
         },
+        {
+          name: "应急管理局",
+          value: "应急管理局",
+        },
         {
           name: "镇海区交通局",
           value: "镇海区交通局",
         },
         {
-          name: "市场监督管理局",
-          value: "市场监督管理局",
+          name: "镇海区卫健局",
+          value: "镇海区卫健局",
+        },
+        {
+          name: "区市场监督管理局",
+          value: "区市场监督管理局",
+        },
+        {
+          name: "区委网信办",
+          value: "区委网信办",
         },
         {
           name: "区大数据中心",
           value: "区大数据中心",
         },
+        {
+          name: "石化开发区管委会",
+          value: "石化开发区管委会",
+        },
       ],
       //消息类型
       infoTypeList: [
@@ -358,5 +378,11 @@ export const commonMixins = {
         return "";
       }
     },
+   /*  formatTime(arr) {
+      if (arr.length) {
+        let sTime = arr[0].format
+        return []
+      }
+    }, */
   },
 };
diff --git a/src/views/enterpriseRiskIndex/analysis.vue b/src/views/enterpriseRiskIndex/analysis.vue
index c97f16d..7aeb192 100644
--- a/src/views/enterpriseRiskIndex/analysis.vue
+++ b/src/views/enterpriseRiskIndex/analysis.vue
@@ -65,7 +65,6 @@ export default {
         name: "风险监测项评分排行",
         list: [],
       },
-      trObj: {},
       tmObj: {
         xData: [],
         yData: [],
@@ -79,17 +78,8 @@ export default {
         list: [],
       },
       blObj: {
-        xData: [
-          "人员安全",
-          "危化品运输",
-          "防攻击管理",
-          "消防安全",
-          "列管物品",
-          "道路安全",
-          "内部治安",
-          "网络安全",
-        ],
-        yData: [212, 211, 313, 149, 195, 11, 164, 172],
+        xData: [],
+        yData: [],
         name: "风险标签排行",
         list: [],
       },
@@ -107,26 +97,35 @@ export default {
         list: [],
       },
       brObj: {
-        data: [
-          {
-            name: "危险化学品",
-            value: 134,
-          },
+        data: [],
+        name: "异常风险得分对比",
+        list: [],
+      },
+      trObj: {
+        total: 0,
+        list: [
           {
-            name: "民爆物品",
-            value: 334,
+            name: "",
+            value: 0,
+            itemStyle: {
+              color: "rgba(55,141,255,1)",
+            },
           },
           {
-            name: "重点人员",
-            value: 234,
+            name: "",
+            value: 0,
+            itemStyle: {
+              color: "rgba(72,238,189,1)",
+            },
           },
           {
-            name: "流动人员",
-            value: 84,
+            name: "",
+            value: 0,
+            itemStyle: {
+              color: "rgba(255,209,106,1)",
+            },
           },
         ],
-        name: "风险标签排行",
-        list: [],
       },
     };
   },
@@ -144,7 +143,13 @@ export default {
         }
       });
 
-      riskLabelRanking().then((res) => {});
+      riskLabelRanking().then((res) => {
+        if (res.code == 200) {
+          let data = res.data || [];
+          this.blObj.list = data;
+          this.blTime("day");
+        }
+      });
 
       frequentChangeRisk().then((res) => {
         if (res.code == 200) {
@@ -162,9 +167,34 @@ export default {
         }
       });
 
-      riskItemScore().then((res) => {});
+      riskItemScore().then((res) => {
+        if (res.code == 200) {
+          let data = res.data || [];
+          let total = 0;
+          for (let i = 0; i < data.length; i++) {
+            this.trObj.list[i]["value"] = data[i]["score"];
+            this.trObj.list[i]["name"] = data[i]["riskName"];
+            total += data[i]["score"];
+          }
+          this.trObj.total = total;
+          console.log("tr:", this.trObj);
+        }
+      });
 
-      abnormalRiskScore().then((res) => {});
+      abnormalRiskScore().then((res) => {
+        if (res.code == 200) {
+          let data = res.data || [];
+          this.brObj.data = [];
+
+          for (let i = 0; i < data.length; i++) {
+            this.brObj.data.push({
+              name: data[i]["riskName"],
+              value: data[i]["score"],
+            });
+          }
+          console.log(this.brObj);
+        }
+      });
     },
 
     tlTime(val) {
@@ -237,7 +267,34 @@ export default {
       }
     },
     trTime(val) {},
-    blTime(val) {},
+    blTime(val) {
+      this.blObj.yData = [];
+      this.blObj.xData = [];
+
+      let list = [];
+      let index = 0;
+      if (val == "day") {
+        index = 0;
+      }
+      if (val == "week") {
+        index = 0;
+      }
+      if (val == "month") {
+        index = 1;
+      }
+      if (val == "season") {
+        index = 1;
+      }
+      if (val == "year") {
+        index = 2;
+      }
+      list = this.blObj.list;
+      console.log(list);
+      for (let i = 0; i < list.length; i++) {
+        this.blObj.xData.push(list[i]["riskName"]);
+        this.blObj.yData.push(list[i]["score"]);
+      }
+    },
     bmTime(val) {
       this.bmObj.yData = [];
       this.bmObj.xData = [];
diff --git a/src/views/enterpriseRiskIndex/components/tableCard.vue b/src/views/enterpriseRiskIndex/components/tableCard.vue
index ef012ef..bcd626d 100644
--- a/src/views/enterpriseRiskIndex/components/tableCard.vue
+++ b/src/views/enterpriseRiskIndex/components/tableCard.vue
@@ -6,11 +6,13 @@
     <div class="cardRow">
       <div class="cardCol">
         <div class="cardLabel">创建人：</div>
-        <div class="cardValue">{{ dataObj.creator }}</div>
+        <div class="cardValue">{{ dataObj.createBy }}</div>
       </div>
       <div class="cardCol">
         <div class="cardLabel">模板类型：</div>
-        <div class="cardValue cardValueBg">{{ dataObj.model }}</div>
+        <div class="cardValue cardValueBg">
+          {{ dataObj.type == "1" ? "通用模板" : "其他模板" }}
+        </div>
       </div>
       <div class="cardCol">
         <div v-if="!back" class="optWrap flex-center" @click="checkDetail()">
diff --git a/src/views/enterpriseRiskIndex/estimate.vue b/src/views/enterpriseRiskIndex/estimate.vue
index cfdb06c..8bb12a4 100644
--- a/src/views/enterpriseRiskIndex/estimate.vue
+++ b/src/views/enterpriseRiskIndex/estimate.vue
@@ -26,8 +26,6 @@ import topicMain from "./components/topicMain.vue";
 import tableCard from "./components/tableCard.vue";
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
 
-import { queryListDetails } from "@/api/enterpriseRiskIndex/estimate/index.js";
-
 export default {
   components: { topicMain, tableCard },
   mixins: [tableListMixins],
@@ -45,9 +43,7 @@ export default {
     };
   },
   created() {},
-  mounted() {
-    this.getData();
-  },
+  mounted() {},
   methods: {
     checkDetail(item) {
       console.log(item);
@@ -56,15 +52,6 @@ export default {
         query: item,
       });
     },
-
-    getData() {
-      queryListDetails({ companyBusinessRiskId: 4 }).then((res) => {
-        if (res.code == 200) {
-          let data = res.data || [];
-          console.log(data);
-        }
-      });
-    },
   },
 };
 </script>
diff --git a/src/views/enterpriseRiskIndex/estimateDetail.vue b/src/views/enterpriseRiskIndex/estimateDetail.vue
index c48b712..ee46ff2 100644
--- a/src/views/enterpriseRiskIndex/estimateDetail.vue
+++ b/src/views/enterpriseRiskIndex/estimateDetail.vue
@@ -188,6 +188,7 @@ import leftCard from "./components/leftCard.vue";
 import rightCard from "./components/rightCard.vue";
 import dPie from "@/loveflow/components/echart/pie/dPie.vue";
 import barThree from "@/loveflow/components/echart/bar/three.vue";
+import { queryListDetails } from "@/api/enterpriseRiskIndex/estimate/index.js";
 
 export default {
   components: {
@@ -394,14 +395,27 @@ export default {
         yData: [12, 11, 13, 14, 15, 11, 14, 12],
         name: "企业综合风险趋势图",
       },
+      companyBusinessRiskId: "",
     };
   },
   mounted() {
     console.log(this.$route);
     this.info = this.$route.query;
+    this.companyBusinessRiskId = this.info.id;
     this.show = true;
+    this.getData();
   },
   methods: {
+    getData() {
+      queryListDetails({
+        companyBusinessRiskId: this.companyBusinessRiskId,
+      }).then((res) => {
+        if (res.code == 200) {
+          let data = res.data || [];
+          console.log(data);
+        }
+      });
+    },
     goBack() {
       //this.$router.push("/riskIndex/estimate");
       this.$router.back();
diff --git a/src/views/enterpriseRiskIndex/synthetical.vue b/src/views/enterpriseRiskIndex/synthetical.vue
index bb245a7..0abe251 100644
--- a/src/views/enterpriseRiskIndex/synthetical.vue
+++ b/src/views/enterpriseRiskIndex/synthetical.vue
@@ -31,7 +31,7 @@
     </div>
     <div class="screenRow">
       <div class="screenCol mr14">
-        <colWrap title="风险标签排行" @changeTime="blTime">
+        <colWrap title="全区企业风险预警总量" @changeTime="blTime">
           <div class="riskTotalPanel">
             <total-card :dataObj="totalData"></total-card>
           </div>
@@ -48,13 +48,13 @@
       <div class="screenCol">
         <colWrap title="异常风险得分对比" :time="false">
           <div class="riskUpWrap">
-            <div class="totalTop">
+            <div class="totalMid" v-for="item in brList" :key="item.name">
               <div class="left">
-                <div class="totalName fontsize16">本年风险标签总量</div>
+                <div class="totalName fontsize16">{{ item.name }}</div>
                 <div class="totalValue">
                   <div class="item">
                     <div class="value fontsize22">
-                      {{ total.toLocaleString() }}
+                      {{ item.total.toLocaleString() }}
                     </div>
                   </div>
                 </div>
@@ -64,107 +64,11 @@
                 <div class="totalValue">
                   <div class="item">
                     <div class="label fontsize14">同比增长</div>
-                    <div class="value fontsize22">2%</div>
+                    <div class="value fontsize22">{{ item.tb }}%</div>
                   </div>
                   <div class="item">
                     <div class="label fontsize14">环比增长</div>
-                    <div class="value fontsize22">3%</div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="totalMid">
-              <div class="left">
-                <div class="totalName fontsize16">本季度风险标签总量</div>
-                <div class="totalValue">
-                  <div class="item">
-                    <div class="value fontsize22">
-                      {{ total2.toLocaleString() }}
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="right">
-                <div class="totalName fontsize16">增长趋势</div>
-                <div class="totalValue">
-                  <div class="item">
-                    <div class="label fontsize14">同比增长</div>
-                    <div class="value fontsize22">4%</div>
-                  </div>
-                  <div class="item">
-                    <div class="label fontsize14">环比增长</div>
-                    <div class="value fontsize22">3%</div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="totalBtm">
-              <div class="left">
-                <div class="totalName fontsize16">当月风险标签总量</div>
-                <div class="totalValue">
-                  <div class="item">
-                    <div class="value fontsize22">
-                      {{ total1.toLocaleString() }}
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="right">
-                <div class="totalName fontsize16">增长趋势</div>
-                <div class="totalValue">
-                  <div class="item">
-                    <div class="label fontsize14">同比增长</div>
-                    <div class="value fontsize22">2%</div>
-                  </div>
-                  <div class="item">
-                    <div class="label fontsize14">环比增长</div>
-                    <div class="value fontsize22">1%</div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="totalBtm">
-              <div class="left">
-                <div class="totalName fontsize16">本周风险标签总量</div>
-                <div class="totalValue">
-                  <div class="item">
-                    <div class="value fontsize22">32</div>
-                  </div>
-                </div>
-              </div>
-              <div class="right">
-                <div class="totalName fontsize16">增长趋势</div>
-                <div class="totalValue">
-                  <div class="item">
-                    <div class="label fontsize14">同比增长</div>
-                    <div class="value fontsize22">2%</div>
-                  </div>
-                  <div class="item">
-                    <div class="label fontsize14">环比增长</div>
-                    <div class="value fontsize22">1%</div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="totalBtm">
-              <div class="left">
-                <div class="totalName fontsize16">当日风险标签总量</div>
-                <div class="totalValue">
-                  <div class="item">
-                    <div class="value fontsize22">12</div>
-                  </div>
-                </div>
-              </div>
-              <div class="right">
-                <div class="totalName fontsize16">增长趋势</div>
-                <div class="totalValue">
-                  <div class="item">
-                    <div class="label fontsize14">同比增长</div>
-                    <div class="value fontsize22">2%</div>
-                  </div>
-                  <div class="item">
-                    <div class="label fontsize14">环比增长</div>
-                    <div class="value fontsize22">1%</div>
+                    <div class="value fontsize22">{{ item.hb }}%</div>
                   </div>
                 </div>
               </div>
@@ -219,11 +123,11 @@ export default {
       },
       lefData: {
         name: "高风险企业总数",
-        value: "78",
+        value: 0,
       },
       righData: {
-        tb: 1,
-        hb: 2,
+        tb: 0,
+        hb: 0,
       },
       totalData: {
         name: "风险标签总量",
@@ -241,18 +145,10 @@ export default {
       tmObj: {
         gridTop: "15%",
         gridBtm: "15%",
-        xData: [
-          "人员安全",
-          "危化品运输",
-          "防攻击管理",
-          "消防安全",
-          "列管物品",
-          "道路安全",
-          "内部治安",
-          "网络安全",
-        ],
-        yData: [12, 11, 13, 14, 15, 11, 14, 12],
+        xData: [],
+        yData: [],
         name: "企业综合风险趋势图",
+        list: [],
       },
       blObj: {
         height: 0,
@@ -290,17 +186,11 @@ export default {
           "#B276FF",
           "#FF6AEE",
         ],
-        data: [
-          { value: 1048, name: "澥浦镇" },
-          { value: 735, name: "九龙湖镇" },
-          { value: 580, name: "照宝山街道" },
-          { value: 484, name: "蛟川街道" },
-          { value: 567, name: "骆驼街道" },
-          { value: 489, name: "贵驷街道" },
-          { value: 517, name: "庄市街道" },
-        ],
+        data: [],
         name: "全区企业风险预警总量",
+        list: [],
       },
+      brList: [],
     };
   },
   mounted() {
@@ -318,11 +208,15 @@ export default {
       tendencyChart().then((res) => {
         if (res.code == 200) {
           let data = res.data || [];
+          this.tmObj.list = data;
+          this.tmTime("day");
         }
       });
       ventureBusiness().then((res) => {
         if (res.code == 200) {
           let data = res.data || [];
+          this.trObj.list = data;
+          this.trTime("day");
         }
       });
       riskEarlyWarning().then((res) => {
@@ -342,6 +236,32 @@ export default {
       growthTrend().then((res) => {
         if (res.code == 200) {
           let data = res.data || [];
+          for (let i = 0; i < data.length; i++) {
+            let arr = data[i];
+            let name = "";
+            let total = 0;
+            let tb = 0;
+            let hb = 0;
+            for (let j = 0; j < arr.length; j++) {
+              if (arr[j]["riskName"].indexOf("标签总量") > -1) {
+                name = arr[j]["riskName"];
+                total = arr[j]["score"];
+              }
+              if (arr[j]["riskName"] == "同比增长") {
+                tb = arr[j]["score"];
+              }
+              if (arr[j]["riskName"] == "环比增长") {
+                hb = arr[j]["score"];
+              }
+            }
+
+            this.brList.push({
+              name: name,
+              total: total,
+              tb: tb,
+              hb: hb,
+            });
+          }
         }
       });
     },
@@ -365,7 +285,7 @@ export default {
       if (val == "year") {
         index = 2;
       }
-      list = this.tlObj.list[index];
+      list = this.tlObj.list;
 
       for (let i = 0; i < list.length; i++) {
         let name = list[i]["riskName"].replace(/分析/, "");
@@ -380,40 +300,74 @@ export default {
       }
     },
     tmTime(val) {
+      this.tmObj.xData = [];
+      this.tmObj.yData = [];
+      let list = [];
+      let index = 0;
       if (val == "day") {
-        this.leftData.value = 78;
-        this.rightData.tb = 1;
-        this.rightData.hb = 2;
-        this.tmObj.yData = [12, 11, 13, 14, 15, 11, 14, 12];
+        index = 0;
+      }
+      if (val == "week") {
+        index = 0;
       }
       if (val == "month") {
-        this.leftData.value = 212;
-        this.rightData.tb = 9;
-        this.rightData.hb = 11;
-        this.tmObj.yData = [341, 314, 411, 531, 461, 288, 189, 351];
+        index = 2;
+      }
+      if (val == "season") {
+        index = 2;
       }
       if (val == "year") {
-        this.leftData.value = 811;
-        this.rightData.tb = 4;
-        this.rightData.hb = 5;
-        this.tmObj.yData = [1312, 1231, 1253, 1456, 1327, 1571, 1468, 1278];
+        index = 2;
+      }
+      list = this.tmObj.list[index];
+
+      for (let i = 0; i < list.length; i++) {
+        if (list[i]["riskName"] == "同比增长") {
+          this.rightData.tb = list[i]["score"];
+        } else if (list[i]["riskName"] == "环比增长") {
+          this.rightData.hb = list[i]["score"];
+        } else if (list[i]["riskName"] == "综合风险总量") {
+          this.leftData.value = list[i]["score"];
+        } else {
+          this.tmObj.xData.push(list[i]["riskName"]);
+          this.tmObj.yData.push(list[i]["score"]);
+        }
       }
     },
     trTime(val) {
+      this.trObj.data = [];
+      let list = [];
+      let index = 0;
       if (val == "day") {
-        this.lefData.value = 78;
-        this.righData.tb = 1;
-        this.righData.hb = 2;
+        index = 0;
+      }
+      if (val == "week") {
+        index = 0;
       }
       if (val == "month") {
-        this.lefData.value = 212;
-        this.righData.tb = 9;
-        this.righData.hb = 11;
+        index = 2;
+      }
+      if (val == "season") {
+        index = 2;
       }
       if (val == "year") {
-        this.lefData.value = 811;
-        this.righData.tb = 4;
-        this.righData.hb = 5;
+        index = 2;
+      }
+      list = this.trObj.list[index];
+
+      for (let i = 0; i < list.length; i++) {
+        if (list[i]["riskName"] == "同比增长") {
+          this.righData.tb = list[i]["score"];
+        } else if (list[i]["riskName"] == "环比增长") {
+          this.righData.hb = list[i]["score"];
+        } else if (list[i]["riskName"] == "综合风险总量") {
+          this.lefData.value = list[i]["score"];
+        } else {
+          this.trObj.data.push({
+            name: list[i]["riskName"],
+            value: list[i]["score"],
+          });
+        }
       }
     },
     blTime(val) {
@@ -471,8 +425,8 @@ export default {
       list = this.bmObj.list[index];
 
       for (let i = 0; i < list.length; i++) {
-        if (!this.bmObj.xData.includes(list[i]["month"] || i + "月")) {
-          this.bmObj.xData.push(list[i]["month"] || i + "月");
+        if (!this.bmObj.xData.includes(list[i]["time"] || i + "月")) {
+          this.bmObj.xData.push(list[i]["time"] || i + "月");
         }
         if (!this.bmObj.legend.includes(list[i]["riskName"])) {
           this.bmObj.legend.push(list[i]["riskName"]);
diff --git a/src/views/enterpriseTeamWork/components/timeSelect.vue b/src/views/enterpriseTeamWork/components/timeSelect.vue
index 76615ab..03e9fbe 100644
--- a/src/views/enterpriseTeamWork/components/timeSelect.vue
+++ b/src/views/enterpriseTeamWork/components/timeSelect.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="chartOpt">
-    <div @click="changeTime('month')" :class="{ active: curTime == 'month' }">
+    <div @click="changeTime('月度')" :class="{ active: curTime == '月度' }">
       月度统计
     </div>
-    <div @click="changeTime('season')" :class="{ active: curTime == 'season' }">
+    <div @click="changeTime('季度')" :class="{ active: curTime == '季度' }">
       季度统计
     </div>
-    <div @click="changeTime('year')" :class="{ active: curTime == 'year' }">
+    <div @click="changeTime('年度')" :class="{ active: curTime == '年度' }">
       年度统计
     </div>
   </div>
@@ -16,7 +16,7 @@
 export default {
   data() {
     return {
-      curTime: "month",
+      curTime: "月度",
     };
   },
   methods: {
diff --git a/src/views/enterpriseTeamWork/problemAnalysis/index.vue b/src/views/enterpriseTeamWork/problemAnalysis/index.vue
index ffca3e5..9b05c53 100644
--- a/src/views/enterpriseTeamWork/problemAnalysis/index.vue
+++ b/src/views/enterpriseTeamWork/problemAnalysis/index.vue
@@ -12,39 +12,39 @@
       <div class="screenRow screenRowTop pb14">
         <div class="rowTopWrap mr16">
           <colWrap title="招宝山街道">
-            <barWrap :chartObj="wtObj"></barWrap>
+            <barWrap :chartObj="zbsObj"></barWrap>
           </colWrap>
         </div>
         <div class="rowTopWrap mr16">
           <colWrap title="九龙湖镇">
-            <barWrap :chartObj="wtObj"></barWrap>
+            <barWrap :chartObj="jlhObj"></barWrap>
           </colWrap>
         </div>
         <div class="rowTopWrap mr16">
           <colWrap title="蟹浦镇">
-            <barWrap :chartObj="wtObj"></barWrap>
+            <barWrap :chartObj="xpObj"></barWrap>
           </colWrap>
         </div>
         <div class="rowTopWrap">
           <colWrap title="蛟川街道">
-            <barWrap :chartObj="wtObj"></barWrap>
+            <barWrap :chartObj="jcObj"></barWrap>
           </colWrap>
         </div>
       </div>
       <div class="screenRow screenRowBtm">
         <div class="rowBtmWrap mr16">
           <colWrap title="骆驼街道">
-            <barWrap :chartObj="wtObj"></barWrap>
+            <barWrap :chartObj="ltObj"></barWrap>
           </colWrap>
         </div>
         <div class="rowBtmWrap mr16">
           <colWrap title="庄市街道">
-            <barWrap :chartObj="wtObj"></barWrap>
+            <barWrap :chartObj="zsObj"></barWrap>
           </colWrap>
         </div>
         <div class="rowBtmWrap">
           <colWrap title="贵驷街道">
-            <barWrap :chartObj="wtObj"></barWrap>
+            <barWrap :chartObj="gsObj"></barWrap>
           </colWrap>
         </div>
       </div>
@@ -79,114 +79,137 @@ export default {
       timeList: [
         {
           name: "月度",
-          value: "month",
+          value: "本月",
         },
         {
           name: "季度",
-          value: "season",
+          value: "本季度",
         },
         {
           name: "年度",
-          value: "year",
+          value: "本年度",
         },
         {
           name: "历史",
-          value: "history",
+          value: "历史",
         },
       ],
-      wtObj: {
-        data: [
-          { name: "流动人员核查率异常", value: 23 },
-          { name: "重点人员流动异常", value: 17 },
-          { name: "值班人员配备异常", value: 15 },
-          { name: "灭火器数量不达标", value: 13 },
-          { name: "危险品使用人员资质异常", value: 9 },
-          { name: "夜间值班人员不足", value: 7 },
-        ],
+      zbsObj: {
+        data: [],
       },
+      jlhObj: {
+        data: [],
+      },
+      xpObj: {
+        data: [],
+      },
+      jcObj: {
+        data: [],
+      },
+      ltObj: {
+        data: [],
+      },
+      zsObj: {
+        data: [],
+      },
+      gsObj: {
+        data: [],
+      },
+      curTime: "本月",
+      curTab: "1",
     };
   },
   mounted() {
-    this.getData();
+    this.timeChange(this.curTime);
   },
   methods: {
-    getData() {
-      highincidenceproblems({ message: "本年度" }).then((res) => {
-        if (res.code == 200) {
-          let data = res.data || {};
-        }
-      });
-      importincidenceproblems({ message: "本年度" }).then((res) => {
-        if (res.code == 200) {
-          let data = res.data || {};
-        }
-      });
-    },
     typeChange(val) {
-      console.log(val);
-      if (val == "1") {
-        this.wtObj.data = [
-          { name: "流动人员核查率异常", value: 23 },
-          { name: "重点人员流动异常", value: 17 },
-          { name: "值班人员配备异常", value: 15 },
-          { name: "灭火器数量不达标", value: 13 },
-          { name: "危险品使用人员资质异常", value: 9 },
-          { name: "夜间值班人员不足", value: 7 },
-        ];
-      }
-      if (val == "2") {
-        this.wtObj.data = [
-          { name: "夜间值班人员不足", value: 33 },
-          { name: "重点人员流动异常", value: 27 },
-          { name: "流动人员核查率异常", value: 25 },
-          { name: "危险品使用人员资质异常", value: 23 },
-          { name: "灭火器数量不达标", value: 19 },
-          { name: "值班人员配备异常", value: 11 },
-        ];
-      }
+      this.curTab = val;
+      this.timeChange(this.curTime);
     },
     timeChange(val) {
       console.log(val);
-      if (val == "month") {
-        this.wtObj.data = [
-          { name: "流动人员核查率异常", value: 23 },
-          { name: "重点人员流动异常", value: 17 },
-          { name: "值班人员配备异常", value: 15 },
-          { name: "灭火器数量不达标", value: 13 },
-          { name: "危险品使用人员资质异常", value: 9 },
-          { name: "夜间值班人员不足", value: 7 },
-        ];
+      this.curTime = val;
+      this.zbsObj.data = [];
+      this.jlhObj.data = [];
+      this.xpObj.data = [];
+      this.jcObj.data = [];
+      this.ltObj.data = [];
+      this.zsObj.data = [];
+      this.gsObj.data = [];
+      if (this.curTab == 1) {
+        highincidenceproblems({ message: val }).then((res) => {
+          if (res.code == 200) {
+            let data = res.data || {};
+            this.dealData(data);
+          }
+        });
       }
-      if (val == "season") {
-        this.wtObj.data = [
-          { name: "流动人员核查率异常", value: 73 },
-          { name: "重点人员流动异常", value: 67 },
-          { name: "值班人员配备异常", value: 55 },
-          { name: "灭火器数量不达标", value: 53 },
-          { name: "危险品使用人员资质异常", value: 19 },
-          { name: "夜间值班人员不足", value: 17 },
-        ];
+      if (this.curTab == 2) {
+        importincidenceproblems({ message: val }).then((res) => {
+          if (res.code == 200) {
+            let data = res.data || {};
+            this.dealData(data);
+          }
+        });
       }
-      if (val == "year") {
-        this.wtObj.data = [
-          { name: "流动人员核查率异常", value: 173 },
-          { name: "重点人员流动异常", value: 167 },
-          { name: "值班人员配备异常", value: 155 },
-          { name: "灭火器数量不达标", value: 153 },
-          { name: "危险品使用人员资质异常", value: 119 },
-          { name: "夜间值班人员不足", value: 117 },
-        ];
-      }
-      if (val == "history") {
-        this.wtObj.data = [
-          { name: "流动人员核查率异常", value: 273 },
-          { name: "重点人员流动异常", value: 267 },
-          { name: "值班人员配备异常", value: 255 },
-          { name: "灭火器数量不达标", value: 253 },
-          { name: "危险品使用人员资质异常", value: 219 },
-          { name: "夜间值班人员不足", value: 217 },
-        ];
+    },
+    dealData(data) {
+      if (!data) {
+        return;
       }
+      let zbs = data["招宝山街道"] || {};
+      let jlh = data["九龙湖镇"] || {};
+      let xp = data["獬浦镇"] || {};
+      let jc = data["蛟川川街道"] || {};
+      let lt = data["骆驼街道"] || {};
+      let zs = data["庄市街道"] || {};
+      let gs = data["贵驷街道"] || {};
+
+      Object.keys(zbs).forEach((key, index) => {
+        this.zbsObj.data.push({
+          name: key,
+          value: zbs[key],
+        });
+      });
+      Object.keys(jlh).forEach((key, index) => {
+        this.jlhObj.data.push({
+          name: key,
+          value: jlh[key],
+        });
+      });
+      Object.keys(xp).forEach((key, index) => {
+        this.xpObj.data.push({
+          name: key,
+          value: xp[key],
+        });
+      });
+      Object.keys(jc).forEach((key, index) => {
+        this.jcObj.data.push({
+          name: key,
+          value: jc[key],
+        });
+      });
+      Object.keys(lt).forEach((key, index) => {
+        this.ltObj.data.push({
+          name: key,
+          value: lt[key],
+        });
+      });
+      Object.keys(zs).forEach((key, index) => {
+        this.zsObj.data.push({
+          name: key,
+          value: zs[key],
+        });
+      });
+      Object.keys(gs).forEach((key, index) => {
+        this.gsObj.data.push({
+          name: key,
+          value: gs[key],
+        });
+      });
+
+      console.log(this.zsObj);
     },
   },
 };
diff --git a/src/views/enterpriseTeamWork/riskHandle/index.vue b/src/views/enterpriseTeamWork/riskHandle/index.vue
index 6e6d7df..fbe7b5d 100644
--- a/src/views/enterpriseTeamWork/riskHandle/index.vue
+++ b/src/views/enterpriseTeamWork/riskHandle/index.vue
@@ -19,7 +19,7 @@
                 <el-form-item label="关键词:">
                   <el-input
                     style="width: 160px"
-                    v-model="queryParam.name"
+                    v-model.trim="queryParam.enterpriseName"
                     placeholder="请输入企业名称"
                   ></el-input>
                 </el-form-item>
@@ -28,7 +28,7 @@
                   <el-select
                     clearable
                     style="width: 160px"
-                    v-model="queryParam.risk"
+                    v-model="queryParam.controlDeductionItem"
                     placeholder=""
                   >
                     <el-option
@@ -43,11 +43,12 @@
                 <el-form-item label="风险产生时间:">
                   <el-date-picker
                     style="width: 360px"
-                    v-model="queryParam.time"
+                    v-model="riskTime"
                     type="datetimerange"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -55,7 +56,7 @@
                   <el-select
                     clearable
                     style="width: 70px"
-                    v-model="queryParam.cq"
+                    v-model="queryParam.isOverdueReminder"
                     placeholder=""
                   >
                     <el-option
@@ -70,7 +71,7 @@
                   <el-select
                     clearable
                     style="width: 70px"
-                    v-model="queryParam.db"
+                    v-model="queryParam.isListedSupervision"
                     placeholder=""
                   >
                     <el-option
@@ -82,10 +83,8 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item style="margin-right: 0">
-                  <el-button type="primary" @click="searchQuery"
-                    >查询</el-button
-                  >
-                  <el-button type="primary" plain @click="searchReset"
+                  <el-button type="primary" @click="search">查询</el-button>
+                  <el-button type="primary" plain @click="reset"
                     >重置</el-button
                   >
                 </el-form-item>
@@ -201,8 +200,8 @@ export default {
           },
         },
         {
-          slot: "riskSlot",
-          prop: "risk",
+          //slot: "riskSlot",
+          prop: "controlDeductionItem",
           label: "风险类型",
           attrs: {
             width: 170,
@@ -269,8 +268,8 @@ export default {
           },
         },
         {
-          slot: "cqSlot",
-          prop: "msg",
+          //slot: "cqSlot",
+          prop: "overdueReminder",
           label: "是否超期整改",
           attrs: {
             width: 120,
@@ -311,6 +310,7 @@ export default {
       url: {
         list: "/synergism/rickdisposal",
       },
+      riskTime: [],
     };
   },
   methods: {
@@ -328,6 +328,18 @@ export default {
         });
       }
     },
+    search() {
+      if (this.riskTime.length) {
+        this.queryParam.riskStartTime = this.riskTime[0];
+        this.queryParam.riskEndTime = this.riskTime[1];
+      }
+
+      this.searchQuery();
+    },
+    reset() {
+      this.riskTime = [];
+      this.searchReset();
+    },
   },
 };
 </script>
diff --git a/src/views/enterpriseTeamWork/riskOverview/dpie.vue b/src/views/enterpriseTeamWork/riskOverview/dpie.vue
index 7f3dc57..a232491 100644
--- a/src/views/enterpriseTeamWork/riskOverview/dpie.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/dpie.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dpiePanel" id="dpieWrap">
     <div class="dpieLegend">
-      <div class="dpieRow" v-for="item in data" :key="item.name">
+      <div class="dpieRow" v-for="item in chartObj.list" :key="item.name">
         <div class="flex-center">
           <div
             class="dpieIcon"
@@ -11,7 +11,7 @@
         </div>
         <div class="dpieValue">{{ item.value }}</div>
         <div class="dpieRate">
-          {{ ((100 * item.value) / total).toFixed(0) }}%
+          {{ ((100 * item.value) / chartObj.total).toFixed(0) }}%
         </div>
       </div>
     </div>
@@ -33,39 +33,25 @@
 import * as echarts from "echarts";
 import "echarts-gl";
 export default {
+  props: {
+    chartObj: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
   data() {
     return {
-      data: [
-        {
-          name: "按照要求整改",
-          value: 528,
-          itemStyle: {
-            color: "#FFC052",
-          },
-        },
-        {
-          name: "安全隐患企业",
-          value: 128,
-          itemStyle: {
-            color: "#FF745A",
-          },
-        },
-      ],
-      total: 1,
+      data: [],
       viewH: 1,
     };
   },
   mounted() {
-    this.total = 1;
-    for (let i = 0; i < this.data.length; i++) {
-      this.total += this.data[i].value;
-    }
-
     let temp = this.getHeight();
     let height = parseInt(temp / 3);
     this.viewH = 2 * height;
-    console.log(height);
-
+    console.log(this.chartObj);
     setTimeout(() => {
       this.setOption();
     }, 500);
@@ -74,7 +60,8 @@ export default {
     setOption() {
       let chartDom = this.$refs["dpieWrapRef"];
       let myChart = echarts.init(chartDom);
-      const getPie3D = (pieData, internalDiameterRatio) => {
+      const getPie3D = (cData, internalDiameterRatio) => {
+        let pieData = JSON.parse(JSON.stringify(cData));
         //internalDiameterRatio:透明的空心占比
         let series = [];
         let sumValue = 0;
@@ -265,7 +252,7 @@ export default {
         };
       };
 
-      let option = getPie3D(this.data, 0.8);
+      let option = getPie3D(this.chartObj.list, 0.8);
       //是否需要label指引线，如果要就添加一个透明的2d饼状图并调整角度使得labelLine和3d的饼状图对齐，并再次setOption
       option.series.push({
         // name: "pie3d",
diff --git a/src/views/enterpriseTeamWork/riskOverview/index.vue b/src/views/enterpriseTeamWork/riskOverview/index.vue
index 2a5fde0..3685803 100644
--- a/src/views/enterpriseTeamWork/riskOverview/index.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/index.vue
@@ -59,7 +59,7 @@
                 </div>
               </div>
               <div class="btm">
-                <dpie></dpie>
+                <dpie :chartObj="qyztObj"> </dpie>
               </div>
             </div>
           </colWrap>
@@ -118,7 +118,7 @@
           @click="gotoPage('/teamWork/riskOverview/indexDetail', '3')"
         >
           <colWrap title="连续纳入监管企业">
-            <listWrap :dataList="dataList"></listWrap>
+            <listWrap :dataList="dataJgList"></listWrap>
           </colWrap>
         </div>
         <div
@@ -126,7 +126,7 @@
           @click="gotoPage('/teamWork/riskOverview/indexDetail', '4')"
         >
           <colWrap title="连续两次未整改企业">
-            <listWrap :dataList="dataList"></listWrap>
+            <listWrap :dataList="dataZgList"></listWrap>
           </colWrap>
         </div>
       </div>
@@ -174,26 +174,34 @@ export default {
   },
   data() {
     return {
-      total: 1265,
+      total: 0,
       zgztObj: {
         color: ["#48EEBD", "#2B82F3", "#FFC052", "#FF745A"],
-        data: [
-          { value: 98, name: "已经整改" },
-          { value: 12, name: "正在整改" },
-          { value: 87, name: "按照要求整改" },
-          { value: 5, name: "未按要求整改" },
+        data: [],
+        name: "风险整改",
+      },
+      qyztObj: {
+        total: 0,
+        list: [
+          {
+            name: "按照要求整改",
+            value: 0,
+            itemStyle: {
+              color: "#FFC052",
+            },
+          },
+          {
+            name: "安全隐患企业",
+            value: 0,
+            itemStyle: {
+              color: "#FF745A",
+            },
+          },
         ],
-        name: "月风险整改",
       },
       qyjgObj: {
         color: ["#48EEBD", "#2B82F3", "#66C3FF", "#FFC052", "#FF745A"],
-        data: [
-          { value: 421, name: "精细化工产业" },
-          { value: 567, name: "石化源头企业" },
-          { value: 354, name: "合成材料企业" },
-          { value: 212, name: "其他类型" },
-          { value: 253, name: "高分子企业" },
-        ],
+        data: [],
         name: "企业总数",
       },
       jdjgObj: {
@@ -216,15 +224,7 @@ export default {
         name: "总数",
       },
       gpkfObj: {
-        data: [
-          { name: "流动人员异常", value: 465 },
-          { name: "重点岗位资质异常", value: 437 },
-          { name: "车辆违规异常", value: 386 },
-          { name: "人防配置情况异常", value: 358 },
-          { name: "技防配置情况异常", value: 321 },
-          { name: "企业应急预案制定异常", value: 297 },
-          { name: "危化品车辆状态异常", value: 275 },
-        ],
+        data: [],
         color: ["#fdee37", "#f97d1f", "#f78060"],
       },
       gpysObj: {
@@ -239,35 +239,10 @@ export default {
         ],
         color: ["#fdee37", "#f97d1f", "#f78060"],
       },
-      qllxList: [
-        {
-          bj: require("@/assets/images/team/gllx.png"),
-          icon: require("@/assets/images/team/gljh.png"),
-          name: "精细化工企业",
-          value: 287,
-          unit: "家",
-        },
-        {
-          bj: require("@/assets/images/team/gllx.png"),
-          icon: require("@/assets/images/team/glsh.png"),
-          name: "石化源头企业",
-          value: 187,
-          unit: "家",
-        },
-        {
-          bj: require("@/assets/images/team/gllx.png"),
-          icon: require("@/assets/images/team/glhc.png"),
-          name: "合成材料企业",
-          value: 168,
-          unit: "家",
-        },
-      ],
+      qllxList: [],
       zgqsObj: {
-        xData: ["2017", "2018", "2019", "2020", "2021", "2022", "2023"],
-        yData: [
-          [152, 131, 123, 144, 218, 254, 164],
-          [52, 31, 23, 44, 18, 54, 14],
-        ],
+        xData: [],
+        yData: [[], []],
         name: "整改趋势",
         legend: ["按照要求整改", "未按要求整改"],
         color: [
@@ -283,136 +258,170 @@ export default {
           ],
         ],
       },
-      dataList: [],
+      dataJgList: [],
+      dataZgList: [],
     };
   },
   mounted() {
-    this.dataList = [];
-    let cmyArr = [
-      "宁波市鼎瑞翔新材料科技有限公司",
-      "镇海石化海达发展有限责任公司",
-      "宁波四明化工有限公司",
-      "宁波特粒科技有限公司",
-      "宁波市镇海欣利工艺品有限公司",
-      "宁波安捷化工物流有限公司",
-      "宁波和盛达能源科技有限公司",
-      "宁波市镇海俞范三合电镀厂",
-      "宁波华梦贸易有限公司",
-      "英力士苯领高分子材料（宁波）有限公司",
-      "宁波市镇海金泰金属有限公司",
-      "宁波市银舟表面技术有限公司",
-      "图腾纺织（宁波）有限公司",
-      "宁波人健化学制药有限公司",
-      "宁波明峰检验检测研究院股份有限公司",
-      "宁波铝亿合金材料有限公司",
-      "宁波龙宝泰生环保科技有限公司",
-      "浙江杭州湾腈纶有限公司",
-      "镇海蛟川物业管理有限公司",
-      "宁波镇海炼化利安德化工销售有限公司",
-    ];
-    for (let i = 0; i < 20; i++) {
-      this.dataList.push({
-        id: i,
-        name: cmyArr[i % 20],
-        value: 2 * i + 10,
-        unit: "次",
-      });
-    }
     this.getData();
   },
   methods: {
     getData() {
-      rectificationstatus({ message: "月度统计" }).then((res) => {
-        if (res.code == 200) {
-          let data = res.data || {};
-        }
-      });
+      this.changeTime("年度");
       enterprisestatus().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.qyztObj.total = data["按照要求整改"] + data["安全隐患企业"];
+          this.qyztObj.list[0]["value"] = data["按照要求整改"];
+          this.qyztObj.list[1]["value"] = data["安全隐患企业"];
         }
       });
       corporategovernance().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.qyjgObj.data = [];
+          Object.keys(data).forEach((key, index) => {
+            this.qyjgObj.data.push({
+              name: key,
+              value: data[key],
+            });
+          });
         }
       });
       streetsupervision().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.jdjgObj.data = [];
+          Object.keys(data).forEach((key, index) => {
+            this.jdjgObj.data.push({
+              name: key,
+              value: data[key],
+            });
+          });
         }
       });
       rectifythetrend().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.zgqsObj.xData = [];
+          this.zgqsObj.yData = [[], []];
+          let list = [];
+          Object.keys(data).forEach((key, index) => {
+            list.push({
+              name: key,
+              value: data[key],
+            });
+          });
+          list.sort(function (a, b) {
+            if (a.name < b.name) return -1;
+            if (a.name > b.name) return 1;
+            return 0; // 相等时保持原有顺序
+          });
+
+          for (let i = 0; i < list.length; i++) {
+            this.zgqsObj.xData.push(list[i]["name"]);
+            this.zgqsObj.yData[0].push(list[i]["value"]["按照要求整改"]);
+            this.zgqsObj.yData[1].push(list[i]["value"]["未按要求整改"]);
+          }
+
+          console.log(list);
         }
       });
       frequencydeductpoints().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.gpkfObj.data = [];
+          Object.keys(data).forEach((key, index) => {
+            this.gpkfObj.data.push({
+              name: key,
+              value: data[key],
+            });
+          });
         }
       });
       frequencyerrorpoints().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.gpysObj.data = [];
+          Object.keys(data).forEach((key, index) => {
+            this.gpysObj.data.push({
+              name: key,
+              value: data[key],
+            });
+          });
         }
       });
-      coiledenterprisetypes().then((res) => {
+      coiledtwoenterprisetypes().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          Object.keys(data).forEach((key, index) => {
+            this.qllxList.push({
+              bj: require("@/assets/images/team/gllx.png"),
+              icon: require("@/assets/images/team/gljh.png"),
+              name: key,
+              value: data[key],
+              unit: "家",
+            });
+          });
         }
       });
-      coiledtwoenterprisetypes().then((res) => {
+      coiledenterprisetypes().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.dataJgList = [];
+          Object.keys(data).forEach((key, index) => {
+            this.dataJgList.push({
+              name: key,
+              id: index,
+              value: data[key],
+              unit: "次",
+            });
+          });
         }
       });
+
       coiledtwonotenterprise().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.dataZgList = [];
+          Object.keys(data).forEach((key, index) => {
+            this.dataZgList.push({
+              name: key,
+              id: index,
+              value: data[key],
+              unit: "次",
+            });
+          });
         }
       });
       totalenterpriserisk().then((res) => {
         if (res.code == 200) {
           let data = res.data || {};
+          this.total = data["总数"];
         }
       });
-      testFlow({ procInsId: "d86ccf39-1584-11ee-b686-00e04c8aac6f" }).then(
+      /* testFlow({ procInsId: "d86ccf39-1584-11ee-b686-00e04c8aac6f" }).then(
         (res) => {
           if (res.code == 200) {
             let data = res.data || {};
           }
         }
-      );
+      ); */
     },
     changeTime(val) {
-      if (val == "month") {
-        this.zgztObj.name = "月风险整改";
-        this.zgztObj.data = [
-          { value: 98, name: "已经整改" },
-          { value: 12, name: "正在整改" },
-          { value: 87, name: "按照要求整改" },
-          { value: 5, name: "未按要求整改" },
-        ];
-      }
-      if (val == "season") {
-        this.zgztObj.name = "季风险整改";
-        this.zgztObj.data = [
-          { value: 198, name: "已经整改" },
-          { value: 112, name: "正在整改" },
-          { value: 187, name: "按照要求整改" },
-          { value: 15, name: "未按要求整改" },
-        ];
-      }
-      if (val == "year") {
-        this.zgztObj.name = "年风险整改";
-        this.zgztObj.data = [
-          { value: 498, name: "已经整改" },
-          { value: 412, name: "正在整改" },
-          { value: 487, name: "按照要求整改" },
-          { value: 45, name: "未按要求整改" },
-        ];
-      }
+      console.log("rectificationstatus:", val);
+      rectificationstatus({ message: val }).then((res) => {
+        if (res.code == 200) {
+          let data = res.data || [];
+          this.zgztObj.data = [];
+          Object.keys(data).forEach((key, index) => {
+            this.zgztObj.data.push({
+              name: key,
+              value: data[key],
+            });
+          });
+        }
+      });
     },
     gotoPage(path, val) {
       this.$router.push({
diff --git a/src/views/enterpriseTeamWork/riskOverview/indexDuty.vue b/src/views/enterpriseTeamWork/riskOverview/indexDuty.vue
index 7c4ae85..7f4d21b 100644
--- a/src/views/enterpriseTeamWork/riskOverview/indexDuty.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/indexDuty.vue
@@ -12,13 +12,17 @@
             >
               <el-form-item label="关键词:">
                 <el-input
-                  v-model="queryParam.enterpriseName"
+                  v-model.trim="queryParam.enterpriseName"
                   placeholder="请输入企业名称"
                 ></el-input>
               </el-form-item>
 
               <el-form-item label="管控扣分项:">
-                <el-select clearable v-model="queryParam.controlDeductionItem" placeholder="">
+                <el-select
+                  clearable
+                  v-model="queryParam.controlDeductionItem"
+                  placeholder=""
+                >
                   <el-option
                     v-for="item in riskList"
                     :key="item.value"
@@ -44,7 +48,11 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="监管单位:">
-                <el-select clearable v-model="queryParam.supervisionUnit" placeholder="">
+                <el-select
+                  clearable
+                  v-model="queryParam.supervisionUnit"
+                  placeholder=""
+                >
                   <el-option
                     v-for="item in unitList"
                     :key="item.value"
@@ -82,13 +90,13 @@
               </span>
             </template>
             <template v-slot:jjSlot="{ scope }">
-              <div class="ybWrap" v-if="scope.row.jj == 0">
+              <div class="ybWrap" v-if="scope.row.urgencyLevel == '一般'">
                 <div class="text">一般</div>
               </div>
-              <div class="zdWrap" v-if="scope.row.jj == 1">
+              <div class="zdWrap" v-if="scope.row.urgencyLevel == '重点关注'">
                 <div class="text">重点关注</div>
               </div>
-              <div class="jjWrap" v-if="scope.row.jj == 2">
+              <div class="jjWrap" v-if="scope.row.urgencyLevel == '紧急'">
                 <div class="text">紧急</div>
               </div>
             </template>
@@ -143,65 +151,59 @@ export default {
           },
         },
         {
-          prop: "cmy",
+          prop: "enterpriseName",
           label: "企业名称",
         },
         {
-          slot: "riskSlot",
-          prop: "risk",
+          //slot: "riskSlot",
+          prop: "controlDeductionItem",
           label: "管控扣分项",
           attrs: {
             width: 170,
           },
         },
         {
-          slot: "ysSlot",
-          prop: "ys",
+          //slot: "ysSlot",
+          prop: "elementAbnormalDetail",
           label: "异常明细",
           attrs: {
-            width: 180,
+            width: 170,
           },
         },
         {
-          prop: "remarks",
+          prop: "rectificationRequirement",
           label: "整改要求",
-          attrs: {
-            width: 120,
-          },
         },
         {
-          prop: "remarks",
+          prop: "unitDivisionResponsibility",
           label: "各单位分工责任",
-          attrs: {
-            width: 160,
-          },
         },
         {
-          slot: "unitSlot",
-          prop: "unit",
+          //slot: "unitSlot",
+          prop: "supervisionUnit",
           label: "监管单位",
           attrs: {
             width: 140,
           },
         },
         {
-          prop: "name",
+          prop: "responsiblePerson",
           label: "责任人",
           attrs: {
             width: 140,
           },
         },
         {
-          slot: "dealWaySlot",
-          prop: "dealWay",
+          //slot: "dealWaySlot",
+          prop: "disposalMethod",
           label: "处置方式",
           attrs: {
             width: 140,
           },
         },
         {
-          slot: "dealRequireSlot",
-          prop: "dealRequire",
+          //slot: "dealRequireSlot",
+          prop: "disposalRequirement",
           label: "处置要求",
           attrs: {
             width: 120,
@@ -209,7 +211,7 @@ export default {
         },
         {
           slot: "jjSlot",
-          prop: "jj",
+          prop: "urgencyLevel",
           label: "紧急程度",
           attrs: {
             width: 140,
diff --git a/src/views/enterpriseTeamWork/riskOverview/indexRisk.vue b/src/views/enterpriseTeamWork/riskOverview/indexRisk.vue
index 6b130b2..819f63a 100644
--- a/src/views/enterpriseTeamWork/riskOverview/indexRisk.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/indexRisk.vue
@@ -13,18 +13,19 @@
               <el-form-item label="关键词:">
                 <el-input
                   clearable
-                  v-model="queryParam.key"
+                  v-model.trim="queryParam.enterpriseName"
                   placeholder="请输入企业名称"
                 ></el-input>
               </el-form-item>
 
               <el-form-item label="纳入重点监管时间:">
                 <el-date-picker
-                  v-model="queryParam.time"
+                  v-model="includedSupervisionTime"
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -33,13 +34,13 @@
                   <div class="flex-center">
                     <el-input-number
                       :min="0"
-                      v-model="queryParam.min"
+                      v-model="queryParam.startNum"
                       placeholder=""
                     ></el-input-number>
                     <span style="color: #495e70; padding: 0 4px">-</span>
                     <el-input-number
                       :min="0"
-                      v-model="queryParam.max"
+                      v-model="queryParam.endNum"
                       placeholder=""
                     ></el-input-number>
                   </div>
@@ -47,11 +48,12 @@
 
                 <el-form-item label="风险清单生成时间:">
                   <el-date-picker
-                    v-model="queryParam.time"
+                    v-model="riskTime"
                     type="datetimerange"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -59,7 +61,7 @@
                 <el-form-item label="整改状态:">
                   <el-select
                     clearable
-                    v-model="queryParam.state"
+                    v-model="queryParam.rectificationStatus"
                     placeholder=""
                   >
                     <el-option
@@ -75,7 +77,7 @@
                 <el-form-item label="企业类型:">
                   <el-select
                     clearable
-                    v-model="queryParam.cmyType"
+                    v-model="queryParam.enterpriseType"
                     placeholder=""
                   >
                     <el-option
@@ -91,7 +93,7 @@
                 <el-form-item label="处置方式:">
                   <el-select
                     clearable
-                    v-model="queryParam.dealWay"
+                    v-model="queryParam.disposalMethod"
                     placeholder=""
                   >
                     <el-option
@@ -105,8 +107,8 @@
                 </el-form-item>
               </template>
               <el-form-item style="margin-right: 0">
-                <el-button type="primary" @click="searchQuery">查询</el-button>
-                <el-button type="primary" plain @click="searchReset"
+                <el-button type="primary" @click="search">查询</el-button>
+                <el-button type="primary" plain @click="reset"
                   >重置</el-button
                 >
                 <a
@@ -158,25 +160,37 @@
               <div class="msgWrap" v-if="scope.row.msg == 1">已经发送</div>
             </template>
             <template v-slot:jjSlot="{ scope }">
-              <div class="ybWrap" v-if="scope.row.jj == 0">
+              <div class="ybWrap" v-if="scope.row.urgencyLevel == '一般'">
                 <div class="text">一般</div>
               </div>
-              <div class="zdWrap" v-if="scope.row.jj == 1">
+              <div class="zdWrap" v-if="scope.row.urgencyLevel == '重点关注'">
                 <div class="text">重点关注</div>
               </div>
-              <div class="jjWrap" v-if="scope.row.jj == 2">
+              <div class="jjWrap" v-if="scope.row.urgencyLevel == '紧急'">
                 <div class="text">紧急</div>
               </div>
             </template>
             <template v-slot:stateSlot="{ scope }">
-              <div class="failWrap" v-if="scope.row.state == 0">
-                <div class="text">未完成</div>
+              <div
+                class="failWrap"
+                v-if="scope.row.rectificationStatus == '未按要求整改'"
+              >
+                <div class="text">未按要求整改</div>
               </div>
-              <div class="ingWrap" v-if="scope.row.state == 1">
-                <div class="text">整改中</div>
+              <div
+                class="ingWrap"
+                v-if="scope.row.rectificationStatus == '正在整改'"
+              >
+                <div class="text">正在整改</div>
               </div>
-              <div class="finishWrap" v-if="scope.row.state == 2">
-                <div class="text">已完成</div>
+              <div
+                class="finishWrap"
+                v-if="
+                  scope.row.rectificationStatus == '已整改' ||
+                  scope.row.rectificationStatus == '按照要求整改'
+                "
+              >
+                <div class="text">{{ scope.row.rectificationStatus }}</div>
               </div>
             </template>
             <template v-slot:optSlot="{ scope }">
@@ -217,7 +231,7 @@
 <script>
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
 import { commonMixins } from "@/loveflow/mixins/commonMixins";
-
+import { listingsupervision } from "@/api/enterpriseTeamWork/riskOverview/index.js";
 export default {
   components: {},
   mixins: [tableListMixins, commonMixins],
@@ -233,52 +247,52 @@ export default {
           },
         },
         {
-          prop: "cmy",
+          prop: "enterpriseName",
           label: "企业名称",
           attrs: {
             width: 220,
           },
         },
         {
-          slot: "cmyTypeSlot",
-          prop: "cmyType",
+          //slot: "cmyTypeSlot",
+          prop: "enterpriseType",
           label: "企业类型",
           attrs: {
             width: 120,
           },
         },
         {
-          prop: "time",
+          prop: "includedSupervisionTime",
           label: "纳入监管时间",
           attrs: {
             width: 180,
           },
         },
         {
-          prop: "time",
+          prop: "checklistGenerationTime",
           label: "清单生成时间",
           attrs: {
             width: 180,
           },
         },
         {
-          prop: "date",
+          prop: "rectificationDeadline",
           label: "整改截止时间",
           attrs: {
             width: 180,
           },
         },
         {
-          slot: "riskSlot",
-          prop: "risk",
+          //slot: "riskSlot",
+          prop: "controlDeductionItem",
           label: "管控扣分项",
           attrs: {
             width: 170,
           },
         },
         {
-          slot: "ysSlot",
-          prop: "ys",
+          //slot: "ysSlot",
+          prop: "elementAbnormalDetail",
           label: "要素异常明细",
           attrs: {
             width: 180,
@@ -286,31 +300,31 @@ export default {
         },
         {
           slot: "stateSlot",
-          prop: "state",
+          prop: "rectificationStatus",
           label: "整改状态",
           attrs: {
             width: 120,
           },
         },
         {
-          slot: "iszgSlot",
-          prop: "iszg",
+          //slot: "iszgSlot",
+          prop: "appealVerificationNotNeeded",
           label: "申诉核实无需整改",
           attrs: {
             width: 160,
           },
         },
         {
-          slot: "dealWaySlot",
-          prop: "dealWay",
+          //slot: "dealWaySlot",
+          prop: "disposalMethod",
           label: "处置方式",
           attrs: {
             width: 120,
           },
         },
         {
-          slot: "msgSlot",
-          prop: "msg",
+          //slot: "msgSlot",
+          prop: "overdueReminder",
           label: "超期提醒",
           attrs: {
             width: 180,
@@ -325,8 +339,8 @@ export default {
           },
         },
         {
-          slot: "dealRequireSlot",
-          prop: "dealRequire",
+          //slot: "dealRequireSlot",
+          prop: "disposalRequirement",
           label: "处置要求",
           attrs: {
             width: 120,
@@ -334,7 +348,7 @@ export default {
         },
         {
           slot: "jjSlot",
-          prop: "jj",
+          prop: "urgencyLevel",
           label: "紧急程度",
           attrs: {
             width: 120,
@@ -347,9 +361,10 @@ export default {
           itemAttrs: {
             label: "请输入挂牌日期：",
             span: 12,
+            rules: this.$rules.requiredItem,
           },
           attrs: {
-            model: "date",
+            model: "listingDate",
             value: "",
             placeholder: "",
             style: {
@@ -362,18 +377,23 @@ export default {
           itemAttrs: {
             label: "请选择督办级别：",
             span: 12,
+            rules: this.$rules.requiredItem,
           },
           attrs: {
-            model: "jb",
+            model: "supervisionLevel",
             value: "",
             option: [
               {
-                label: "一级",
-                value: "1",
+                label: "1级",
+                value: "1级",
               },
               {
-                label: "二级",
-                value: "2",
+                label: "2级",
+                value: "2级",
+              },
+              {
+                label: "3级",
+                value: "3级",
               },
             ],
             style: {
@@ -388,7 +408,7 @@ export default {
             span: 12,
           },
           attrs: {
-            model: "dw",
+            model: "listingUnit",
             value: "",
             placeholder: "",
             style: {
@@ -403,7 +423,7 @@ export default {
             span: 12,
           },
           attrs: {
-            model: "dw",
+            model: "listingDocumentNumber",
             value: "",
             placeholder: "",
           },
@@ -413,9 +433,10 @@ export default {
           itemAttrs: {
             label: "请输入督办要求：",
             span: 12,
+            rules: this.$rules.requiredItem,
           },
           attrs: {
-            model: "dw",
+            model: "supervisionRequirements",
             value: "",
             placeholder: "",
             style: {
@@ -430,7 +451,7 @@ export default {
             span: 12,
           },
           attrs: {
-            model: "dw",
+            model: "supervisionClosureUnit",
             value: "",
             placeholder: "",
           },
@@ -439,6 +460,8 @@ export default {
       url: {
         list: "synergism/riskgovernancelist",
       },
+      includedSupervisionTime: [],
+      riskTime: [],
     };
   },
   methods: {
@@ -446,11 +469,33 @@ export default {
       this.$refs.formDialog.openDialog("detail", obj, "挂牌督办");
     },
     formSubmit(obj) {
-      console.log(obj);
+      obj.enterprid = obj.id;
+      listingsupervision({ ...obj }).then((res) => {
+        if (res.code == 200) {
+          let data = res.data || {};
+        }
+      });
     },
     sendMsg(obj) {
       this.$message.success("提醒短信已发送");
     },
+    search() {
+      if (this.includedSupervisionTime.length) {
+        this.queryParam.startTime = this.includedSupervisionTime[0];
+        this.queryParam.endTime = this.includedSupervisionTime[1];
+      }
+      if (this.riskTime.length) {
+        this.queryParam.riskStartTime = this.riskTime[0];
+        this.queryParam.riskEndTime = this.riskTime[1];
+      }
+
+      this.searchQuery();
+    },
+    reset() {
+      this.riskTime = [];
+      this.includedSupervisionTime = [];
+      this.searchReset();
+    },
   },
 };
 </script>
diff --git a/src/views/enterpriseTeamWork/riskOverview/pie.vue b/src/views/enterpriseTeamWork/riskOverview/pie.vue
index 85cef7a..1519ded 100644
--- a/src/views/enterpriseTeamWork/riskOverview/pie.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/pie.vue
@@ -46,7 +46,7 @@ export default {
             },
           },
           {
-            value: 5,
+            value: 2,
             name: "",
             itemStyle: {
               normal: {