From 083c23729b0daf7cdb65284b0996e3fb24e93101 Mon Sep 17 00:00:00 2001
From: loveflow <5269966+loveflow@user.noreply.gitee.com>
Date: Sat, 23 Mar 2024 23:54:01 +0800
Subject: [PATCH] update

---
 src/loveflow/assets/reset.less                |   1 +
 src/loveflow/components/data/table.vue        |   7 +-
 src/loveflow/mixins/commonMixins.js           | 207 ++++++++++------
 src/loveflow/mixins/tableListMixins.js        |  79 +++++-
 .../elementInfo/juageApply.vue                | 194 ++++-----------
 .../elementInfo/juageMap.vue                  |   3 +
 .../elementInfo/juageTable.vue                | 150 ++++++++++++
 .../enterpriseTeamWork/elementInfo/pie.vue    |   4 +-
 .../enterpriseTeamWork/elementInfo/pieTwo.vue | 152 ++++++++++++
 .../enterpriseTeamWork/elementInfo/screen.vue | 135 +++++++++--
 .../messageCenter/index.vue                   | 224 +++++++++---------
 .../problemRectify/indexFeedback.vue          |   2 +-
 .../problemRectify/indexTrack.vue             |   2 +-
 .../enterpriseTeamWork/riskHandle/index.vue   |  75 +++++-
 .../enterpriseTeamWork/riskHandle/indexMy.vue |  10 +-
 .../enterpriseTeamWork/riskOverview/dpie.vue  |   7 +-
 .../enterpriseTeamWork/riskOverview/index.vue |  26 +-
 .../riskOverview/indexDetail.vue              |  95 +++++---
 .../riskOverview/indexDuty.vue                |  92 +++++--
 .../riskOverview/indexRisk.vue                | 108 +++++++--
 .../enterpriseTeamWork/riskOverview/line.vue  |   2 +-
 .../enterpriseTeamWork/tipSet/dealRequire.vue |  55 +++--
 .../tipSet/msgPushDetail.vue                  |  70 ++----
 23 files changed, 1149 insertions(+), 551 deletions(-)
 create mode 100644 src/views/enterpriseTeamWork/elementInfo/juageMap.vue
 create mode 100644 src/views/enterpriseTeamWork/elementInfo/juageTable.vue
 create mode 100644 src/views/enterpriseTeamWork/elementInfo/pieTwo.vue

diff --git a/src/loveflow/assets/reset.less b/src/loveflow/assets/reset.less
index 43f8884..5886f73 100644
--- a/src/loveflow/assets/reset.less
+++ b/src/loveflow/assets/reset.less
@@ -426,6 +426,7 @@
 }
 
 .canvasPointer {
+  cursor: pointer;
   canvas {
     cursor: pointer !important;
   }
diff --git a/src/loveflow/components/data/table.vue b/src/loveflow/components/data/table.vue
index 348f17e..d227934 100644
--- a/src/loveflow/components/data/table.vue
+++ b/src/loveflow/components/data/table.vue
@@ -85,6 +85,7 @@ export default {
   data() {
     return {};
   },
+
   methods: {
     //每页条数发生改变
     pageSizeChange(item) {
@@ -113,12 +114,12 @@ export default {
     height: calc(100% - 54px);
     .el-table__body-wrapper {
       height: calc(100% - 50px);
-      overflow: scroll;
-      &::-webkit-scrollbar-corner{
+      overflow-y: scroll;
+      &::-webkit-scrollbar-corner {
         background: transparent;
       }
       &::-webkit-scrollbar {
-        width: 6px;
+        width: 0;
         height: 6px;
       }
 
diff --git a/src/loveflow/mixins/commonMixins.js b/src/loveflow/mixins/commonMixins.js
index e622352..5aac9bd 100644
--- a/src/loveflow/mixins/commonMixins.js
+++ b/src/loveflow/mixins/commonMixins.js
@@ -1,16 +1,44 @@
 export const commonMixins = {
   data() {
     return {
+      //男女
+      genderList: [
+        {
+          name: "男",
+          value: "1",
+        },
+        {
+          name: "女",
+          value: "0",
+        },
+      ],
+      //是否
+      isNoList: [
+        {
+          name: "是",
+          value: "1",
+        },
+        {
+          name: "否",
+          value: "0",
+        },
+      ],
+      //镇区
       zhAreaList: [
-        { name: "招宝山街道", value: "330211001" },
-        { name: "九龙湖镇", value: "330211101" },
-        { name: "澥浦镇", value: "330211100" },
+        { name: "招宝山街道", value: "330211000" },
+        { name: "九龙湖镇", value: "330211001" },
+        { name: "澥浦镇", value: "330211002" },
         { name: "骆驼街道", value: "330211003" },
         { name: "庄市街道", value: "330211004" },
-        { name: "蛟川街道", value: "330211002" },
+        { name: "蛟川街道", value: "330211006" },
         { name: "贵驷街道", value: "330211005" },
       ],
-      riskTypeList: [
+      //风险异常，管控扣分项
+      riskList: [
+        {
+          name: "企业整改异常",
+          value: "0",
+        },
         {
           name: "流动人员异常",
           value: "1",
@@ -39,188 +67,215 @@ export const commonMixins = {
           name: "等保定级评审异常",
           value: "7",
         },
-        {
-          name: "企业整改异常",
-          value: "8",
-        },
-      ],
-      isNoList: [
-        {
-          name: "是",
-          value: "1",
-        },
-        {
-          name: "否",
-          value: "0",
-        },
       ],
-      infoTypeList: [
+      //要素明细
+      elementList: [
         {
-          name: "短信提醒",
+          name: "流动人员核查率异常",
           value: "0",
         },
         {
-          name: "超期提醒",
+          name: "危险品使用人员资质异常",
           value: "1",
         },
         {
-          name: "申诉审核提醒",
+          name: "夜间值班人员不足",
           value: "2",
         },
+        {
+          name: "灭火器数量不达标",
+          value: "3",
+        },
       ],
-      pushList: [
+      //状态
+      stateList: [
         {
-          name: "短信提醒",
+          name: "未完成",
           value: "0",
         },
         {
-          name: "平台消息提醒",
+          name: "整改中",
           value: "1",
         },
         {
-          name: "钉钉消息提醒",
+          name: "已完成",
           value: "2",
         },
       ],
-      riskList: [
+      //企业类型
+      cmyTypeList: [
         {
-          name: "流动人员异常",
+          name: "其他类型",
           value: "0",
         },
         {
-          name: "重点岗位资质异常",
+          name: "精细化工企业",
           value: "1",
         },
         {
-          name: "人防配置情况异常",
+          name: "石化源头企业",
           value: "2",
         },
         {
-          name: "消防设施设备异常",
+          name: "合成材料企业",
           value: "3",
         },
+        {
+          name: "高分子企业",
+          value: "4",
+        },
       ],
-      elementList: [
+      //处置方式
+      dealWayList: [
         {
-          name: "流动人员核查率异常",
+          name: "企业提醒",
           value: "0",
         },
         {
-          name: "危险品使用人员资质异常",
+          name: "行政处罚",
           value: "1",
         },
         {
-          name: "夜间值班人员不足",
+          name: "核实消警",
           value: "2",
         },
         {
-          name: "灭火器数量不达标",
+          name: "现场核实",
           value: "3",
         },
+        {
+          name: "现场检查",
+          value: "4",
+        },
       ],
-      pushObjList: [
+      //处置要求
+      dealRequireList: [
         {
-          name: "企业对象",
+          name: "自动反馈",
+          value: "0",
+        },
+        {
+          name: "人工反馈",
           value: "1",
         },
+      ],
+      //监管单位
+      unitList: [
         {
           name: "镇海区公安局",
-          value: "2",
+          value: "0",
         },
         {
           name: "镇海区交通局",
-          value: "3",
+          value: "1",
         },
         {
           name: "市场监督管理局",
-          value: "4",
+          value: "2",
         },
         {
           name: "区大数据中心",
-          value: "5",
+          value: "3",
         },
       ],
-      remindList: [
+      //消息类型
+      infoTypeList: [
         {
-          name: "到期前一天",
+          name: "短信提醒",
           value: "0",
         },
         {
-          name: "到期前三天",
+          name: "超期提醒",
           value: "1",
         },
         {
-          name: "到期前五天",
+          name: "申诉审核提醒",
           value: "2",
         },
       ],
-      unitList: [
+      //提醒方式==推送方式
+      tipWayList: [
         {
-          name: "镇海区公安局",
+          name: "钉钉",
+          value: "0",
+        },
+        {
+          name: "平台消息",
           value: "1",
         },
         {
-          name: "镇海区交通局",
+          name: "短信",
           value: "2",
         },
+      ],
+
+      pushList: [
         {
-          name: "市场监督管理局",
-          value: "3",
+          name: "短信提醒",
+          value: "0",
         },
         {
-          name: "区大数据中心",
-          value: "4",
+          name: "平台消息提醒",
+          value: "1",
+        },
+        {
+          name: "钉钉消息提醒",
+          value: "2",
         },
       ],
-      personList: [
+      pushObjList: [
         {
-          name: "杨怡伶",
+          name: "企业对象",
           value: "1",
         },
         {
-          name: "李彦志",
+          name: "镇海区公安局",
           value: "2",
         },
         {
-          name: "吴淑霞",
+          name: "镇海区交通局",
           value: "3",
         },
         {
-          name: "张雅泰",
+          name: "市场监督管理局",
           value: "4",
         },
-      ],
-      dealWayList: [
         {
-          name: "企业提醒",
-          value: "1",
-        },
-        {
-          name: "核实消警",
-          value: "2",
+          name: "区大数据中心",
+          value: "5",
         },
+      ],
+      remindList: [
         {
-          name: "现场核实",
-          value: "3",
+          name: "到期前一天",
+          value: "0",
         },
         {
-          name: "现场检查",
-          value: "4",
+          name: "到期前三天",
+          value: "1",
         },
         {
-          name: "行政处罚",
-          value: "5",
+          name: "到期前五天",
+          value: "2",
         },
       ],
-      dealRequire: [
+      personList: [
         {
-          name: "自动反馈",
+          name: "杨怡伶",
           value: "1",
         },
         {
-          name: "人工反馈",
+          name: "李彦志",
           value: "2",
         },
+        {
+          name: "吴淑霞",
+          value: "3",
+        },
+        {
+          name: "张雅泰",
+          value: "4",
+        },
       ],
     };
   },
diff --git a/src/loveflow/mixins/tableListMixins.js b/src/loveflow/mixins/tableListMixins.js
index a7135d5..521322a 100644
--- a/src/loveflow/mixins/tableListMixins.js
+++ b/src/loveflow/mixins/tableListMixins.js
@@ -10,7 +10,7 @@ export const tableListMixins = {
       /* 分页参数 */
       ipagination: {
         currentPage: 1,
-        pageSize: 20,
+        pageSize: 10,
         pageSizes: ["10", "20", "30"],
         layout: "total, sizes, prev, pager, next, jumper",
         total: 0,
@@ -45,7 +45,7 @@ export const tableListMixins = {
       //模拟接口返回数据总数total
       let total = 40;
       this.ipagination.total = total;
-      //console.log(this.ipagination);
+      console.log(this.ipagination);
 
       let nameArr = [
         "杨怡伶",
@@ -90,22 +90,82 @@ export const tableListMixins = {
         "叶依婷",
       ];
 
+      let cmyArr = [
+        "宁波市鼎瑞翔新材料科技有限公司",
+        "镇海石化海达发展有限责任公司",
+        "宁波四明化工有限公司",
+        "宁波特粒科技有限公司",
+        "宁波市镇海欣利工艺品有限公司",
+        "宁波安捷化工物流有限公司",
+        "宁波和盛达能源科技有限公司",
+        "宁波市镇海俞范三合电镀厂",
+        "宁波华梦贸易有限公司",
+        "英力士苯领高分子材料（宁波）有限公司",
+        "宁波市镇海金泰金属有限公司",
+        "宁波市银舟表面技术有限公司",
+        "图腾纺织（宁波）有限公司",
+        "宁波人健化学制药有限公司",
+        "宁波明峰检验检测研究院股份有限公司",
+        "宁波铝亿合金材料有限公司",
+        "宁波龙宝泰生环保科技有限公司",
+        "浙江杭州湾腈纶有限公司",
+        "镇海蛟川物业管理有限公司",
+        "宁波镇海炼化利安德化工销售有限公司",
+      ];
+      let timeArr = [
+        "2023-02-26 10:08:36",
+        "2023-01-26 10:08:12",
+        "2023-02-26 09:08:36",
+        "2023-08-09 10:08:37",
+        "2023-07-12 10:11:16",
+        "2023-02-26 10:32:42",
+        "2023-03-26 09:08:36",
+        "2023-03-26 10:08:57",
+        "2023-04-26 10:08:28",
+        "2023-05-26 10:08:36",
+        "2023-05-26 10:32:18",
+        "2023-06-12 10:08:28",
+        "2023-03-12 10:08:31",
+        "2023-02-24 10:08:41",
+        "2023-02-12 09:08:47",
+        "2023-02-26 11:08:53",
+        "2023-05-26 09:10:58",
+        "2023-04-26 10:11:51",
+        "2023-03-26 10:09:29",
+        "2023-03-12 10:19:29",
+      ];
+
       //console.log(nameArr.length);
 
-      let nameIndex = (this.ipagination.currentPage - 1) * 10;
-      for (let i = 0; i < 40; i++) {
+      let index = (this.ipagination.currentPage - 1) * 10;
+      console.log(index);
+      let length = index + 10;
+      for (let i = index; i < length; i++) {
         this.dataSource.push({
           id: i + 1,
-          name: nameArr[nameIndex + i],
+          name: nameArr[index + i],
           card: "32032119879876321" + i,
           phone: "186678879" + i,
-          cmy: "海兴达化工有限公司" + i,
+          cmy: cmyArr[i % 20],
+          cmyType: i % 5,
+          time: timeArr[i % 20],
+          risk: i % 8,
+          ys: i % 4,
+          unit: i % 4,
+          state: i % 3,
+          dealWay: i % 5,
+          dealRequire: i % 2,
+          street: "33021100" + (i % 7),
+          infoType: i % 3,
+          tipWay: i % 3,
+          tipnr: "经过应急管理局现场核查，消防设施无需整改",
+
           gender: "男",
           address: "来源地",
           isQ: "是",
           isD: "否",
           personType: "未登记人员",
-          date: "2024-02-26 10:08:36",
+          date: "2024-02-26 10:0" + (i % 10) + ":36",
           sc: "正常",
           qyT: "企业类型" + i,
           car: "浙B9871" + i,
@@ -128,10 +188,9 @@ export const tableListMixins = {
             " 宁波镇海兴达化工有限公司仓库由于易燃物品存储不当，导致易燃物品燃烧发生火灾。仓库值班人员立即启动火灾预案，组织仓库管理人员、巡逻人员和保安救火，由于火势较大，现场配备的灭火器、消防栓无法迅速扑灭。",
           flow: "宁波市北越石化有限公司-人员流动-异常" + i,
           flowType: "流动人员异常",
-          state: i % 3,
+
           node: "治安大队",
           remarks: "加强管理",
-          street: "招宝山街道",
           times: i + 1,
           total: i + 5,
           iszg: i % 3,
@@ -141,8 +200,6 @@ export const tableListMixins = {
           jj: i % 3,
           qyName: "海兴达化工有限公司" + (i % 3),
           sshs: "无",
-          risk: i % 3,
-          unit: "治安大队",
         });
       }
       //console.log(this.dataSource);
diff --git a/src/views/enterpriseTeamWork/elementInfo/juageApply.vue b/src/views/enterpriseTeamWork/elementInfo/juageApply.vue
index ebf2255..9833ab2 100644
--- a/src/views/enterpriseTeamWork/elementInfo/juageApply.vue
+++ b/src/views/enterpriseTeamWork/elementInfo/juageApply.vue
@@ -1,165 +1,48 @@
 <template>
   <div class="juageApplyPanel">
-    <div class="flexSpaceBetween">
-      <div class="tableOperator"></div>
-      <div class="searchWrap">
-        <el-form :inline="true" :model="queryParam" class="demo-form-inline">
-          <el-form-item label="消息类型:">
-            <el-select clearable v-model="queryParam.msg" placeholder="">
-              <el-option
-                v-for="item in msgList"
-                :label="item.name"
-                :key="item.name"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="请选择推送方式:">
-            <el-select clearable v-model="queryParam.cq" placeholder="">
-              <el-option
-                v-for="item in pushList"
-                :label="item.name"
-                :key="item.name"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="超期短信提醒:">
-            <el-select clearable v-model="queryParam.tx" placeholder="">
-              <el-option
-                v-for="item in isNoList"
-                :label="item.name"
-                :key="item.name"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="searchQuery">查询</el-button>
-            <el-button type="primary" plain @click="searchReset"
-              >重置</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
+    <div class="juageApplyHead">
+      <gTab
+        ref="gTabRef"
+        :tabList="tabList"
+        :curTab="curTab"
+        @tabClick="tabChange"
+      ></gTab>
     </div>
-    <div class="tableWrap">
-      <gMainTable
-        border
-        stripe
-        ref="gMainTable"
-        :tableData="dataSource"
-        :columns="columns"
-        rowKey="id"
-        :pagination="ipagination"
-        @pageSizeChange="handlePageSizeChange"
-        @currentPageChange="handleCurrentPageChange"
-      >
-        <template v-slot:idSlot="{ scope }">
-          <span class="serialWrap">
-            {{ scope.row.id }}
-          </span>
-        </template>
-        <template v-slot:optSlot="{ scope }">
-          <span class="tableOPtBtn" @click="ruleSet(scope.row)">
-            规则配置
-          </span>
-        </template>
-        <template v-slot:isnSlot="{ scope }">
-          <gDict :options="isNoList" :value="scope.row.msg"></gDict>
-        </template>
-        <template v-slot:msgSlot="{ scope }">
-          <gDict :options="msgList" :value="scope.row.jj"></gDict>
-        </template>
-      </gMainTable>
+    <div class="juageApplyBody">
+      <component :is="content" @tabChange="tabChange"></component>
     </div>
-
-    <FormDialog
-      labelPosition="top"
-      ref="formDialog"
-      :formItems="formItems"
-      width="800px"
-      @formSubmit="formSubmit"
-    >
-    </FormDialog>
   </div>
 </template>
 <script>
-import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
-import { commonMixins } from "@/loveflow/mixins/commonMixins";
+import juageMap from "./juageMap.vue";
+import juageTable from "./juageTable.vue";
 export default {
-  mixins: [tableListMixins, commonMixins],
+  components: { juageTable, juageMap },
   data() {
     return {
-      columns: [
+      tabList: [
         {
-          slot: "idSlot",
-          prop: "id",
-          label: "序号",
-          attrs: {
-            width: 60,
-          },
+          name: "首次出现",
+          value: "1",
         },
         {
-          prop: "risk",
-          label: "风险类型",
-        },
-        {
-          prop: "flowType",
-          label: "异常明细项",
-        },
-        {
-          slot: "waySlot",
-          prop: "way",
-          label: "处置方式",
-        },
-        {
-          prop: "deal",
-          label: "处置要求",
-        },
-        {
-          slot: "optSlot",
-          prop: "jj",
-          label: "处置配置",
-          attrs: {
-            width: 140,
-          },
-        },
-        {
-          prop: "remarks",
-          label: "备注",
-        },
-      ],
-      formItems: [
-        {
-          type: "select",
-          itemAttrs: {
-            label: "请选择处置要求",
-            span: 24,
-            rules: this.requiredItem,
-          },
-          attrs: {
-            model: "push",
-            value: "",
-            option: [],
-            style: {
-              width: "100%",
-              paddingRight: "16px",
-            },
-          },
+          name: "频繁出现",
+          value: "2",
         },
       ],
+      curTab: "1",
+      content: "juageTable",
     };
   },
-  mounted() {
-    this.setFindItem("formItems", "push").attrs.option = this.dealWayList;
-  },
+  mounted() {},
   methods: {
-    ruleSet(obj) {
-      this.$refs.formDialog.openDialog("detail", obj, "推送规则设置");
-    },
-    formSubmit(obj) {
-      console.log(obj);
+    tabChange(val) {
+      if (val == "1") {
+        this.content = juageTable;
+      }
+      if (val == "2") {
+        this.content = juageMap;
+      }
     },
   },
 };
@@ -170,13 +53,22 @@ export default {
   height: 100%;
   box-sizing: border-box;
   overflow: hidden;
-  .tableWrap {
-    .serialWrap {
-      padding: 2px 6px;
-      border: solid 1px #9ed7e7;
-      color: #33e6ff;
-      font-weight: bold;
-      border-radius: 2px;
+  .juageApplyHead {
+    position: absolute;
+    display: flex;
+    align-items: flex-end;
+    height: 50px;
+    right: 24px;
+    top: 0;
+  }
+  .juageApplyBody {
+    padding-top: vw(14);
+    display: flex;
+    flex-direction: column;
+    height: calc(100% - 100px);
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      display: none;
     }
   }
 }
diff --git a/src/views/enterpriseTeamWork/elementInfo/juageMap.vue b/src/views/enterpriseTeamWork/elementInfo/juageMap.vue
new file mode 100644
index 0000000..92dabd0
--- /dev/null
+++ b/src/views/enterpriseTeamWork/elementInfo/juageMap.vue
@@ -0,0 +1,3 @@
+<template>
+  <div class="juageMapPanel"></div>
+</template>
diff --git a/src/views/enterpriseTeamWork/elementInfo/juageTable.vue b/src/views/enterpriseTeamWork/elementInfo/juageTable.vue
new file mode 100644
index 0000000..68cb104
--- /dev/null
+++ b/src/views/enterpriseTeamWork/elementInfo/juageTable.vue
@@ -0,0 +1,150 @@
+<template>
+  <div class="juageTablePanel">
+    <div class="flexSpaceBetween">
+      <div class="tableOperator"></div>
+      <div class="searchWrap">
+        <el-form :inline="true" :model="queryParam" class="demo-form-inline">
+          <el-form-item label="关键词:">
+            <el-input
+              v-model="queryParam.name"
+              placeholder="请输入企业名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="风险类型:">
+            <el-select clearable v-model="queryParam.risk" placeholder="">
+              <el-option
+                v-for="item in riskList"
+                :label="item.name"
+                :key="item.name"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="要素异常明细:">
+            <el-select clearable v-model="queryParam.ys" placeholder="">
+              <el-option
+                v-for="item in elementList"
+                :label="item.name"
+                :key="item.name"
+                :value="item.value"
+              ></el-option>
+            </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
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="tableWrap">
+      <gMainTable
+        border
+        stripe
+        ref="gMainTable"
+        :tableData="dataSource"
+        :columns="columns"
+        rowKey="id"
+        :pagination="ipagination"
+        @pageSizeChange="handlePageSizeChange"
+        @currentPageChange="handleCurrentPageChange"
+      >
+        <template v-slot:idSlot="{ scope }">
+          <span class="serialWrap">
+            {{ scope.row.id }}
+          </span>
+        </template>
+        <template v-slot:riskSlot="{ scope }">
+          <gDict :options="riskList" :value="scope.row.risk"></gDict>
+        </template>
+        <template v-slot:ysSlot="{ scope }">
+          <gDict :options="elementList" :value="scope.row.ys"></gDict>
+        </template>
+        <template v-slot:jjSlot="{ scope }">
+          <div class="ybWrap" v-if="scope.row.jj == 0">
+            <div class="text">一般</div>
+          </div>
+          <div class="zdWrap" v-if="scope.row.jj == 1">
+            <div class="text">重点关注</div>
+          </div>
+          <div class="jjWrap" v-if="scope.row.jj == 2">
+            <div class="text">紧急</div>
+          </div>
+        </template>
+      </gMainTable>
+    </div>
+  </div>
+</template>
+<script>
+import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
+import { commonMixins } from "@/loveflow/mixins/commonMixins";
+export default {
+  mixins: [tableListMixins, commonMixins],
+  data() {
+    return {
+      columns: [
+        {
+          slot: "idSlot",
+          prop: "id",
+          label: "序号",
+          attrs: {
+            width: 60,
+          },
+        },
+        {
+          prop: "cmy",
+          label: "企业名称",
+        },
+        {
+          slot: "riskSlot",
+          prop: "risk",
+          label: "违规事件",
+        },
+        {
+          slot: "ysSlot",
+          prop: "ys",
+          label: "要素异常明细项",
+        },
+        {
+          prop: "deal",
+          label: "类型",
+        },
+        {
+          slot: "jjSlot",
+          prop: "jj",
+          label: "紧急程度",
+          attrs: {
+            width: 140,
+          },
+        },
+        {
+          prop: "remarks",
+          label: "备注",
+        },
+      ],
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+<style lang="scss">
+@import "@/loveflow/assets/index.scss";
+.juageTablePanel {
+  height: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+  .tableWrap {
+    height: calc(100% - 50px);
+    .serialWrap {
+      padding: 2px 6px;
+      border: solid 1px #9ed7e7;
+      color: #33e6ff;
+      font-weight: bold;
+      border-radius: 2px;
+    }
+  }
+}
+</style>
diff --git a/src/views/enterpriseTeamWork/elementInfo/pie.vue b/src/views/enterpriseTeamWork/elementInfo/pie.vue
index 96fdb74..bc6c840 100644
--- a/src/views/enterpriseTeamWork/elementInfo/pie.vue
+++ b/src/views/enterpriseTeamWork/elementInfo/pie.vue
@@ -148,12 +148,12 @@ export default {
                   fontSize: 18,
                 },
               },
-              formatter: `{label|监管企业总数}\n{value|${total}}`,
+              formatter: `{label|${this.chartObj.name}}\n{value|${total}}`,
             },
             emphasis: {
               label: {
                 show: true,
-                formatter: `{label|监管企业总数}\n{value|${total}}`,
+                formatter: `{label|${this.chartObj.name}}\n{value|${total}}`,
               },
             },
             labelLine: {
diff --git a/src/views/enterpriseTeamWork/elementInfo/pieTwo.vue b/src/views/enterpriseTeamWork/elementInfo/pieTwo.vue
new file mode 100644
index 0000000..e3b0327
--- /dev/null
+++ b/src/views/enterpriseTeamWork/elementInfo/pieTwo.vue
@@ -0,0 +1,152 @@
+<template>
+  <div style="height: 100%; width: 100%" id="pieWrap">
+    <g-chart :echartdata="option"></g-chart>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    chartObj: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      option: {},
+    };
+  },
+  mounted() {
+    this.setOption();
+  },
+  methods: {
+    setOption() {
+      let temp = this.getHeight();
+      let height = parseInt(temp / 8);
+      console.log(height);
+      let point = this.chartObj.point; //环形图的具体  百分比
+      let total = this.chartObj.total;
+
+      this.option = {
+        tooltip: {
+          show: false,
+        },
+        title: {
+          // 圆环中央文字
+          show: true, // 是否显示
+          text: this.chartObj.name,
+          textStyle: { fontSize: 12, color: "#D0DEEE" },
+          textAlign: "center",
+          left: "47%",
+          top: 2 * height + 20,
+        },
+        color: this.chartObj.color,
+        graphic: {
+          elements: [
+            {
+              type: "image",
+              style: {
+                image: this.chartObj.icon,
+                width: 4 * height,
+                height: 4 * height,
+                zIndex: 1,
+              },
+              left: "center",
+              top: 12 - height,
+            },
+          ],
+        },
+        series: [
+          {
+            // name: '访问来源1',
+            type: "pie",
+            radius: [height - 6, height],
+            center: ["center", height + 12],
+            data: [
+              {
+                value: total, //对应显示的部分数据即100%
+                itemStyle: {
+                  normal: {
+                    borderRadius: 15,
+                    color: "#1B2221",
+                  },
+                },
+              },
+            ],
+            label: {
+              position: "center",
+              formatter: ((100 * point) / total).toFixed(0) + "%",
+              color: this.chartObj.color[0],
+              fontSize: 12,
+            },
+            labelLine: {
+              show: false,
+            },
+          },
+          {
+            // name: '访问来源2',
+            type: "pie",
+            showEmptyCircle: true, //是否在无数据的时候显示一个占位圆。
+            radius: [height - 6, height],
+            center: ["center", height + 12],
+            avoidLabelOverlap: true, // 标签重叠时进行调整
+            data: [
+              {
+                value: total,
+                itemStyle: {
+                  borderRadius: 15, //圆角
+                  color: {
+                    // 设置渐变色
+                    type: "linear",
+                    colorStops: [
+                      {
+                        offset: 0,
+                        color: this.chartObj.color[1], // 0% 处的颜色
+                      },
+                      {
+                        offset: 1,
+                        color: this.chartObj.color[2], // 100% 处的颜色
+                      },
+                    ],
+                  },
+                },
+              },
+
+              {
+                value: total, //百分比
+                itemStyle: {
+                  normal: {
+                    color: "rgba(255,255,255,0)", //透明
+                  },
+                },
+              },
+            ],
+            label: {
+              show: false,
+              position: "center",
+            },
+            labelLine: {
+              show: false,
+            },
+          },
+        ],
+      };
+    },
+    getHeight() {
+      let div = document.getElementById("pieWrap");
+      return div.clientHeight;
+    },
+  },
+  watch: {
+    chartObj: {
+      handler(newval) {
+        this.setOption();
+      },
+      deep: true,
+      // immediate: true,
+    },
+  },
+};
+</script>
diff --git a/src/views/enterpriseTeamWork/elementInfo/screen.vue b/src/views/enterpriseTeamWork/elementInfo/screen.vue
index 820ccc0..e78458e 100644
--- a/src/views/enterpriseTeamWork/elementInfo/screen.vue
+++ b/src/views/enterpriseTeamWork/elementInfo/screen.vue
@@ -23,11 +23,19 @@
           class="timeWrap"
           ref="gTimeChangeRef"
           :tabList="tabList"
-          :curTab="curTime"
-          @tabClick="timeChange"
+          :curTab="curTab"
+          @tabClick="tabChange"
         ></gTab>
         <colWrap title="违法行为统计">
-          <barOne :chartObj="brObj"></barOne>
+          <barOne v-if="curTab == 1" :chartObj="brObj1"></barOne>
+          <div v-if="curTab == 2" class="wfxwWrap">
+            <div class="line" v-for="(line, index) in fkmbList" :key="index">
+              <div class="item" v-for="item in line" :key="item.name">
+                <pieTwo :chartObj="item"></pieTwo>
+              </div>
+            </div>
+          </div>
+          <pieWrap v-if="curTab == 3" :chartObj="brObj3"></pieWrap>
         </colWrap>
       </div>
     </div>
@@ -37,6 +45,7 @@
 import colWrap from "../components/colWrap.vue";
 import barOne from "./bar.vue";
 import pieWrap from "./pie.vue";
+import pieTwo from "./pieTwo.vue";
 import dpie from "./dpie.vue";
 
 export default {
@@ -45,21 +54,22 @@ export default {
     barOne,
     pieWrap,
     dpie,
+    pieTwo,
   },
   data() {
     return {
-      curTime: "1",
+      curTab: "1",
       tabList: [
         {
-          name: "当月",
+          name: "时间",
           value: "1",
         },
         {
-          name: "近三月",
+          name: "类型",
           value: "2",
         },
         {
-          name: "本年度",
+          name: "地点",
           value: "3",
         },
       ],
@@ -79,7 +89,29 @@ export default {
         yData: [13, 14, 13, 11, 13, 14, 12, 16, 12, 15],
         name: "要素数量统计",
       },
-      brObj: {
+
+      blObj: {
+        color: [
+          "#48EEBD",
+          "#2B82F3",
+          "#66C3FF",
+          "#FFC052",
+          "#E4FEF0",
+          "#FF745A",
+          "#672BF3",
+        ],
+        data: [
+          { value: 421, name: "招宝山街道" },
+          { value: 567, name: "九龙湖镇" },
+          { value: 354, name: "澥浦镇" },
+          { value: 212, name: "骆驼街道" },
+          { value: 253, name: "庄市街道" },
+          { value: 383, name: "蛟川街道" },
+          { value: 288, name: "贵驷街道" },
+        ],
+        name: "监管企业总数",
+      },
+      brObj1: {
         xData: [
           "1月",
           "2月",
@@ -97,7 +129,69 @@ export default {
         yData: [13, 14, 13, 11, 13, 14, 12, 16, 12, 15, 14, 11],
         name: "违法行为统计",
       },
-      blObj: {
+      fkmbList: [
+        [
+          {
+            name: "车辆违规",
+            total: 340,
+            point: 100,
+            icon: require("@/assets/images/topic/pie1b.png"),
+            color: ["#57F0FF", "#37A1CC", "#08FAC4"],
+          },
+          {
+            name: "出入异常",
+            total: 328,
+            point: 186,
+            icon: require("@/assets/images/topic/pie2b.png"),
+            color: ["#FFCE57", "#EB9104", "#FAC608"],
+          },
+          {
+            name: "危化品",
+            total: 435,
+            point: 261,
+            icon: require("@/assets/images/topic/pie4b.png"),
+            color: ["#FFE3E3", "#FF2C2C", "#FF6D6D"],
+          },
+          {
+            name: "列管物品",
+            total: 340,
+            point: 100,
+            icon: require("@/assets/images/topic/pie1b.png"),
+            color: ["#57F0FF", "#37A1CC", "#08FAC4"],
+          },
+        ],
+        [
+          {
+            name: "偷窃",
+            total: 340,
+            point: 100,
+            icon: require("@/assets/images/topic/pie1b.png"),
+            color: ["#57F0FF", "#37A1CC", "#08FAC4"],
+          },
+          {
+            name: "赌博",
+            total: 328,
+            point: 186,
+            icon: require("@/assets/images/topic/pie2b.png"),
+            color: ["#FFCE57", "#EB9104", "#FAC608"],
+          },
+          {
+            name: "嫖娼",
+            total: 435,
+            point: 261,
+            icon: require("@/assets/images/topic/pie4b.png"),
+            color: ["#FFE3E3", "#FF2C2C", "#FF6D6D"],
+          },
+          {
+            name: "违禁",
+            total: 340,
+            point: 100,
+            icon: require("@/assets/images/topic/pie1b.png"),
+            color: ["#57F0FF", "#37A1CC", "#08FAC4"],
+          },
+        ],
+      ],
+      brObj3: {
         color: [
           "#48EEBD",
           "#2B82F3",
@@ -116,13 +210,14 @@ export default {
           { value: 383, name: "蛟川街道" },
           { value: 288, name: "贵驷街道" },
         ],
-        name: "监管企业总数",
+        name: "违法行为总数",
       },
     };
   },
   methods: {
-    timeChange(val) {
-      console.log(val)
+    tabChange(val) {
+      this.curTab = val;
+      console.log(val);
       if (val == "1") {
         this.brObj.yData = [13, 14, 13, 11, 13, 14, 12, 16, 12, 15, 14, 11];
       }
@@ -153,10 +248,22 @@ export default {
       flex: 1;
       .timeWrap {
         position: absolute;
-        top: 30px;
-        right: 20px;
+        top: 0;
+        right: 0;
         z-index: 12;
       }
+      .wfxwWrap {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        .line {
+          flex: 1;
+          display: flex;
+          .item {
+            flex: 1;
+          }
+        }
+      }
     }
   }
 }
diff --git a/src/views/enterpriseTeamWork/messageCenter/index.vue b/src/views/enterpriseTeamWork/messageCenter/index.vue
index fc9e300..def386d 100644
--- a/src/views/enterpriseTeamWork/messageCenter/index.vue
+++ b/src/views/enterpriseTeamWork/messageCenter/index.vue
@@ -17,10 +17,24 @@
                     placeholder="请输入企业名称"
                   ></el-input>
                 </el-form-item>
-
-                <el-form-item label="纳入重点监管时间:">
+                <el-form-item label="消息类型:">
+                  <el-select
+                    clearable
+                    v-model="queryParam.infoType"
+                    placeholder=""
+                  >
+                    <el-option
+                      v-for="item in infoTypeList"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="发送时间:">
                   <el-date-picker
-                    v-model="queryParam.time"
+                    v-model="queryParam.fstime"
                     type="datetimerange"
                     range-separator="至"
                     start-placeholder="开始日期"
@@ -29,25 +43,9 @@
                   </el-date-picker>
                 </el-form-item>
                 <template v-if="toggleSearchStatus">
-                  <el-form-item label="纳入次数:">
-                    <div class="flex-center">
-                      <el-input-number
-                        :min="0"
-                        v-model="queryParam.min"
-                        placeholder=""
-                      ></el-input-number>
-                      <span style="color: #495e70; padding: 0 4px">-</span>
-                      <el-input-number
-                        :min="0"
-                        v-model="queryParam.max"
-                        placeholder=""
-                      ></el-input-number>
-                    </div>
-                  </el-form-item>
-
-                  <el-form-item label="风险清单生成时间:">
+                  <el-form-item label="阅读时间:">
                     <el-date-picker
-                      v-model="queryParam.time"
+                      v-model="queryParam.ydtime"
                       type="datetimerange"
                       range-separator="至"
                       start-placeholder="开始日期"
@@ -56,30 +54,46 @@
                     </el-date-picker>
                   </el-form-item>
 
-                  <el-form-item label="流程状态:">
-                    <el-select v-model="queryParam.type" placeholder="整改状态">
-                      <el-option label="整改完成" value="1"></el-option>
-                      <el-option label="正在整改" value="0"></el-option>
-                      <el-option label="未整改" value="2"></el-option>
+                  <el-form-item label="阅读状态:">
+                    <el-select clearable v-model="queryParam.yd" placeholder="">
+                      <el-option label="已阅读" value="1"></el-option>
+                      <el-option label="未阅读" value="0"></el-option>
                     </el-select>
                   </el-form-item>
 
                   <el-form-item label="企业类型:">
-                    <el-select v-model="queryParam.type" placeholder="">
-                      <el-option label="精细化工企业" value="1"></el-option>
-                      <el-option label="石化源头企业" value="0"></el-option>
-                      <el-option label="合成材料企业" value="2"></el-option>
+                    <el-select
+                      clearable
+                      v-model="queryParam.cmyType"
+                      placeholder=""
+                    >
+                      <el-option
+                        v-for="item in cmyTypeList"
+                        :key="item.value"
+                        :label="item.name"
+                        :value="item.value"
+                      >
+                      </el-option>
                     </el-select>
                   </el-form-item>
 
-                  <el-form-item label="处置方式:">
-                    <el-select v-model="queryParam.type" placeholder="">
-                      <el-option label="企业提醒" value="1"></el-option>
-                      <el-option label="核实消警" value="2"></el-option>
+                  <el-form-item label="提醒方式:">
+                    <el-select
+                      clearable
+                      v-model="queryParam.tiplWay"
+                      placeholder=""
+                    >
+                      <el-option
+                        v-for="item in tipWayList"
+                        :key="item.value"
+                        :label="item.name"
+                        :value="item.value"
+                      >
+                      </el-option>
                     </el-select>
                   </el-form-item>
                 </template>
-                <el-form-item>
+                <el-form-item style="margin-right: 0">
                   <el-button type="primary" @click="searchQuery"
                     >查询</el-button
                   >
@@ -105,15 +119,24 @@
             </div>
           </div>
           <div class="tableWrap">
-            <div class="wtzgPanel">
+            <div class="msgCenterPanel">
               <div
-                class="wtzgWrap"
+                class="msgCenterWrap"
                 v-for="(item, index) in dataSource"
                 :key="item.id + index"
               >
-                <div class="wtzgRow">
-                  <div class="wtzgCol">
-                    <div class="label">企业名称：</div>
+                <div class="msgCenterRow">
+                  <div class="msgCenterCol">
+                    <div class="label">消息类型：</div>
+                    <div class="value">
+                      <gDict
+                        :options="infoTypeList"
+                        :value="item.infoType"
+                      ></gDict>
+                    </div>
+                  </div>
+                  <div class="msgCenterCol">
+                    <div class="label">关联企业：</div>
                     <div
                       class="value qymc"
                       style="color: #ffe6d9"
@@ -124,59 +147,59 @@
                       {{ item.cmy }}
                     </div>
                   </div>
-                  <div class="wtzgCol">
-                    <div class="label">整改状态：</div>
+                  <div class="msgCenterCol">
+                    <div class="label">企业类型：</div>
                     <div class="value">
-                      <span v-if="item.iszg == 0" style="color: #fda722"
-                        >整改中</span
-                      >
-                      <span v-if="item.iszg == 1" style="color: #4cf993"
-                        >已完成整改</span
-                      >
-                      <span v-if="item.iszg == 2" style="color: #ff6262"
-                        >超期整改</span
-                      >
+                      <gDict
+                        :options="cmyTypeList"
+                        :value="item.cmyType"
+                      ></gDict>
                     </div>
                   </div>
-                  <div class="wtzgCol">
-                    <div class="label">整改进度：</div>
-                    <div class="valueWrap">
-                      <div class="rateBg">
-                        <div
-                          class="rate"
-                          :style="{ width: item.rate + '%' }"
-                        ></div>
-                      </div>
-                      <div class="rateWrap">{{ item.rate + "%" }}</div>
+                </div>
+                <div class="msgCenterRow">
+                  <div class="msgCenterCol">
+                    <div class="label">阅读状态：</div>
+                    <div class="value">已阅读</div>
+                  </div>
+                  <div class="msgCenterCol">
+                    <div class="label">提醒方式：</div>
+                    <div class="value">
+                      <gDict :options="tipWayList" :value="item.tipWay"></gDict>
                     </div>
                   </div>
-                </div>
-                <div class="wtzgRow">
-                  <div class="label">已整改内容：</div>
-                  <div class="valueRow">
-                    <div
-                      class="valueWrap"
-                      v-for="(list, _index) in item.yList"
-                      :key="list"
-                    >
-                      <div class="icon">{{ _index + 1 }}</div>
-                      <div class="value">{{ list }}</div>
+                  <div class="msgCenterCol">
+                    <div class="label">监管单位：</div>
+                    <div class="value">
+                      <gDict :options="unitList" :value="item.unit"></gDict>
                     </div>
                   </div>
                 </div>
-                <div class="wtzgRow">
-                  <div class="label">未整改内容：</div>
-                  <div class="valueRow">
-                    <div
-                      class="valueWrap wtwzgValue"
-                      v-for="(list, _index) in item.wList"
-                      :key="list"
-                    >
-                      <div class="icon">{{ _index + 1 }}</div>
-                      <div class="value">{{ list }}</div>
+                <div class="msgCenterRow">
+                  <div class="msgCenterCol">
+                    <div class="label">发送时间：</div>
+                    <div class="value">{{ item.time }}</div>
+                  </div>
+                  <div class="msgCenterCol">
+                    <div class="label">阅读时间：</div>
+                    <div class="value">{{ item.time }}</div>
+                  </div>
+                  <div class="msgCenterCol">
+                    <div class="label">处置方式：</div>
+                    <div class="value">
+                      <gDict
+                        :options="dealWayList"
+                        :value="item.dealWay"
+                      ></gDict>
                     </div>
                   </div>
                 </div>
+                <div class="msgCenterRow">
+                  <div class="msgCenterCol">
+                    <div class="label">提醒内容：</div>
+                    <div class="value">{{ item.tipnr }}</div>
+                  </div>
+                </div>
               </div>
             </div>
 
@@ -201,9 +224,11 @@
 <script>
 import tableMain from "../components/tableMain.vue";
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
+import { commonMixins } from "@/loveflow/mixins/commonMixins";
+
 export default {
   components: { tableMain },
-  mixins: [tableListMixins],
+  mixins: [tableListMixins, commonMixins],
   data() {
     return {
       backIcon: require("@/assets/images/topic/left.png"),
@@ -215,28 +240,7 @@ export default {
       ],
     };
   },
-  created() {
-    this.dataSource = [];
-    for (let i = 0; i < 20; i++) {
-      this.dataSource.push({
-        cmy: "海兴达化工有限公司" + i,
-        iszg: i % 3,
-        rate: (i % 9) * 10,
-        yList: [
-          "流动人员异常",
-          "重点岗位资质异常",
-          "车辆违规异常",
-          "人防配置情况异常",
-        ],
-        wList: [
-          "技防配置情况异常",
-          "企业应急预案制定异常",
-          "危化品车辆状态异常",
-          "人防设施情况异常",
-        ],
-      });
-    }
-  },
+  created() {},
   methods: {
     gotoPage(path) {
       this.$router.push({
@@ -294,15 +298,15 @@ export default {
       .tableWrap {
         height: 100%;
         overflow: hidden;
-        .wtzgPanel {
+        .msgCenterPanel {
           overflow-y: scroll;
           height: calc(100% - 50px);
           &::-webkit-scrollbar {
             display: none;
           }
 
-          .wtzgWrap {
-            height: vw(108);
+          .msgCenterWrap {
+            height: vw(138);
             background: url("~@/assets/images/team/wtzggzb.png") no-repeat
               center center;
             background-size: 100% 100%;
@@ -310,11 +314,11 @@ export default {
             flex-direction: column;
             justify-content: space-evenly;
             margin-bottom: vw(16);
-            .wtzgRow {
+            .msgCenterRow {
               padding: 0 vw(14);
               display: flex;
               align-items: center;
-              .wtzgCol {
+              .msgCenterCol {
                 display: flex;
                 align-items: center;
                 flex: 1;
diff --git a/src/views/enterpriseTeamWork/problemRectify/indexFeedback.vue b/src/views/enterpriseTeamWork/problemRectify/indexFeedback.vue
index de9199f..d499054 100644
--- a/src/views/enterpriseTeamWork/problemRectify/indexFeedback.vue
+++ b/src/views/enterpriseTeamWork/problemRectify/indexFeedback.vue
@@ -60,7 +60,7 @@
                     <el-option label="核实消警" value="2"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item>
+                <el-form-item style="margin-right: 0">
                   <el-button type="primary" @click="searchQuery"
                     >查询</el-button
                   >
diff --git a/src/views/enterpriseTeamWork/problemRectify/indexTrack.vue b/src/views/enterpriseTeamWork/problemRectify/indexTrack.vue
index f4246c2..f1c3839 100644
--- a/src/views/enterpriseTeamWork/problemRectify/indexTrack.vue
+++ b/src/views/enterpriseTeamWork/problemRectify/indexTrack.vue
@@ -49,7 +49,7 @@
                     ></el-input-number>
                   </div>
                 </el-form-item>
-                <el-form-item>
+                <el-form-item style="margin-right: 0">
                   <el-button type="primary" @click="searchQuery"
                     >查询</el-button
                   >
diff --git a/src/views/enterpriseTeamWork/riskHandle/index.vue b/src/views/enterpriseTeamWork/riskHandle/index.vue
index 3c97dff..3b807c8 100644
--- a/src/views/enterpriseTeamWork/riskHandle/index.vue
+++ b/src/views/enterpriseTeamWork/riskHandle/index.vue
@@ -28,11 +28,11 @@
                   <el-select
                     clearable
                     style="width: 160px"
-                    v-model="queryParam.type"
+                    v-model="queryParam.risk"
                     placeholder=""
                   >
                     <el-option
-                      v-for="item in riskTypeList"
+                      v-for="item in riskList"
                       :label="item.name"
                       :key="item.name"
                       :value="item.value"
@@ -81,7 +81,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item>
+                <el-form-item style="margin-right: 0">
                   <el-button type="primary" @click="searchQuery"
                     >查询</el-button
                   >
@@ -136,6 +136,32 @@
                   <div class="text">紧急</div>
                 </div>
               </template>
+              <template v-slot:riskSlot="{ scope }">
+                <gDict :options="riskList" :value="scope.row.risk"></gDict>
+              </template>
+              <template v-slot:ysSlot="{ scope }">
+                <gDict :options="elementList" :value="scope.row.ys"></gDict>
+              </template>
+              <template v-slot:unitSlot="{ scope }">
+                <gDict :options="unitList" :value="scope.row.unit"></gDict>
+              </template>
+              <template v-slot:stateSlot="{ scope }">
+                <div class="failWrap" v-if="scope.row.state == 0">
+                  <div class="text">处理失败</div>
+                </div>
+                <div class="ingWrap" v-if="scope.row.state == 1">
+                  <div class="text">进行中</div>
+                </div>
+                <div class="finishWrap" v-if="scope.row.state == 2">
+                  <div class="text">处置完成</div>
+                </div>
+              </template>
+              <template v-slot:dealWaySlot="{ scope }">
+                <gDict
+                  :options="dealWayList"
+                  :value="scope.row.dealWay"
+                ></gDict>
+              </template>
             </gMainTable>
           </div>
         </div>
@@ -163,28 +189,30 @@ export default {
           },
         },
         {
-          prop: "flowType",
+          slot: "riskSlot",
+          prop: "risk",
           label: "风险类型",
           attrs: {
-            width: 160,
+            width: 170,
           },
         },
         {
-          prop: "date",
+          prop: "time",
           label: "风险产生时间",
           attrs: {
             width: 180,
           },
         },
         {
-          prop: "qyName",
+          prop: "cmy",
           label: "风险关联企业",
           attrs: {
             width: 240,
           },
         },
         {
-          prop: "flowType",
+          slot: "ysSlot",
+          prop: "ys",
           label: "风险要素",
           attrs: {
             width: 160,
@@ -198,7 +226,8 @@ export default {
           },
         },
         {
-          prop: "node",
+          slot: "unitSlot",
+          prop: "unit",
           label: "监管单位",
           attrs: {
             width: 160,
@@ -217,7 +246,7 @@ export default {
           prop: "remarks",
           label: "风险整改流程",
           attrs: {
-            width: 70,
+            width: 120,
           },
         },
         {
@@ -232,7 +261,7 @@ export default {
           prop: "msg",
           label: "是否超期整改",
           attrs: {
-            width: 70,
+            width: 120,
           },
         },
         {
@@ -240,7 +269,7 @@ export default {
           prop: "msg",
           label: "是否挂牌督办",
           attrs: {
-            width: 70,
+            width: 120,
           },
         },
         {
@@ -251,7 +280,8 @@ export default {
           },
         },
         {
-          prop: "way",
+          slot: "dealWaySlot",
+          prop: "dealWay",
           label: "处置方式",
           attrs: {
             width: 140,
@@ -325,6 +355,10 @@ export default {
         display: none;
       }
 
+      .tableWrap {
+        height: calc(100% - 60px);
+      }
+
       .serialWrap {
         padding: 2px 6px;
         border: solid 1px #9ed7e7;
@@ -366,6 +400,21 @@ export default {
         background-size: 100% 100%;
         color: #ff6262;
       }
+      .failWrap {
+        display: flex;
+        align-items: center;
+        color: #ff6262;
+      }
+      .ingWrap {
+        display: flex;
+        align-items: center;
+        color: #4cf993;
+      }
+      .finishWrap {
+        display: flex;
+        align-items: center;
+        color: #30c4ff;
+      }
     }
   }
 }
diff --git a/src/views/enterpriseTeamWork/riskHandle/indexMy.vue b/src/views/enterpriseTeamWork/riskHandle/indexMy.vue
index 198f276..289c402 100644
--- a/src/views/enterpriseTeamWork/riskHandle/indexMy.vue
+++ b/src/views/enterpriseTeamWork/riskHandle/indexMy.vue
@@ -52,7 +52,7 @@
                     placeholder="请输入姓名、身份证"
                   ></el-input>
                 </el-form-item>
-                <el-form-item>
+                <el-form-item style="margin-right: 0">
                   <el-button type="primary" @click="searchQuery"
                     >查询</el-button
                   >
@@ -135,7 +135,7 @@ export default {
           label: "流程名称1",
         },
         {
-          prop: "date",
+          prop: "time",
           label: "创建时间",
           attrs: {
             width: 220,
@@ -173,7 +173,7 @@ export default {
           label: "流程名称2",
         },
         {
-          prop: "date",
+          prop: "time",
           label: "创建时间",
           attrs: {
             width: 220,
@@ -206,7 +206,7 @@ export default {
           label: "流程名称3",
         },
         {
-          prop: "date",
+          prop: "time",
           label: "创建时间",
           attrs: {
             width: 220,
@@ -252,7 +252,7 @@ export default {
           label: "流程名称4",
         },
         {
-          prop: "date",
+          prop: "time",
           label: "创建时间",
           attrs: {
             width: 220,
diff --git a/src/views/enterpriseTeamWork/riskOverview/dpie.vue b/src/views/enterpriseTeamWork/riskOverview/dpie.vue
index d6ec34f..7f3dc57 100644
--- a/src/views/enterpriseTeamWork/riskOverview/dpie.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/dpie.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="dpiePanel" id="dpieWrap">
-    <div
-      class="dpieLegend"
-      :style="{ width: 'calc(100% - ' + parseInt(4 * viewH) + 'px)' }"
-    >
+    <div class="dpieLegend">
       <div class="dpieRow" v-for="item in data" :key="item.name">
         <div class="flex-center">
           <div
@@ -316,7 +313,7 @@ export default {
     position: absolute;
     right: vw(30);
     height: 100%;
-    width: 70%;
+    width: 200px;
     display: flex;
     flex-direction: column;
     justify-content: center;
diff --git a/src/views/enterpriseTeamWork/riskOverview/index.vue b/src/views/enterpriseTeamWork/riskOverview/index.vue
index af877f1..177ec8a 100644
--- a/src/views/enterpriseTeamWork/riskOverview/index.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="riskOverviewWrap">
     <div class="screenRow screenRowTop pb14">
-      <div class="left mr16">
+      <div class="left canvasDefault mr14">
         <div class="optWrap">
           <timeSelect @ok="changeTime"></timeSelect>
         </div>
@@ -11,7 +11,7 @@
       </div>
       <div class="right">
         <div
-          class="leftWrap mr16"
+          class="leftWrap mr14 canvasPointer"
           @click="gotoPage('/teamWork/riskOverview/indexRisk')"
         >
           <div class="screenMTop">企业风险总数</div>
@@ -35,13 +35,13 @@
           </div>
         </div>
         <div
-          class="rightWrap"
+          class="rightWrap canvasPointer"
           @click="gotoPage('/teamWork/riskOverview/indexDuty')"
         >
           <colWrap title="企业状态占比">
             <div class="zgztWrap">
               <div class="top">
-                <div class="item itemLeft mr16">
+                <div class="item itemLeft mr14">
                   <div class="nameWrap">
                     <div class="icon">
                       <img src="@/assets/images/team/glztpj.png" />
@@ -69,14 +69,14 @@
         </div>
       </div>
     </div>
-    <div class="screenRow screenRowMid pb14">
-      <div class="left mr16">
+    <div class="screenRow canvasDefault screenRowMid pb14">
+      <div class="left mr14">
         <colWrap title="各类型企业监管占比">
           <pieWrap :chartObj="qyjgObj"></pieWrap>
         </colWrap>
       </div>
       <div class="right">
-        <div class="leftWrap mr16">
+        <div class="leftWrap mr14">
           <colWrap title="街道监管企业占比">
             <pieWrap :chartObj="jdjgObj"></pieWrap>
           </colWrap>
@@ -89,9 +89,9 @@
       </div>
     </div>
     <div class="screenRow screenRowBtm">
-      <div class="left mr16">
+      <div class="left mr14">
         <div
-          class="leftWrap mr16"
+          class="leftWrap mr14 canvasPointer"
           @click="gotoPage('/teamWork/riskOverview/indexDetail', '1')"
         >
           <colWrap title="高频扣分项">
@@ -99,7 +99,7 @@
           </colWrap>
         </div>
         <div
-          class="rightWrap"
+          class="rightWrap canvasPointer"
           @click="gotoPage('/teamWork/riskOverview/indexDetail', '2')"
         >
           <colWrap title="高频要素异常项">
@@ -109,7 +109,7 @@
       </div>
       <div class="right">
         <div
-          class="leftWrap mr16"
+          class="leftWrap mr14 canvasPointer"
           @click="gotoPage('/teamWork/riskOverview/indexDetail', '3')"
         >
           <colWrap title="连续2次纳入监管企业类型TOP">
@@ -117,7 +117,7 @@
           </colWrap>
         </div>
         <div
-          class="rightWrap mr16"
+          class="rightWrap canvasPointer mr14"
           @click="gotoPage('/teamWork/riskOverview/indexDetail', '3')"
         >
           <colWrap title="连续纳入监管企业TOP">
@@ -125,7 +125,7 @@
           </colWrap>
         </div>
         <div
-          class="rightWrap"
+          class="rightWrap canvasPointer"
           @click="gotoPage('/teamWork/riskOverview/indexDetail', '4')"
         >
           <colWrap title="连续两次未整改企业TOP">
diff --git a/src/views/enterpriseTeamWork/riskOverview/indexDetail.vue b/src/views/enterpriseTeamWork/riskOverview/indexDetail.vue
index dbbecaf..9cea40f 100644
--- a/src/views/enterpriseTeamWork/riskOverview/indexDetail.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/indexDetail.vue
@@ -92,6 +92,21 @@
                   详情
                 </div>
               </template>
+              <template v-slot:cmyTypeSlot="{ scope }">
+                <gDict
+                  :options="cmyTypeList"
+                  :value="scope.row.cmyType"
+                ></gDict>
+              </template>
+              <template v-slot:riskSlot="{ scope }">
+                <gDict :options="riskList" :value="scope.row.risk"></gDict>
+              </template>
+              <template v-slot:streetSlot="{ scope }">
+                <gDict :options="zhAreaList" :value="scope.row.street"></gDict>
+              </template>
+              <template v-slot:ysSlot="{ scope }">
+                <gDict :options="elementList" :value="scope.row.ys"></gDict>
+              </template>
             </gMainTable>
           </div>
         </div>
@@ -102,9 +117,11 @@
 <script>
 import tableMain from "../components/tableMain.vue";
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
+import { commonMixins } from "@/loveflow/mixins/commonMixins";
+
 export default {
   components: { tableMain },
-  mixins: [tableListMixins],
+  mixins: [tableListMixins, commonMixins],
   data() {
     return {
       backIcon: require("@/assets/images/topic/left.png"),
@@ -143,27 +160,36 @@ export default {
           label: "企业名称",
         },
         {
-          prop: "qyT",
+          slot: "cmyTypeSlot",
+          prop: "cmyType",
           label: "企业类型",
+          attrs: {
+            width: 120,
+          },
         },
         {
           prop: "times",
           label: "纳入监管次数",
         },
         {
-          prop: "date",
+          prop: "time",
           label: "本次纳入监管时间",
           attrs: {
             width: 220,
           },
         },
         {
+          slot: "streetSlot",
           prop: "street",
           label: "企业所属街道",
         },
         {
-          prop: "flowType",
+          slot: "riskSlot",
+          prop: "risk",
           label: "扣分项",
+          attrs: {
+            width: 170,
+          },
         },
         {
           slot: "stateSlot",
@@ -189,27 +215,32 @@ export default {
           label: "企业名称",
         },
         {
-          prop: "qyT",
+          slot: "cmyTypeSlot",
+          prop: "cmyType",
           label: "企业类型",
+          attrs: {
+            width: 120,
+          },
         },
         {
           prop: "times",
           label: "纳入监管次数",
         },
         {
-          prop: "date",
+          prop: "time",
           label: "本次纳入监管时间",
           attrs: {
             width: 220,
           },
         },
+        { slot: "streetSlot", prop: "street", label: "企业所属街道" },
         {
-          prop: "street",
-          label: "企业所属街道",
-        },
-        {
-          prop: "flowType",
+          slot: "ysSlot",
+          prop: "ys",
           label: "要素异常项",
+          attrs: {
+            width: 180,
+          },
         },
         {
           slot: "stateSlot",
@@ -235,8 +266,12 @@ export default {
           label: "企业名称",
         },
         {
-          prop: "qyT",
+          slot: "cmyTypeSlot",
+          prop: "cmyType",
           label: "企业类型",
+          attrs: {
+            width: 120,
+          },
         },
         {
           prop: "times",
@@ -247,24 +282,29 @@ export default {
           label: "连续纳入监管次数",
         },
         {
-          prop: "date",
+          prop: "time",
           label: "本次纳入监管时间",
           attrs: {
             width: 220,
           },
         },
         {
-          prop: "flowType",
+          prop: "risk",
+          slot: "riskSlot",
           label: "连续扣分项",
+          attrs: {
+            width: 170,
+          },
         },
         {
-          prop: "flowType",
+          slot: "ysSlot",
+          prop: "ys",
           label: "要素异常信息",
+          attrs: {
+            width: 180,
+          },
         },
-        {
-          prop: "street",
-          label: "企业所属街道",
-        },
+        { slot: "streetSlot", prop: "street", label: "企业所属街道" },
         {
           slot: "stateSlot",
           prop: "state",
@@ -289,11 +329,15 @@ export default {
           label: "企业名称",
         },
         {
-          prop: "qyT",
+          slot: "cmyTypeSlot",
+          prop: "cmyType",
           label: "企业类型",
+          attrs: {
+            width: 120,
+          },
         },
         {
-          prop: "date",
+          prop: "time",
           label: "纳入监管时间",
           attrs: {
             width: 220,
@@ -308,13 +352,11 @@ export default {
           label: "连续未整改次数",
         },
         {
-          prop: "flowType",
+          prop: "risk",
+          slot: "riskSlot",
           label: "未整改项",
         },
-        {
-          prop: "street",
-          label: "企业所属街道",
-        },
+        { slot: "streetSlot", prop: "street", label: "企业所属街道" },
         {
           prop: "remarks",
           label: "备注",
@@ -567,7 +609,6 @@ export default {
         align-items: center;
         color: #30c4ff;
       }
-
       .text {
         font-weight: 400;
         font-size: 14px;
diff --git a/src/views/enterpriseTeamWork/riskOverview/indexDuty.vue b/src/views/enterpriseTeamWork/riskOverview/indexDuty.vue
index ed3524d..5355afb 100644
--- a/src/views/enterpriseTeamWork/riskOverview/indexDuty.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/indexDuty.vue
@@ -24,25 +24,43 @@
                 </el-form-item>
 
                 <el-form-item label="管控扣分项:">
-                  <el-select clearable v-model="queryParam.kf" placeholder="">
-                    <el-option label="流动人员" value="1"></el-option>
-                    <el-option label="企业整改" value="0"></el-option>
-                    <el-option label="重点岗位" value="2"></el-option>
+                  <el-select clearable v-model="queryParam.risk" placeholder="">
+                    <el-option
+                      v-for="item in riskList"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    >
+                    </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="处置方式:">
-                  <el-select clearable v-model="queryParam.way" placeholder="">
-                    <el-option label="企业提醒" value="1"></el-option>
-                    <el-option label="核实消警" value="2"></el-option>
+                  <el-select
+                    clearable
+                    v-model="queryParam.dealWay"
+                    placeholder=""
+                  >
+                    <el-option
+                      v-for="item in dealWayList"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    >
+                    </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="监管单位:">
-                  <el-select clearable v-model="queryParam.dw" placeholder="">
-                    <el-option label="区委网信办" value="1"></el-option>
-                    <el-option label="区公安局" value="2"></el-option>
+                  <el-select clearable v-model="queryParam.unit" placeholder="">
+                    <el-option
+                      v-for="item in unitList"
+                      :key="item.value"
+                      :label="item.name"
+                      :value="item.value"
+                    >
+                    </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item>
+                <el-form-item style="margin-right: 0">
                   <el-button type="primary" @click="searchQuery"
                     >查询</el-button
                   >
@@ -82,6 +100,27 @@
                   <div class="text">紧急</div>
                 </div>
               </template>
+              <template v-slot:riskSlot="{ scope }">
+                <gDict :options="riskList" :value="scope.row.risk"></gDict>
+              </template>
+              <template v-slot:ysSlot="{ scope }">
+                <gDict :options="elementList" :value="scope.row.ys"></gDict>
+              </template>
+              <template v-slot:unitSlot="{ scope }">
+                <gDict :options="unitList" :value="scope.row.unit"></gDict>
+              </template>
+              <template v-slot:dealWaySlot="{ scope }">
+                <gDict
+                  :options="dealWayList"
+                  :value="scope.row.dealWay"
+                ></gDict>
+              </template>
+              <template v-slot:dealRequireSlot="{ scope }">
+                <gDict
+                  :options="dealRequireList"
+                  :value="scope.row.dealRequire"
+                ></gDict>
+              </template>
             </gMainTable>
           </div>
         </div>
@@ -100,9 +139,11 @@
 <script>
 import tableMain from "../components/tableMain.vue";
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
+import { commonMixins } from "@/loveflow/mixins/commonMixins";
+
 export default {
   components: { tableMain },
-  mixins: [tableListMixins],
+  mixins: [tableListMixins, commonMixins],
   data() {
     return {
       backIcon: require("@/assets/images/topic/left.png"),
@@ -116,16 +157,24 @@ export default {
           },
         },
         {
-          prop: "qyName",
+          prop: "cmy",
           label: "企业名称",
         },
         {
-          prop: "flowType",
+          slot: "riskSlot",
+          prop: "risk",
           label: "管控扣分项",
+          attrs: {
+            width: 170,
+          },
         },
         {
-          prop: "flowType",
-          label: "异常明细项",
+          slot: "ysSlot",
+          prop: "ys",
+          label: "异常明细",
+          attrs: {
+            width: 180,
+          },
         },
         {
           prop: "remarks",
@@ -142,7 +191,8 @@ export default {
           },
         },
         {
-          prop: "node",
+          slot: "unitSlot",
+          prop: "unit",
           label: "监管单位",
           attrs: {
             width: 140,
@@ -156,17 +206,19 @@ export default {
           },
         },
         {
-          prop: "way",
+          slot: "dealWaySlot",
+          prop: "dealWay",
           label: "处置方式",
           attrs: {
             width: 140,
           },
         },
         {
-          prop: "deal",
+          slot: "dealRequireSlot",
+          prop: "dealRequire",
           label: "处置要求",
           attrs: {
-            width: 140,
+            width: 120,
           },
         },
         {
diff --git a/src/views/enterpriseTeamWork/riskOverview/indexRisk.vue b/src/views/enterpriseTeamWork/riskOverview/indexRisk.vue
index 07dd55e..75f28c5 100644
--- a/src/views/enterpriseTeamWork/riskOverview/indexRisk.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/indexRisk.vue
@@ -18,6 +18,7 @@
               >
                 <el-form-item label="关键词:">
                   <el-input
+                    clearable
                     v-model="queryParam.key"
                     placeholder="请输入企业名称"
                   ></el-input>
@@ -61,30 +62,55 @@
                     </el-date-picker>
                   </el-form-item>
 
-                  <el-form-item label="流程状态:">
-                    <el-select v-model="queryParam.type" placeholder="整改状态">
-                      <el-option label="整改完成" value="1"></el-option>
-                      <el-option label="正在整改" value="0"></el-option>
-                      <el-option label="未整改" value="2"></el-option>
+                  <el-form-item label="整改状态:">
+                    <el-select
+                      clearable
+                      v-model="queryParam.state"
+                      placeholder=""
+                    >
+                      <el-option
+                        v-for="item in stateList"
+                        :key="item.value"
+                        :label="item.name"
+                        :value="item.value"
+                      >
+                      </el-option>
                     </el-select>
                   </el-form-item>
 
                   <el-form-item label="企业类型:">
-                    <el-select v-model="queryParam.type" placeholder="">
-                      <el-option label="精细化工企业" value="1"></el-option>
-                      <el-option label="石化源头企业" value="0"></el-option>
-                      <el-option label="合成材料企业" value="2"></el-option>
+                    <el-select
+                      clearable
+                      v-model="queryParam.cmyType"
+                      placeholder=""
+                    >
+                      <el-option
+                        v-for="item in cmyTypeList"
+                        :key="item.value"
+                        :label="item.name"
+                        :value="item.value"
+                      >
+                      </el-option>
                     </el-select>
                   </el-form-item>
 
                   <el-form-item label="处置方式:">
-                    <el-select v-model="queryParam.type" placeholder="">
-                      <el-option label="企业提醒" value="1"></el-option>
-                      <el-option label="核实消警" value="2"></el-option>
+                    <el-select
+                      clearable
+                      v-model="queryParam.dealWay"
+                      placeholder=""
+                    >
+                      <el-option
+                        v-for="item in dealWayList"
+                        :key="item.value"
+                        :label="item.name"
+                        :value="item.value"
+                      >
+                      </el-option>
                     </el-select>
                   </el-form-item>
                 </template>
-                <el-form-item>
+                <el-form-item style="margin-right: 0">
                   <el-button type="primary" @click="searchQuery"
                     >查询</el-button
                   >
@@ -164,6 +190,30 @@
               <template v-slot:optSlot="{ scope }">
                 <div class="clickText" @click="deal(scope.row)">挂牌督办</div>
               </template>
+              <template v-slot:riskSlot="{ scope }">
+                <gDict :options="riskList" :value="scope.row.risk"></gDict>
+              </template>
+              <template v-slot:cmyTypeSlot="{ scope }">
+                <gDict
+                  :options="cmyTypeList"
+                  :value="scope.row.cmyType"
+                ></gDict>
+              </template>
+              <template v-slot:ysSlot="{ scope }">
+                <gDict :options="elementList" :value="scope.row.ys"></gDict>
+              </template>
+              <template v-slot:dealWaySlot="{ scope }">
+                <gDict
+                  :options="dealWayList"
+                  :value="scope.row.dealWay"
+                ></gDict>
+              </template>
+              <template v-slot:dealRequireSlot="{ scope }">
+                <gDict
+                  :options="dealRequireList"
+                  :value="scope.row.dealRequire"
+                ></gDict>
+              </template>
             </gMainTable>
           </div>
         </div>
@@ -182,9 +232,11 @@
 <script>
 import tableMain from "../components/tableMain.vue";
 import { tableListMixins } from "@/loveflow/mixins/tableListMixins";
+import { commonMixins } from "@/loveflow/mixins/commonMixins";
+
 export default {
   components: { tableMain },
-  mixins: [tableListMixins],
+  mixins: [tableListMixins, commonMixins],
   data() {
     return {
       backIcon: require("@/assets/images/topic/left.png"),
@@ -205,21 +257,22 @@ export default {
           },
         },
         {
-          prop: "qyT",
+          slot: "cmyTypeSlot",
+          prop: "cmyType",
           label: "企业类型",
           attrs: {
             width: 120,
           },
         },
         {
-          prop: "date",
+          prop: "time",
           label: "纳入监管时间",
           attrs: {
             width: 180,
           },
         },
         {
-          prop: "date",
+          prop: "time",
           label: "清单生成时间",
           attrs: {
             width: 180,
@@ -232,19 +285,20 @@ export default {
             width: 180,
           },
         },
-
         {
-          prop: "flowType",
+          slot: "riskSlot",
+          prop: "risk",
           label: "管控扣分项",
           attrs: {
-            width: 120,
+            width: 170,
           },
         },
         {
-          prop: "flowType",
-          label: "要素异明细",
+          slot: "ysSlot",
+          prop: "ys",
+          label: "要素异常明细",
           attrs: {
-            width: 120,
+            width: 180,
           },
         },
         {
@@ -264,7 +318,8 @@ export default {
           },
         },
         {
-          prop: "way",
+          slot: "dealWaySlot",
+          prop: "dealWay",
           label: "处置方式",
           attrs: {
             width: 120,
@@ -287,7 +342,8 @@ export default {
           },
         },
         {
-          prop: "deal",
+          slot: "dealRequireSlot",
+          prop: "dealRequire",
           label: "处置要求",
           attrs: {
             width: 120,
@@ -463,7 +519,7 @@ export default {
         display: none;
       }
 
-      .tableWrap{
+      .tableWrap {
         height: calc(100% - 60px);
       }
 
diff --git a/src/views/enterpriseTeamWork/riskOverview/line.vue b/src/views/enterpriseTeamWork/riskOverview/line.vue
index cf1372f..a15f8c9 100644
--- a/src/views/enterpriseTeamWork/riskOverview/line.vue
+++ b/src/views/enterpriseTeamWork/riskOverview/line.vue
@@ -74,7 +74,7 @@ export default {
         },
         grid: {
           top: this.chartObj.gridTop || "20%",
-          bottom: this.chartObj.gridBtm || "10%",
+          bottom: this.chartObj.gridBtm || "15%",
           left: this.chartObj.gridLeft || "6%",
           right: "5%",
         },
diff --git a/src/views/enterpriseTeamWork/tipSet/dealRequire.vue b/src/views/enterpriseTeamWork/tipSet/dealRequire.vue
index 3ee2ddc..a7b49a3 100644
--- a/src/views/enterpriseTeamWork/tipSet/dealRequire.vue
+++ b/src/views/enterpriseTeamWork/tipSet/dealRequire.vue
@@ -4,30 +4,24 @@
       <div class="tableOperator"></div>
       <div class="searchWrap">
         <el-form :inline="true" :model="queryParam" class="demo-form-inline">
-          <el-form-item label="消息类型:">
-            <el-select clearable v-model="queryParam.msg" placeholder="">
+          <el-form-item label="处置方式:">
+            <el-select clearable v-model="queryParam.dealWay" placeholder="">
               <el-option
-                v-for="item in msgList"
+                v-for="item in dealWayList"
                 :label="item.name"
                 :key="item.name"
                 :value="item.value"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="请选择推送方式:">
-            <el-select clearable v-model="queryParam.cq" placeholder="">
-              <el-option
-                v-for="item in pushList"
-                :label="item.name"
-                :key="item.name"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="超期短信提醒:">
-            <el-select clearable v-model="queryParam.tx" placeholder="">
+          <el-form-item label="处置要求:">
+            <el-select
+              clearable
+              v-model="queryParam.dealRequire"
+              placeholder=""
+            >
               <el-option
-                v-for="item in isNoList"
+                v-for="item in dealRequireList"
                 :label="item.name"
                 :key="item.name"
                 :value="item.value"
@@ -63,11 +57,21 @@
         <template v-slot:optSlot="{ scope }">
           <span class="tableOPtBtn" @click="ruleSet(scope.row)"> 设置 </span>
         </template>
-        <template v-slot:isnSlot="{ scope }">
-          <gDict :options="isNoList" :value="scope.row.msg"></gDict>
+
+        <template v-slot:riskSlot="{ scope }">
+          <gDict :options="riskList" :value="scope.row.risk"></gDict>
+        </template>
+        <template v-slot:ysSlot="{ scope }">
+          <gDict :options="elementList" :value="scope.row.ys"></gDict>
+        </template>
+        <template v-slot:dealWaySlot="{ scope }">
+          <gDict :options="dealWayList" :value="scope.row.dealWay"></gDict>
         </template>
-        <template v-slot:msgSlot="{ scope }">
-          <gDict :options="msgList" :value="scope.row.jj"></gDict>
+        <template v-slot:dealRequireSlot="{ scope }">
+          <gDict
+            :options="dealRequireList"
+            :value="scope.row.dealRequire"
+          ></gDict>
         </template>
       </gMainTable>
     </div>
@@ -99,20 +103,23 @@ export default {
           },
         },
         {
+          slot: "riskSlot",
           prop: "risk",
           label: "风险类型",
         },
         {
-          prop: "flowType",
+          slot: "ysSlot",
+          prop: "ys",
           label: "异常明细项",
         },
         {
-          slot: "waySlot",
-          prop: "way",
+          slot: "dealWaySlot",
+          prop: "dealWay",
           label: "处置方式",
         },
         {
-          prop: "deal",
+          slot: "dealRequireSlot",
+          prop: "dealRequire",
           label: "处置要求",
         },
         {
diff --git a/src/views/enterpriseTeamWork/tipSet/msgPushDetail.vue b/src/views/enterpriseTeamWork/tipSet/msgPushDetail.vue
index 6dcc8da..05fb095 100644
--- a/src/views/enterpriseTeamWork/tipSet/msgPushDetail.vue
+++ b/src/views/enterpriseTeamWork/tipSet/msgPushDetail.vue
@@ -5,19 +5,19 @@
       <div class="searchWrap">
         <el-form :inline="true" :model="queryParam" class="demo-form-inline">
           <el-form-item label="消息类型:">
-            <el-select clearable v-model="queryParam.msg" placeholder="">
+            <el-select clearable v-model="queryParam.infoType" placeholder="">
               <el-option
-                v-for="item in msgList"
+                v-for="item in infoTypeList"
                 :label="item.name"
                 :key="item.name"
                 :value="item.value"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="请选择推送方式:">
-            <el-select clearable v-model="queryParam.cq" placeholder="">
+          <el-form-item label="推送方式:">
+            <el-select clearable v-model="queryParam.ts" placeholder="">
               <el-option
-                v-for="item in pushList"
+                v-for="item in tipWayList"
                 :label="item.name"
                 :key="item.name"
                 :value="item.value"
@@ -68,8 +68,14 @@
         <template v-slot:isnSlot="{ scope }">
           <gDict :options="isNoList" :value="scope.row.msg"></gDict>
         </template>
-        <template v-slot:msgSlot="{ scope }">
-          <gDict :options="msgList" :value="scope.row.jj"></gDict>
+        <template v-slot:infoTypeSlot="{ scope }">
+          <gDict :options="infoTypeList" :value="scope.row.infoType"></gDict>
+        </template>
+        <template v-slot:riskSlot="{ scope }">
+          <gDict :options="riskList" :value="scope.row.risk"></gDict>
+        </template>
+        <template v-slot:tipWaySlot="{ scope }">
+          <gDict :options="tipWayList" :value="scope.row.tipWay"></gDict>
         </template>
       </gMainTable>
     </div>
@@ -91,34 +97,6 @@ export default {
   mixins: [tableListMixins, commonMixins],
   data() {
     return {
-      msgList: [
-        {
-          name: "风险提醒",
-          value: "0",
-        },
-        {
-          name: "超期提醒",
-          value: "1",
-        },
-        {
-          name: "申诉核查提醒",
-          value: "2",
-        },
-      ],
-      pushList: [
-        {
-          name: "短信提醒",
-          value: "0",
-        },
-        {
-          name: "平台消息提醒",
-          value: "1",
-        },
-        {
-          name: "钉钉消息提醒",
-          value: "2",
-        },
-      ],
       dqList: [
         {
           name: "到期前一天",
@@ -143,36 +121,32 @@ export default {
           },
         },
         {
-          slot: "msgSlot",
-          prop: "jj",
+          slot: "infoTypeSlot",
+          prop: "infoType",
           label: "消息类型",
         },
         {
-          prop: "flowType",
+          slot: "riskSlot",
+          prop: "risk",
           label: "管控扣分项",
         },
         {
-          prop: "flowType",
+          prop: "node",
           label: "推送对象",
         },
         {
-          prop: "way",
+          slot: "tipWaySlot",
+          prop: "tipWay",
           label: "推送方式",
         },
         {
-          prop: "date",
+          prop: "time",
           label: "推送时间",
-          attrs: {
-            width: 180,
-          },
         },
         {
           slot: "isnSlot",
           prop: "msg",
           label: "是否短信提醒",
-          attrs: {
-            width: 70,
-          },
         },
         {
           slot: "optSlot",
@@ -284,7 +258,7 @@ export default {
     };
   },
   mounted() {
-    this.setFindItem("formItems", "jb").attrs.option = this.pushList;
+    this.setFindItem("formItems", "jb").attrs.option = this.infoTypeList;
     this.setFindItem("formItems", "tdx").attrs.option = this.pushObjList;
     this.setFindItem("formItems", "dx").attrs.option = this.isNoList;
     this.setFindItem("formItems", "cq").attrs.option = this.dqList;