From f4200797be75cd7ba9c6e6e387e517c67f70b114 Mon Sep 17 00:00:00 2001
From: loveflow <5269966+loveflow@user.noreply.gitee.com>
Date: Sun, 11 Feb 2024 17:33:22 +0800
Subject: [PATCH] update

---
 src/loveflow/assets/index.less                |   79 +-
 src/main.js                                   |    1 +
 src/views/companyCanban/fangyi.vue            |    8 +-
 src/views/companyCanban/index.vue             |  174 +--
 src/views/companyCanban/lieguan.vue           | 1182 +++++++++--------
 src/views/companyCanban/xiaofang.vue          |   65 +-
 src/views/companyCanban/zhian.vue             |    2 +-
 src/views/enterpriseRank/index.vue            |    4 +-
 .../components/companyDetails.vue             |   49 +-
 .../companyScore/components/companyTable.vue  |    4 +-
 .../companyScore/components/detailsTable.vue  |    6 +-
 .../components/indexTableDetail.vue           |   12 +-
 .../safeIndex/components/indexTable.vue       |   12 +-
 .../safeIndex/components/indexmassageOne.vue  |    2 +-
 .../systemManagement/safeIndex/index.vue      |   18 +-
 15 files changed, 837 insertions(+), 781 deletions(-)

diff --git a/src/loveflow/assets/index.less b/src/loveflow/assets/index.less
index 52e0902..cec5771 100644
--- a/src/loveflow/assets/index.less
+++ b/src/loveflow/assets/index.less
@@ -1,42 +1,43 @@
-.loveflow {
-  /* 定位 START */
-  .absolute {
-    position: absolute;
-  }
-  .relative {
-    position: relative;
-  }
-  .flex {
-    display: flex;
-  }
-  .flex-center {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  /* 定位 END */
+/* 定位 START */
+.absolute {
+  position: absolute;
+}
+.relative {
+  position: relative;
+}
+.flex {
+  display: flex;
+}
+.flex-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+/* 定位 END */
 
-  /* 间距 START*/
-  .mt6 {
-    margin-top: 6px;
-  }
-  .mr6 {
-    margin-right: 6px;
-  }
-  /* 间距 END*/
+/* 间距 START*/
+.mt6 {
+  margin-top: 6px;
+}
+.mt3 {
+  margin-top: 3px;
+}
+.mr6 {
+  margin-right: 6px;
+}
+/* 间距 END*/
 
-  /* 字体 START */
-  .fontWeight {
-    font-weight: bold;
-  }
-  .textGreen {
-    color: green;
-  }
-  .textRed {
-    color: red;
-  }
-  .textBlue {
-    color: blue;
-  }
-  /* 字体 END */
+/* 字体 START */
+.fontWeight {
+  font-weight: bold;
+}
+.textGreen {
+  color: green;
+}
+.textRed {
+  color: red;
+}
+.textBlue {
+  color: blue;
 }
+/* 字体 END */
diff --git a/src/main.js b/src/main.js
index 521e546..6f319a3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,6 +13,7 @@ import erupload from "./components/upload";
 import lkyTable from "./components/publicModule/lkyTable" // 本组件样式包含普通表格、分页
 import lkyPagination from "./components/publicModule/lkyPagination" // 本组件单独抽离分页样式
 
+import "@/loveflow/assets/index.less"
 import * as cusRule from '@/loveflow/rules'
 import { registerPlugins } from '@/loveflow/plugins/index'
 import FormDialog from '@/loveflow/components/modal/formDialog.vue'
diff --git a/src/views/companyCanban/fangyi.vue b/src/views/companyCanban/fangyi.vue
index a965ecd..5cebab6 100644
--- a/src/views/companyCanban/fangyi.vue
+++ b/src/views/companyCanban/fangyi.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="fangyi">
-        <div class="title" @click="showDialog"><img src="../../assets/safetyIndex/装饰009991.png" alt="">防疫安全</div>
+        <!-- <div class="title" @click="showDialog"><img src="../../assets/safetyIndex/装饰009991.png" alt="">防疫安全</div>
         <div class="fytb" id="fytb"></div>
         <div class="bottomBtns" @click="showDialog">
             <div class="bottomChild">
@@ -30,12 +30,12 @@
                     <div class="ChildSJNum_b">{{ yimiaoData.numValue }}</div>
                 </div>
             </div>
-        </div>
+        </div> -->
         <el-dialog title="防疫安全上报数据详情" :visible.sync="diaVisible" class="picForm">
             <div class="tjsj">
                 <div class="tjsjTitle">数据统计</div>
                 <div class="zhuangshi"></div>
-                <div class="tjsjChild" id="ymjzs">
+                <!-- <div class="tjsjChild" id="ymjzs">
                     <div class="numNum">{{ yimiaoData.numValue }}</div>
                     <div class="numText">疫苗接种数</div>
                 </div>
@@ -46,7 +46,7 @@
                 <div class="tjsjChild" id="csmycs">
                     <div class="numNum">{{ changsuoData.numValue }}</div>
                     <div class="numText">场所码异常</div>
-                </div>
+                </div> -->
             </div>
             <div class="fqs">
                 <div class="tjsjTitle">中高风险返企数</div>
diff --git a/src/views/companyCanban/index.vue b/src/views/companyCanban/index.vue
index 48280ee..1fbddff 100644
--- a/src/views/companyCanban/index.vue
+++ b/src/views/companyCanban/index.vue
@@ -1,102 +1,106 @@
 <template>
-    <div class="mainBox">
-        <div class="leftBox">
-            <fangyi :companyId="companyId" v-if="companyId"></fangyi>
-            <renyuan :companyId="companyId" v-if="companyId"></renyuan>
-            <weihuapin :companyId="companyId" v-if="companyId"></weihuapin>
-        </div>
-        <div class="middleBox">
-            <canban :companyId="companyId" :companyData="companyData" v-if="companyId && companyData"></canban>
-            <div class="middleBody">
-                <xiaofang :companyId="companyId" v-if="companyId"></xiaofang>
-                <lieguan :companyId="companyId" v-if="companyId"></lieguan>
-                <zhian :companyId="companyId" v-if="companyId"></zhian>
-            </div>
-        </div>
-        <div class="rightBox">
-            <daolu :companyId="companyId" v-if="companyId"></daolu>
-            <fanggopngji :companyId="companyId" v-if="companyId"></fanggopngji>
-            <wangluo :companyId="companyId" v-if="companyId"></wangluo>
-        </div>
+  <div class="mainBox">
+    <div class="leftBox">
+      <!-- <fangyi :companyId="companyId" v-if="companyId"></fangyi> -->
+      <xiaofang :companyId="companyId" v-if="companyId"></xiaofang>
+      <renyuan :companyId="companyId" v-if="companyId"></renyuan>
+      <weihuapin :companyId="companyId" v-if="companyId"></weihuapin>
     </div>
+    <div class="middleBox">
+      <canban
+        :companyId="companyId"
+        :companyData="companyData"
+        v-if="companyId && companyData"
+      ></canban>
+      <div class="middleBody">
+        <!-- <xiaofang :companyId="companyId" v-if="companyId"></xiaofang> -->
+        <lieguan :companyId="companyId" v-if="companyId"></lieguan>
+        <zhian :companyId="companyId" v-if="companyId"></zhian>
+      </div>
+    </div>
+    <div class="rightBox">
+      <daolu :companyId="companyId" v-if="companyId"></daolu>
+      <fanggopngji :companyId="companyId" v-if="companyId"></fanggopngji>
+      <wangluo :companyId="companyId" v-if="companyId"></wangluo>
+    </div>
+  </div>
 </template>
 
 <script>
-import fangyi from './fangyi.vue'
-import renyuan from './renyuan.vue'
-import weihuapin from './weihuapin.vue'
-import canban from './canban.vue'
-import xiaofang from './xiaofang.vue'
-import lieguan from './lieguan.vue'
-import zhian from './zhian.vue'
-import daolu from './daolu.vue'
-import fanggopngji from './fanggopngji.vue'
-import wangluo from './wangluo.vue'
+//import fangyi from "./fangyi.vue";
+import renyuan from "./renyuan.vue";
+import weihuapin from "./weihuapin.vue";
+import canban from "./canban.vue";
+import xiaofang from "./xiaofang.vue";
+import lieguan from "./lieguan.vue";
+import zhian from "./zhian.vue";
+import daolu from "./daolu.vue";
+import fanggopngji from "./fanggopngji.vue";
+import wangluo from "./wangluo.vue";
 
-import { companyBaseInfo } from '@/api/companyCanban'
+import { companyBaseInfo } from "@/api/companyCanban";
 export default {
-    components: {
-        fangyi,
-        renyuan,
-        weihuapin,
-        canban,
-        xiaofang,
-        lieguan,
-        zhian,
-        daolu,
-        fanggopngji,
-        wangluo
-    },
-    data() {
-        return {
-            companyId: '',
-            companyData: {}
-        }
-    },
-    created() {
-        this.companyId = sessionStorage.getItem('companyID')
-        companyBaseInfo({ id: this.companyId }).then(res => [
-            this.companyData = res.data,
-            console.log(this.companyData, 'this.companyData')
-        ])
-    },
-}
+  components: {
+    //fangyi,
+    renyuan,
+    weihuapin,
+    canban,
+    xiaofang,
+    lieguan,
+    zhian,
+    daolu,
+    fanggopngji,
+    wangluo,
+  },
+  data() {
+    return {
+      companyId: "",
+      companyData: {},
+    };
+  },
+  created() {
+    this.companyId = sessionStorage.getItem("companyID");
+    companyBaseInfo({ id: this.companyId }).then((res) => [
+      (this.companyData = res.data),
+      console.log(this.companyData, "this.companyData"),
+    ]);
+  },
+};
 </script>
 
 <style lang="less" scoped>
 .mainBox {
-    width: 100%;
-    height: calc(100% - 80px);
-    box-sizing: border-box;
-    display: flex;
-    padding: 20px;
+  width: 100%;
+  height: calc(100% - 80px);
+  box-sizing: border-box;
+  display: flex;
+  padding: 20px;
 
-    .leftBox {
-        width: 400px;
-        height: 100%;
-        margin-right: 20px;
-        box-sizing: border-box;
-    }
+  .leftBox {
+    width: 400px;
+    height: 100%;
+    margin-right: 20px;
+    box-sizing: border-box;
+  }
 
-    .middleBox {
-        width: calc(100% - 840px);
-        height: 100%;
+  .middleBox {
+    width: calc(100% - 840px);
+    height: 100%;
 
-        .middleBody {
-            margin-top: 20px;
-            height: calc(37.94% - 40px);
-            width: 100%;
-            display: flex;
-            justify-content: space-between;
-        }
+    .middleBody {
+      margin-top: 20px;
+      height: calc(37.94% - 40px);
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
     }
+  }
 
-    .rightBox {
-        width: 400px;
-        height: 100%;
-        margin-left: 20px;
-        box-sizing: border-box;
-
-    }
+  .rightBox {
+    width: 400px;
+    height: 100%;
+    margin-left: 20px;
+    box-sizing: border-box;
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/companyCanban/lieguan.vue b/src/views/companyCanban/lieguan.vue
index 0841d77..eb421f9 100644
--- a/src/views/companyCanban/lieguan.vue
+++ b/src/views/companyCanban/lieguan.vue
@@ -1,626 +1,654 @@
 <template>
-    <div class="xfwp">
-        <div class="title" @click="showDialog"><img src="../../assets/safetyIndex/装饰009991.png" alt="">列管物品安全</div>
-        <div class="bodyBox">
-            <div class="lgwp" id="lgwp"></div>
-        </div>
-        <el-dialog title="列管物品上报数据详情" :visible.sync="diaVisible" class="picForm">
-            <div class="wxhxp" id="fxfqs">
-                <div class="tjsjTitle">危险化学品</div>
-                <div class="zhuangshi"></div>
-            </div>
-            <div class="bottomBox">
-                <div class="fsywp" id="fsywp">
-                    <div class="tjsjTitle">放射源物品</div>
-                    <div class="zhuangshi"></div>
-                </div>
-                <div class="mycz" id="mycz">
-                    <div class="tjsjTitle">民用枪支管理</div>
-                    <div class="zhuangshi"></div>
-                </div>
-            </div>
-        </el-dialog>
+  <div class="xfwp">
+    <div class="title" @click="showDialog">
+      <img src="../../assets/safetyIndex/装饰009991.png" alt="" />列管物品安全
+    </div>
+    <div class="bodyBox">
+      <div class="lgwp" id="lgwp"></div>
     </div>
+    <el-dialog
+      title="列管物品上报数据详情"
+      :visible.sync="diaVisible"
+      class="picForm"
+    >
+      <div class="wxhxp" id="fxfqs">
+        <div class="tjsjTitle">危险化学品</div>
+        <div class="zhuangshi"></div>
+      </div>
+      <div class="bottomBox">
+        <div class="fsywp" id="fsywp">
+          <div class="tjsjTitle">放射源物品</div>
+          <div class="zhuangshi"></div>
+        </div>
+        <div class="mycz" id="mycz">
+          <div class="tjsjTitle">民用枪支管理</div>
+          <div class="zhuangshi"></div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import * as echarts from 'echarts';
+import * as echarts from "echarts";
 import "echarts-gl";
-import { tubeSafety, tubeSafetyDetail } from '@/api/companyCanban'
+import { tubeSafety, tubeSafetyDetail } from "@/api/companyCanban";
 export default {
-    props: ['companyId'],
-    data() {
-        return {
-            diaVisible: false,
-            companyID: this.companyId,
-            fireData: [],
-            fireDetailList: [],
-        }
+  props: ["companyId"],
+  data() {
+    return {
+      diaVisible: false,
+      companyID: this.companyId,
+      fireData: [],
+      fireDetailList: [],
+    };
+  },
+  created() {
+    tubeSafety({ companyId: this.companyID }).then((res) => {
+      this.fireData = res.data;
+      this.$nextTick(() => {
+        this.initlgwp();
+      });
+    });
+  },
+  methods: {
+    showDialog() {
+      tubeSafetyDetail({ companyId: this.companyID }).then((res) => {
+        this.fireDetailList = res.data;
+        this.diaVisible = true;
+        this.$nextTick(() => {
+          this.initfxfqs();
+          this.initygtb();
+          this.initmycz();
+        });
+      });
     },
-    created() {
-        tubeSafety({ companyId: this.companyID }).then(res => {
-            this.fireData = res.data
-            this.$nextTick(() => {
-                this.initlgwp()
-
-            })
-        })
+    initygtb() {
+      let myChart = echarts.init(document.getElementById("fsywp"));
+      const colors = ["#66C3FF", "#FFB571", "#FE6968"];
+      let data = [];
+      this.fireDetailList.radiations.forEach((item, index) => {
+        data.push({
+          value: item.numValue,
+          name: item.safeRuleName,
+          itemStyle: { color: colors[index] },
+        });
+      });
+      let option = {
+        tooltip: {
+          trigger: "item",
+        },
+        legend: {
+          // type: 'scroll',
+          orient: "vertical",
+          top: "15%",
+          right: "5%",
+          padding: [5, 10],
+          itemGap: 10,
+          itemWidth: 6,
+          itemHeight: 6,
+          width: 100,
+          backgroundColor: "rgba(108,128,151,0.2)",
+          lineHeight: 24,
+          textStyle: {
+            rich: {
+              a: {
+                color: "#D0DEEE",
+                lineHeight: 10,
+                padding: [3, 0, 3, 0],
+                width: 120,
+                height: 20,
+              },
+              b: {
+                color: "#FFFFF",
+                fontSize: 18,
+                fontWeight: 700,
+                padding: [3, 0, 3, 0],
+                width: 120,
+                height: 20,
+              },
+            },
+          },
+          formatter: function (name) {
+            var percent = 0;
+            for (var i = 0; i < data.length; i++) {
+              if (data[i].name == name) {
+                percent = data[i].value;
+              }
+            }
+            return "{a|" + name + "}" + "{b|" + percent + "}";
+          },
+        },
+        graphic: [
+          {
+            type: "image", // 插入圆环中间的图片
+            style: {
+              image: require("../../assets/companyCanban/放射源物品01.png"), // 本地图片要用require引入
+              width: 90, // 设置图片大小
+              height: 90,
+            },
+            // 设置图片位置
+            top: "23.8%",
+            left: "8.5%",
+          },
+        ],
+        backgroundColor: "rgba(255,255,255,0)",
+        series: [
+          {
+            type: "pie",
+            radius: ["55%", "70%"],
+            top: "middle",
+            left: "left",
+            width: "45%",
+            height: 190,
+            center: ["45%", "50%"],
+            itemStyle: {
+              borderRadius: 0,
+              borderColor: "rgba(255,255,255,0)",
+              borderWidth: 5,
+            },
+            label: {
+              show: false,
+              position: "center",
+            },
+            data,
+          },
+        ],
+      };
+      option && myChart.setOption(option);
     },
-    methods: {
-        showDialog() {
-            tubeSafetyDetail({ companyId: this.companyID }).then(res => {
-                this.fireDetailList = res.data
-                this.diaVisible = true
-                this.$nextTick(() => {
-                    this.initfxfqs()
-                    this.initygtb()
-                    this.initmycz()
-                })
-            })
+    initmycz() {
+      let myChart = echarts.init(document.getElementById("mycz"));
+      const colors = ["#66C3FF", "#FFB571", "#FE6968"];
+      let data = [];
+      this.fireDetailList.firearms.forEach((item, index) => {
+        data.push({
+          value: item.numValue,
+          name: item.safeRuleName,
+          itemStyle: { color: colors[index] },
+        });
+      });
+      let option = {
+        tooltip: {
+          trigger: "item",
         },
-        initygtb() {
-            let myChart = echarts.init(document.getElementById("fsywp"));
-            const colors = ['#66C3FF', '#FFB571', '#FE6968']
-            let data = []
-            this.fireDetailList.radiations.forEach((item, index) => {
-                data.push({
-                    value: item.numValue, name: item.safeRuleName, itemStyle: { color: colors[index], }
-                })
-            })
-            let option = {
-                tooltip: {
-                    trigger: 'item'
-                },
-                legend: {
-                    // type: 'scroll',
-                    orient: 'vertical',
-                    top: '15%',
-                    right: '5%',
-                    padding: [5, 10],
-                    itemGap: 10,
-                    itemWidth: 6,
-                    itemHeight: 6,
-                    width: 100,
-                    backgroundColor: 'rgba(108,128,151,0.2)',
-                    lineHeight: 24,
-                    textStyle: {
-                        rich: {
-                            a: {
-                                color: "#D0DEEE",
-                                lineHeight: 10,
-                                padding: [3, 0, 3, 0],
-                                width: 120,
-                                height: 20,
-                            },
-                            b: {
-                                color: "#FFFFF",
-                                fontSize: 18,
-                                fontWeight: 700,
-                                padding: [3, 0, 3, 0],
-                                width: 120,
-                                height: 20,
-                            },
-                        },
-                    },
-                    formatter: function (name) {
-                        var percent = 0;
-                        for (var i = 0; i < data.length; i++) {
-                            if (data[i].name == name) {
-                                percent = data[i].value
-                            }
-                        }
-                        return "{a|" + name + "}" + "{b|" + percent + "}";
-                    },
-                },
-                graphic: [{
-                    type: 'image',  // 插入圆环中间的图片
-                    style: {
-                        image: require('../../assets/companyCanban/放射源物品01.png'), // 本地图片要用require引入
-                        width: 90, // 设置图片大小
-                        height: 90
-                    },
-                    // 设置图片位置
-                    top: "23.8%",
-                    left: "8.5%",
-                },],
-                backgroundColor: 'rgba(255,255,255,0)',
-                series: [
-                    {
-                        type: 'pie',
-                        radius: ['55%', '70%'],
-                        top: "middle",
-                        left: "left",
-                        width: '45%',
-                        height: 190,
-                        center: ['45%', '50%'],
-                        itemStyle: {
-                            borderRadius: 0,
-                            borderColor: 'rgba(255,255,255,0)',
-                            borderWidth: 5
-                        },
-                        label: {
-                            show: false,
-                            position: 'center'
-                        },
-                        data
-                    }
-                ]
-            };
-            option && myChart.setOption(option);
+        legend: {
+          // type: 'scroll',
+          orient: "vertical",
+          top: "15%",
+          right: "5%",
+          padding: [5, 10],
+          itemGap: 10,
+          itemWidth: 6,
+          itemHeight: 6,
+          width: 100,
+          backgroundColor: "rgba(108,128,151,0.2)",
+          lineHeight: 24,
+          textStyle: {
+            rich: {
+              a: {
+                color: "#D0DEEE",
+                lineHeight: 10,
+                padding: [3, 0, 3, 0],
+                width: 120,
+                height: 20,
+              },
+              b: {
+                color: "#FFFFF",
+                fontSize: 18,
+                fontWeight: 700,
+                padding: [3, 0, 3, 0],
+                width: 120,
+                height: 20,
+              },
+            },
+          },
+          formatter: function (name) {
+            var percent = 0;
+            for (var i = 0; i < data.length; i++) {
+              if (data[i].name == name) {
+                percent = data[i].value;
+              }
+            }
+            return "{a|" + name + "}" + "{b|" + percent + "}";
+          },
         },
-        initmycz() {
-            let myChart = echarts.init(document.getElementById("mycz"));
-            const colors = ['#66C3FF', '#FFB571', '#FE6968']
-            let data = []
-            this.fireDetailList.firearms.forEach((item, index) => {
-                data.push({
-                    value: item.numValue, name: item.safeRuleName, itemStyle: { color: colors[index], }
-                })
-            })
-            let option = {
-                tooltip: {
-                    trigger: 'item'
-                },
-                legend: {
-                    // type: 'scroll',
-                    orient: 'vertical',
-                    top: '15%',
-                    right: '5%',
-                    padding: [5, 10],
-                    itemGap: 10,
-                    itemWidth: 6,
-                    itemHeight: 6,
-                    width: 100,
-                    backgroundColor: 'rgba(108,128,151,0.2)',
-                    lineHeight: 24,
-                    textStyle: {
-                        rich: {
-                            a: {
-                                color: "#D0DEEE",
-                                lineHeight: 10,
-                                padding: [3, 0, 3, 0],
-                                width: 120,
-                                height: 20,
-                            },
-                            b: {
-                                color: "#FFFFF",
-                                fontSize: 18,
-                                fontWeight: 700,
-                                padding: [3, 0, 3, 0],
-                                width: 120,
-                                height: 20,
-                            },
-                        },
-                    },
-                    formatter: function (name) {
-                        var percent = 0;
-                        for (var i = 0; i < data.length; i++) {
-                            if (data[i].name == name) {
-                                percent = data[i].value
-                            }
-                        }
-                        return "{a|" + name + "}" + "{b|" + percent + "}";
-                    },
-                },
-                graphic: [{
-                    type: 'image',  // 插入圆环中间的图片
-                    style: {
-                        image: require('../../assets/companyCanban/民用枪支管理01.png'), // 本地图片要用require引入
-                        width: 90, // 设置图片大小
-                        height: 90
-                    },
-                    // 设置图片位置
-                    top: "23.8%",
-                    left: "8.5%",
-                },],
-                backgroundColor: 'rgba(255,255,255,0)',
-                series: [
-                    {
-                        type: 'pie',
-                        radius: ['55%', '70%'],
-                        top: "middle",
-                        left: "left",
-                        width: '45%',
-                        height: 190,
-                        center: ['45%', '50%'],
-                        itemStyle: {
-                            borderRadius: 0,
-                            borderColor: 'rgba(255,255,255,0)',
-                            borderWidth: 5
-                        },
-                        label: {
-                            show: false,
-                            position: 'center'
-                        },
-                        data
-                    }
-                ]
-            };
-            option && myChart.setOption(option);
+        graphic: [
+          {
+            type: "image", // 插入圆环中间的图片
+            style: {
+              image: require("../../assets/companyCanban/民用枪支管理01.png"), // 本地图片要用require引入
+              width: 90, // 设置图片大小
+              height: 90,
+            },
+            // 设置图片位置
+            top: "23.8%",
+            left: "8.5%",
+          },
+        ],
+        backgroundColor: "rgba(255,255,255,0)",
+        series: [
+          {
+            type: "pie",
+            radius: ["55%", "70%"],
+            top: "middle",
+            left: "left",
+            width: "45%",
+            height: 190,
+            center: ["45%", "50%"],
+            itemStyle: {
+              borderRadius: 0,
+              borderColor: "rgba(255,255,255,0)",
+              borderWidth: 5,
+            },
+            label: {
+              show: false,
+              position: "center",
+            },
+            data,
+          },
+        ],
+      };
+      option && myChart.setOption(option);
+    },
+    initfxfqs() {
+      let myChart = echarts.init(document.getElementById("fxfqs"));
+      const dateList = this.fireDetailList.list_75.map((item) => {
+        return item.statisticsDate;
+      });
+      const jingnwaiList = this.fireDetailList.list_75.map((item) => {
+        return item.numValue;
+      });
+      const jingnneiList = this.fireDetailList.list_76.map((item) => {
+        return item.numValue;
+      });
+      const option = {
+        tooltip: {
+          trigger: "axis",
         },
-        initfxfqs() {
-            let myChart = echarts.init(document.getElementById("fxfqs"));
-            const dateList = this.fireDetailList.list_75.map(item => {
-                return item.statisticsDate
-            })
-            const jingnwaiList = this.fireDetailList.list_75.map(item => {
-                return item.numValue
-            })
-            const jingnneiList = this.fireDetailList.list_76.map(item => {
-                return item.numValue
-            })
-            const option = {
-                tooltip: {
-                    trigger: "axis",
-                },
-                grid: {
-                    top: "5%",
-                    right: "5%",
-                    bottom: "15%",
-                    left: "15%",
-                },
-                legend: [{
-                    data: ['这是一个小标题'],
-                    top: '5%',
-                    width: 100,
-                    selectedMode: false,
-                    textStyle: {
-                        color: 'rgba(255, 255, 255, 0.7)'
-                    },
-                }, {
-                    top: '5%',
-                    right: 'center',
-                    width: 200,
-                    data: ['易制爆物品', '剧毒物品'],
-                    textStyle: {
-                        color: 'rgba(255, 255, 255, 0.7)'
-                    },
-                },],
-                xAxis: {
-                    type: "category",
-                    show: true,
-                    minInterval: 1,
-                    splitLine: {
-                        show: false,
-                    },
-                    axisLabel: {
-                        show: true, // 是否显示刻度标签
-                        color: "#D0DEEE", // 刻度标签文字的颜色
-                    },
-                    minorTick: { show: false },
-                    data: dateList,
+        grid: {
+          top: "5%",
+          right: "5%",
+          bottom: "15%",
+          left: "15%",
+        },
+        legend: [
+          {
+            data: ["这是一个小标题"],
+            top: "5%",
+            width: 100,
+            selectedMode: false,
+            textStyle: {
+              color: "rgba(255, 255, 255, 0.7)",
+            },
+          },
+          {
+            top: "5%",
+            right: "center",
+            width: 200,
+            data: ["易制爆物品", "剧毒物品"],
+            textStyle: {
+              color: "rgba(255, 255, 255, 0.7)",
+            },
+          },
+        ],
+        xAxis: {
+          type: "category",
+          show: true,
+          minInterval: 1,
+          splitLine: {
+            show: false,
+          },
+          axisLabel: {
+            show: true, // 是否显示刻度标签
+            color: "#D0DEEE", // 刻度标签文字的颜色
+          },
+          minorTick: { show: false },
+          data: dateList,
+        },
+        yAxis: {
+          type: "value",
+          show: true,
+          minInterval: 1,
+          splitLine: {
+            show: false,
+          },
+          minorTick: { show: false },
+          axisLabel: {
+            show: true, // 是否显示刻度标签
+            color: "#FFF", // 刻度标签文字的颜色
+          },
+        },
+        series: [
+          {
+            name: "易制爆物品",
+            type: "line",
+            showSymbol: false,
+            stack: "Total",
+            emphasis: {
+              focus: "series",
+            },
+            areaStyle: {
+              opacity: 0.8,
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: "rgb(128, 255, 165)",
                 },
-                yAxis: {
-                    type: "value",
-                    show: true,
-                    minInterval: 1,
-                    splitLine: {
-                        show: false,
-                    },
-                    minorTick: { show: false },
-                    axisLabel: {
-                        show: true, // 是否显示刻度标签
-                        color: "#FFF", // 刻度标签文字的颜色
-                    },
+                {
+                  offset: 1,
+                  color: "rgb(1, 191, 236)",
                 },
-                series: [
-                    {
-                        name: "易制爆物品",
-                        type: "line",
-                        showSymbol: false,
-                        stack: "Total",
-                        emphasis: {
-                            focus: "series",
-                        },
-                        areaStyle: {
-                            opacity: 0.8,
-                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                                {
-                                    offset: 0,
-                                    color: "rgb(128, 255, 165)",
-                                },
-                                {
-                                    offset: 1,
-                                    color: "rgb(1, 191, 236)",
-                                },
-                            ]),
-                        },
-                        smooth: true,
-
-                        itemStyle: {
-                            normal: {
-                                color: "#00d2c4",
-                            },
-                        },
-                        data: jingnwaiList,
-                    },
-                    {
-                        name: "剧毒物品",
-                        type: "line",
-                        showSymbol: false,
-                        stack: "Total",
-                        emphasis: {
-                            focus: "series",
-                        },
-                        areaStyle: {
-                            opacity: 0.8,
-                            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                                {
-                                    offset: 0,
-                                    color: "rgb(255, 191, 0)",
-                                },
-                                {
-                                    offset: 1,
-                                    color: "rgb(224, 62, 76)",
-                                },
-                            ]),
-                        },
-                        smooth: true,
+              ]),
+            },
+            smooth: true,
 
-                        itemStyle: {
-                            normal: {
-                                color: "#FFCB6A",
-                            },
-                        },
-                        data: jingnneiList,
-                    },
-                ],
-            };
-            option && myChart.setOption(option);
-        },
-        initlgwp() {
-            const wupin = {
-                name: '列管物品',
-                value: [this.fireData[0].sumNumValue, this.fireData[1].sumNumValue, this.fireData[2].sumNumValue, this.fireData[3].sumNumValue],
-                // value: [2, 3, 3, 2],
-                areaStyle: {
-                    color: {
-                        type: 'linear',
-                        x: 0,
-                        y: 0,
-                        x2: 0,
-                        y2: 1,
-                        colorStops: [{
-                            offset: 0, color: 'rgba(101,255,251,0.45)' // 0% 处的颜色
-                        }, {
-                            offset: 1, color: 'rgba(0,255,142,0.42)' // 100% 处的颜色
-                        }],
-                        global: false // 缺省为 false
-                    }
+            itemStyle: {
+              normal: {
+                color: "#00d2c4",
+              },
+            },
+            data: jingnwaiList,
+          },
+          {
+            name: "剧毒物品",
+            type: "line",
+            showSymbol: false,
+            stack: "Total",
+            emphasis: {
+              focus: "series",
+            },
+            areaStyle: {
+              opacity: 0.8,
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: "rgb(255, 191, 0)",
                 },
-                lineStyle: {
-                    color: 'rgba(102,255,196,1)'
+                {
+                  offset: 1,
+                  color: "rgb(224, 62, 76)",
                 },
-                itemStyle: {
-                    color: '#66FFC4'
-                }
-            }
-            const sum = [this.fireData[0].sumNumValue, this.fireData[1].sumNumValue, this.fireData[2].sumNumValue, this.fireData[3].sumNumValue].sort(function (a, b) {
-                return b - a;
-            })[0];
-            console.log(sum, '总数');
-            let myChart = echarts.init(document.getElementById("lgwp"));
-            let option = {
-                tooltip: {
-                    trigger: 'item',
-                },
-
-                radar: {
-                    axisLine: {
-                        show: false,
-                    },
-                    axisTick: {
-                        show: false,
-                    },
-                    splitArea: {
-
-                        areaStyle: {
-                            color: 'rgba(29,138,134,0.26)',
-                        }
-                    },
-                    splitLine: {
+              ]),
+            },
+            smooth: true,
 
-                        lineStyle: {
-                            color: 'rgba(29,138,134,1)',
-                        }
-                    },
-                    // shape: 'circle',
-                    indicator: [
-                        { name: '危险化学品', max: sum },
-                        { name: '放射源物品', max: sum },
-                        { name: '民爆物品', max: sum },
-                        { name: '民用枪支管理', max: sum },
-
-                    ]
-                },
+            itemStyle: {
+              normal: {
+                color: "#FFCB6A",
+              },
+            },
+            data: jingnneiList,
+          },
+        ],
+      };
+      option && myChart.setOption(option);
+    },
+    initlgwp() {
+      const wupin = {
+        name: "列管物品",
+        value: [
+          this.fireData[0].sumNumValue,
+          this.fireData[1].sumNumValue,
+          this.fireData[2].sumNumValue,
+          this.fireData[3].sumNumValue,
+        ],
+        // value: [2, 3, 3, 2],
+        areaStyle: {
+          color: {
+            type: "linear",
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops: [
+              {
+                offset: 0,
+                color: "rgba(101,255,251,0.45)", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "rgba(0,255,142,0.42)", // 100% 处的颜色
+              },
+            ],
+            global: false, // 缺省为 false
+          },
+        },
+        lineStyle: {
+          color: "rgba(102,255,196,1)",
+        },
+        itemStyle: {
+          color: "#66FFC4",
+        },
+      };
+      const sum = [
+        this.fireData[0].sumNumValue,
+        this.fireData[1].sumNumValue,
+        this.fireData[2].sumNumValue,
+        this.fireData[3].sumNumValue,
+      ].sort(function (a, b) {
+        return b - a;
+      })[0];
+      console.log(sum, "总数");
+      let myChart = echarts.init(document.getElementById("lgwp"));
+      let option = {
+        tooltip: {
+          trigger: "item",
+        },
 
-                series: [
-                    {
-                        name: '列管物品',
-                        type: 'radar',
-                        data: [
-                            wupin
-                        ]
-                    }
-                ]
-            };
-            option && myChart.setOption(option);
+        radar: {
+          radius: "60%",
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+          splitArea: {
+            areaStyle: {
+              color: "rgba(29,138,134,0.26)",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "rgba(29,138,134,1)",
+            },
+          },
+          // shape: 'circle',
+          indicator: [
+            { name: "危险化学品", max: sum },
+            { name: "放射源物品", max: sum },
+            { name: "民爆物品", max: sum },
+            { name: "民用枪支管理", max: sum },
+          ],
         },
+
+        series: [
+          {
+            name: "列管物品",
+            type: "radar",
+            data: [wupin],
+          },
+        ],
+      };
+      option && myChart.setOption(option);
     },
-}
+  },
+};
 </script>
 
 <style lang="less" scoped>
 .xfwp {
-    width: calc(33.33% - 13.33px);
-    height: 100%;
-    background: url('~@/assets/safetyIndex/modelback.png') no-repeat;
+  width: calc(50% - 13.33px);
+  height: 100%;
+  background: url("~@/assets/safetyIndex/modelback.png") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  flex-wrap: wrap;
+  align-content: space-between;
+
+  .title {
+    width: 100%;
+    height: 33px;
+    background: url("~@/assets/safetyIndex/titleback.png") no-repeat;
     background-size: 100% 100%;
+    font-size: 16px;
+    color: #d9e7ff;
+    letter-spacing: 1px;
+    text-align: center;
+    font-weight: 500;
     display: flex;
-    flex-wrap: wrap;
-    align-content: space-between;
+    align-items: center;
+    cursor: pointer;
 
-    .title {
-        width: 100%;
-        height: 33px;
-        background: url('~@/assets/safetyIndex/titleback.png') no-repeat;
-        background-size: 100% 100%;
-        font-size: 16px;
-        color: #D9E7FF;
-        letter-spacing: 1px;
-        text-align: center;
-        font-weight: 500;
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-
-        img {
-            width: 16px;
-            height: 16px;
-            margin: 0 12px;
-        }
+    img {
+      width: 16px;
+      height: 16px;
+      margin: 0 12px;
     }
+  }
 
-    .bodyBox {
-        height: calc(100% - 35px);
-        width: 100%;
-        position: relative;
-        // padding: 12px 20px;
-
-        .lgwp {
-            width: 100%;
-            height: 100%;
-        }
+  .bodyBox {
+    height: calc(100% - 35px);
+    width: 100%;
+    position: relative;
+    //padding: 12px 0;
 
+    .lgwp {
+      width: 100%;
+      height: 100%;
     }
+  }
 
-    .picForm {
-        /deep/ .el-dialog {
-            background-color: rgba(0, 0, 0, 0);
-            background: url('~@/assets/head/编组 3021112.png') no-repeat;
-            background-size: 100% 100%;
-            width: 841px;
-            height: 500px;
-            position: relative;
+  .picForm {
+    /deep/ .el-dialog {
+      background-color: rgba(0, 0, 0, 0);
+      background: url("~@/assets/head/编组 3021112.png") no-repeat;
+      background-size: 100% 100%;
+      width: 841px;
+      height: 500px;
+      position: relative;
 
-            .el-dialog__title {
-                font-size: 16px;
-                color: #EBFFF4;
-                letter-spacing: 2px;
-                text-shadow: 0 0 9px rgba(21, 255, 195, 0.77);
-                font-weight: 400;
-            }
-
-            .el-dialog__body {
-                box-sizing: border-box;
-                padding: 15px;
-                height: 450px;
+      .el-dialog__title {
+        font-size: 16px;
+        color: #ebfff4;
+        letter-spacing: 2px;
+        text-shadow: 0 0 9px rgba(21, 255, 195, 0.77);
+        font-weight: 400;
+      }
 
-                .wxhxp {
-                    height: 230px;
-                    width: 100%;
-                    margin: 10px 0;
-                    background: url('~@/assets/companyCanban/09091.png') no-repeat;
-                    background-size: 100% 100%;
-                    position: relative;
-                    padding: 0 10px;
-                    box-sizing: border-box;
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: flex-end;
+      .el-dialog__body {
+        box-sizing: border-box;
+        padding: 15px;
+        height: 450px;
 
-                    .tjsjTitle {
-                        position: absolute;
-                        left: 14px;
-                        top: 10px;
-                        font-size: 16px;
-                        color: #FFE6D9;
-                        letter-spacing: 0;
-                        line-height: 16px;
-                        text-shadow: 0 0 8px rgba(255, 119, 52, 0.50);
-                        font-weight: 500;
-                    }
+        .wxhxp {
+          height: 230px;
+          width: 100%;
+          margin: 10px 0;
+          background: url("~@/assets/companyCanban/09091.png") no-repeat;
+          background-size: 100% 100%;
+          position: relative;
+          padding: 0 10px;
+          box-sizing: border-box;
+          display: flex;
+          justify-content: space-between;
+          align-items: flex-end;
 
-                    .zhuangshi {
-                        position: absolute;
-                        left: 0;
-                        top: 0;
-                        background: url('~@/assets/companyCanban/矩形（装饰）.png') no-repeat;
-                        background-size: 100% 100%;
-                        width: 15px;
-                        height: 15px;
-                    }
+          .tjsjTitle {
+            position: absolute;
+            left: 14px;
+            top: 10px;
+            font-size: 16px;
+            color: #ffe6d9;
+            letter-spacing: 0;
+            line-height: 16px;
+            text-shadow: 0 0 8px rgba(255, 119, 52, 0.5);
+            font-weight: 500;
+          }
 
-                }
+          .zhuangshi {
+            position: absolute;
+            left: 0;
+            top: 0;
+            background: url("~@/assets/companyCanban/矩形（装饰）.png")
+              no-repeat;
+            background-size: 100% 100%;
+            width: 15px;
+            height: 15px;
+          }
+        }
 
-                .bottomBox {
-                    height: 175px;
-                    width: 100%;
-                    display: flex;
-                    justify-content: space-between;
+        .bottomBox {
+          height: 175px;
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
 
-                    .fsywp {
-                        width: 385px;
-                        height: 100%;
-                        background: url('~@/assets/companyCanban/09091.png') no-repeat;
-                        background-size: 100% 100%;
-                        position: relative;
+          .fsywp {
+            width: 385px;
+            height: 100%;
+            background: url("~@/assets/companyCanban/09091.png") no-repeat;
+            background-size: 100% 100%;
+            position: relative;
 
-                        .tjsjTitle {
-                            position: absolute;
-                            left: 14px;
-                            top: 10px;
-                            font-size: 16px;
-                            color: #FFE6D9;
-                            letter-spacing: 0;
-                            line-height: 16px;
-                            text-shadow: 0 0 8px rgba(255, 119, 52, 0.50);
-                            font-weight: 500;
-                        }
+            .tjsjTitle {
+              position: absolute;
+              left: 14px;
+              top: 10px;
+              font-size: 16px;
+              color: #ffe6d9;
+              letter-spacing: 0;
+              line-height: 16px;
+              text-shadow: 0 0 8px rgba(255, 119, 52, 0.5);
+              font-weight: 500;
+            }
 
-                        .zhuangshi {
-                            position: absolute;
-                            left: 0;
-                            top: 0;
-                            background: url('~@/assets/companyCanban/矩形（装饰）.png') no-repeat;
-                            background-size: 100% 100%;
-                            width: 15px;
-                            height: 15px;
-                        }
-                    }
+            .zhuangshi {
+              position: absolute;
+              left: 0;
+              top: 0;
+              background: url("~@/assets/companyCanban/矩形（装饰）.png")
+                no-repeat;
+              background-size: 100% 100%;
+              width: 15px;
+              height: 15px;
+            }
+          }
 
-                    .mycz {
-                        width: 385px;
-                        height: 100%;
-                        background: url('~@/assets/companyCanban/09091.png') no-repeat;
-                        background-size: 100% 100%;
-                        position: relative;
+          .mycz {
+            width: 385px;
+            height: 100%;
+            background: url("~@/assets/companyCanban/09091.png") no-repeat;
+            background-size: 100% 100%;
+            position: relative;
 
-                        .tjsjTitle {
-                            position: absolute;
-                            left: 14px;
-                            top: 10px;
-                            font-size: 16px;
-                            color: #FFE6D9;
-                            letter-spacing: 0;
-                            line-height: 16px;
-                            text-shadow: 0 0 8px rgba(255, 119, 52, 0.50);
-                            font-weight: 500;
-                        }
+            .tjsjTitle {
+              position: absolute;
+              left: 14px;
+              top: 10px;
+              font-size: 16px;
+              color: #ffe6d9;
+              letter-spacing: 0;
+              line-height: 16px;
+              text-shadow: 0 0 8px rgba(255, 119, 52, 0.5);
+              font-weight: 500;
+            }
 
-                        .zhuangshi {
-                            position: absolute;
-                            left: 0;
-                            top: 0;
-                            background: url('~@/assets/companyCanban/矩形（装饰）.png') no-repeat;
-                            background-size: 100% 100%;
-                            width: 15px;
-                            height: 15px;
-                        }
-                    }
-                }
+            .zhuangshi {
+              position: absolute;
+              left: 0;
+              top: 0;
+              background: url("~@/assets/companyCanban/矩形（装饰）.png")
+                no-repeat;
+              background-size: 100% 100%;
+              width: 15px;
+              height: 15px;
             }
+          }
         }
+      }
     }
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/companyCanban/xiaofang.vue b/src/views/companyCanban/xiaofang.vue
index f377aad..3c6ad3f 100644
--- a/src/views/companyCanban/xiaofang.vue
+++ b/src/views/companyCanban/xiaofang.vue
@@ -10,25 +10,33 @@
       <div class="topBody" v-if="fireData">
         <div class="huozai">
           <img src="../../assets/companyCanban/icon/火灾事故.png" alt="" />
-          <div class="huozaiText">火灾事故</div>
-          <div class="red">{{ fireData[0].numValue }}</div>
+          <div class="flex-center">
+            <div class="huozaiText">火灾事故</div>
+            <div class="red mt3">{{ fireData[0].numValue }}</div>
+          </div>
         </div>
         <div class="huozai">
           <img src="../../assets/companyCanban/icon/协助扑救.png" alt="" />
-          <div class="huozaiText">协助扑救</div>
-          <div class="yellow">{{ fireData[3].numValue }}</div>
+          <div class="flex-center">
+            <div class="huozaiText">协助扑救</div>
+            <div class="yellow mt3">{{ fireData[3].numValue }}</div>
+          </div>
         </div>
       </div>
       <div class="topBody" v-if="fireData">
         <div class="huozai">
           <img src="../../assets/companyCanban/icon/消防违建.png" alt="" />
-          <div class="huozaiText">消防违建</div>
-          <div class="blue">{{ fireData[2].numValue }}</div>
+          <div class="flex-center">
+            <div class="huozaiText">消防违建</div>
+            <div class="blue mt3">{{ fireData[2].numValue }}</div>
+          </div>
         </div>
         <div class="huozai">
           <img src="../../assets/companyCanban/icon/其他事故.png" alt="" />
-          <div class="huozaiText">其他事故</div>
-          <div class="green">{{ fireData[1].numValue }}</div>
+          <div class="flex-center">
+            <div class="huozaiText">其他事故</div>
+            <div class="green mt3">{{ fireData[1].numValue }}</div>
+          </div>
         </div>
       </div>
     </div>
@@ -256,13 +264,16 @@ export default {
 
 <style lang="less" scoped>
 .xfwp {
-  width: calc(33.33% - 13.33px);
-  height: 100%;
+  /* width: calc(33.33% - 13.33px);
+  height: 100%; */
+  height: 36.42%;
+  width: 100%;
+  margin-bottom: 20px;
   background: url("~@/assets/safetyIndex/modelback.png") no-repeat;
   background-size: 100% 100%;
-  display: flex;
+  /* display: flex;
   flex-wrap: wrap;
-  align-content: space-between;
+  align-content: space-between; */
 
   .title {
     width: 100%;
@@ -313,24 +324,22 @@ export default {
     }
 
     .topBody {
-      height: 110px;
+      height: 50%;
       width: 100%;
       display: flex;
       justify-content: space-between;
 
       .huozai {
-        width: 60px;
+        //width: 60px;
         height: 100%;
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: center;
 
         img {
-          width: 58px;
-          height: 58px;
+          width: 48px;
+          height: 48px;
         }
 
         .huozaiText {
+          margin-right: 2px;
           font-size: 14px;
           color: #ffffff;
           letter-spacing: 1px;
@@ -341,7 +350,7 @@ export default {
           font-size: 16px;
           color: #ffcbc9;
           letter-spacing: 0.8px;
-          line-height: 33px;
+
           text-shadow: 0 0 8px rgba(255, 52, 52, 0.5);
           font-weight: 600;
         }
@@ -350,7 +359,7 @@ export default {
           font-size: 16px;
           color: #fff5c9;
           letter-spacing: 0.8px;
-          line-height: 33px;
+
           text-shadow: 0 0 8px rgba(255, 214, 52, 0.5);
           font-weight: 600;
         }
@@ -359,7 +368,7 @@ export default {
           font-size: 16px;
           color: #c9edff;
           letter-spacing: 0.8px;
-          line-height: 33px;
+
           text-shadow: 0 0 8px rgba(52, 227, 255, 0.5);
           font-weight: 600;
         }
@@ -368,7 +377,7 @@ export default {
           font-size: 16px;
           color: #c9fffb;
           letter-spacing: 0.8px;
-          line-height: 33px;
+
           text-shadow: 0 0 8px rgba(52, 255, 185, 0.5);
           font-weight: 600;
         }
@@ -597,7 +606,7 @@ export default {
               font-size: 16px;
               color: #ffcbc9;
               letter-spacing: 0.8px;
-              line-height: 33px;
+
               text-shadow: 0 0 8px rgba(255, 52, 52, 0.5);
               font-weight: 600;
             }
@@ -606,7 +615,7 @@ export default {
               font-size: 16px;
               color: #fff5c9;
               letter-spacing: 0.8px;
-              line-height: 33px;
+
               text-shadow: 0 0 8px rgba(255, 214, 52, 0.5);
               font-weight: 600;
             }
@@ -615,7 +624,7 @@ export default {
               font-size: 16px;
               color: #c9edff;
               letter-spacing: 0.8px;
-              line-height: 33px;
+
               text-shadow: 0 0 8px rgba(52, 227, 255, 0.5);
               font-weight: 600;
             }
@@ -624,7 +633,7 @@ export default {
               font-size: 16px;
               color: #c9fffb;
               letter-spacing: 0.8px;
-              line-height: 33px;
+
               text-shadow: 0 0 8px rgba(52, 255, 185, 0.5);
               font-weight: 600;
             }
@@ -654,4 +663,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/companyCanban/zhian.vue b/src/views/companyCanban/zhian.vue
index 92845d4..e687d99 100644
--- a/src/views/companyCanban/zhian.vue
+++ b/src/views/companyCanban/zhian.vue
@@ -151,7 +151,7 @@ export default {
 
 <style lang="less" scoped>
 .xfwp {
-    width: calc(33.33% - 13.33px);
+    width: calc(50% - 13.33px);
     height: 100%;
     background: url('~@/assets/safetyIndex/modelback.png') no-repeat;
     background-size: 100% 100%;
diff --git a/src/views/enterpriseRank/index.vue b/src/views/enterpriseRank/index.vue
index 61ae5cd..0b49164 100644
--- a/src/views/enterpriseRank/index.vue
+++ b/src/views/enterpriseRank/index.vue
@@ -27,7 +27,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="防疫安全">
+                    <!-- <el-table-column label="防疫安全">
                         <el-table-column show-overflow-tooltip label="疫苗接种数" width="35">
                             <template slot-scope="scope">
                                 <div>
@@ -56,7 +56,7 @@
                                 </div>
                             </template>
                         </el-table-column>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="人员安全">
                         <el-table-column show-overflow-tooltip label="流动人员" width="35">
                             <template slot-scope="scope">
diff --git a/src/views/systemManagement/companyScore/components/companyDetails.vue b/src/views/systemManagement/companyScore/components/companyDetails.vue
index 0c93162..db955b1 100644
--- a/src/views/systemManagement/companyScore/components/companyDetails.vue
+++ b/src/views/systemManagement/companyScore/components/companyDetails.vue
@@ -52,7 +52,7 @@
           <div class="data_two">{{ this.company_score }}</div>
         </div>
         <div class="company_data_right">
-          <div class="score_portion">
+          <!-- <div class="score_portion">
             <div class="score_img">
               <div class="img_box img_01"></div>
             </div>
@@ -60,7 +60,7 @@
             <div class="score_num">
               {{ this.score_one }}
             </div>
-          </div>
+          </div> -->
           <div class="score_portion">
             <div class="score_img">
               <div class="img_box img_05"></div>
@@ -150,7 +150,7 @@
     </div>
   </el-card>
 </template>
-  <script>
+<script>
 import Season from "./season";
 import IndexTableDetail from "./indexTableDetail";
 import DetailsTable from "./detailsTable";
@@ -204,7 +204,7 @@ export default {
   created() {
     console.log("params", this.$route.query);
     this.deatail_data = JSON.parse(this.$route.query.params);
-    this.company_id = this.deatail_data.companyId // 进入该页面的公司id, 传给右下表格的查询条件
+    this.company_id = this.deatail_data.companyId; // 进入该页面的公司id, 传给右下表格的查询条件
     if (this.deatail_data.scoreType === "month") {
       this.search_select = "月度";
       this.search_date = "1";
@@ -222,24 +222,37 @@ export default {
     this.company_name = this.deatail_data.companyName;
     this.company_score = this.deatail_data.score;
     // 主页表格数据展示顺序被打乱了
-    this.score_one =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防疫安全').score
-    this.score_two =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '人员安全').score
+    //this.score_one = this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防疫安全').score
+    this.score_two = this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(
+      (item) => item.levelIndexOne == "人员安全"
+    ).score;
     this.score_three =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '消防安全').score
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(
+        (item) => item.levelIndexOne == "消防安全"
+      ).score;
     this.score_four =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '危化运输安全').score
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(
+        (item) => item.levelIndexOne == "危化运输安全"
+      ).score;
     this.score_five =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '列管物品安全').score
-    this.score_six =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '内部治安安全').score
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(
+        (item) => item.levelIndexOne == "列管物品安全"
+      ).score;
+    this.score_six = this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(
+      (item) => item.levelIndexOne == "内部治安安全"
+    ).score;
     this.score_seven =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '道路安全').score
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(
+        (item) => item.levelIndexOne == "道路安全"
+      ).score;
     this.score_eight =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '防攻击安全').score
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(
+        (item) => item.levelIndexOne == "防攻击安全"
+      ).score;
     this.score_nine =
-      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(item=>item.levelIndexOne == '网络安全').score
+      this.deatail_data.tbSafeCompanyStatisticsScoreDetails.find(
+        (item) => item.levelIndexOne == "网络安全"
+      ).score;
   },
   mounted() {
     this.get_time();
@@ -375,7 +388,7 @@ export default {
   },
 };
 </script>
-  <style lang="less" scoped>
+<style lang="less" scoped>
 /* card统一样式 */
 .el-card.box-card.is-always-shadow {
   border: 0px;
@@ -622,4 +635,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue
index 88a538b..74e6e87 100644
--- a/src/views/systemManagement/companyScore/components/companyTable.vue
+++ b/src/views/systemManagement/companyScore/components/companyTable.vue
@@ -12,7 +12,7 @@
       </el-table-column>
       <el-table-column prop="score" label="平安指数"> </el-table-column>
       <el-table-column label="指标得分">
-        <el-table-column label="防疫安全" width="130">
+        <!-- <el-table-column label="防疫安全" width="130">
           <template slot-scope="scope">
             <div
               v-for="item in scope.row.tbSafeCompanyStatisticsScoreDetails"
@@ -23,7 +23,7 @@
               }}</span>
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="人员安全" width="120">
           <template slot-scope="scope">
             <div
diff --git a/src/views/systemManagement/companyScore/components/detailsTable.vue b/src/views/systemManagement/companyScore/components/detailsTable.vue
index 2ce7e89..7143d5f 100644
--- a/src/views/systemManagement/companyScore/components/detailsTable.vue
+++ b/src/views/systemManagement/companyScore/components/detailsTable.vue
@@ -111,11 +111,11 @@ export default {
           label: "填报时间",
           width: "200",
         },
-        {
+       /*  {
           prop: "numValue",
           label: "疫苗接种数",
           width: "280",
-        },
+        }, */
         {
           prop: "alarmLevel",
           label: "预警情况",
@@ -154,7 +154,7 @@ export default {
       console.log("this.three_level_arr", this.three_level_arr);
     });
     // 首次加载
-    this.three_level_id = "5";
+    this.three_level_id = "16";
     const new_arr = this.three_level_arr.filter(
       (item) => item.id == this.three_level_id
     );
diff --git a/src/views/systemManagement/companyScore/components/indexTableDetail.vue b/src/views/systemManagement/companyScore/components/indexTableDetail.vue
index e7bad1c..529a749 100644
--- a/src/views/systemManagement/companyScore/components/indexTableDetail.vue
+++ b/src/views/systemManagement/companyScore/components/indexTableDetail.vue
@@ -8,7 +8,7 @@
         <th class="table_title_three">三级指标</th>
       </tr>
       <!-- 防疫安全 -->
-      <tr class="table_body">
+      <!-- <tr class="table_body">
         <td rowspan="5">防疫安全</td>
         <td >疫苗接种数</td>
         <td @click="click_threelevel('5', '1')">疫苗接种数</td>
@@ -20,14 +20,14 @@
       <tr class="table_body">
         <td >场所码数据</td>
         <td @click="click_threelevel('10', '1')">场所码异常数</td>
-      </tr>
-      <tr class="table_body">
+      </tr> -->
+      <!-- <tr class="table_body">
         <td rowspan="2">中高风险返企数</td>
         <td @click="click_threelevel('12', '1')">境外人员</td>
       </tr>
       <tr class="table_body">
         <td @click="click_threelevel('13', '1')">境内人员</td>
-      </tr>
+      </tr> -->
       <!-- 人员安全 -->
       <tr class="table_body">
         <td rowspan="14">人员安全</td>
@@ -441,11 +441,11 @@ export default {
     return {
       display_data: {},
       one_index_three_level: [
-        { id: 5, levelIndexThree: "疫苗接种数" },
+       /*  { id: 5, levelIndexThree: "疫苗接种数" },
         { id: 8, levelIndexThree: "核算检测率" },
         { id: 10, levelIndexThree: "场所码异常数" },
         { id: 12, levelIndexThree: "境外人员" },
-        { id: 13, levelIndexThree: "境内人员" },
+        { id: 13, levelIndexThree: "境内人员" }, */
       ],
     };
   },
diff --git a/src/views/systemManagement/safeIndex/components/indexTable.vue b/src/views/systemManagement/safeIndex/components/indexTable.vue
index 8e7b661..32250f6 100644
--- a/src/views/systemManagement/safeIndex/components/indexTable.vue
+++ b/src/views/systemManagement/safeIndex/components/indexTable.vue
@@ -8,7 +8,7 @@
         <th class="table_title_three">三级指标</th>
       </tr>
       <!-- 防疫安全 -->
-      <tr class="table_body">
+      <!-- <tr class="table_body">
         <td rowspan="5" @click="click_onelevel('3')">防疫安全</td>
         <td @click="click_twolevel('4')">疫苗接种数</td>
         <td @click="click_threelevel('5', '1')">疫苗接种数</td>
@@ -20,14 +20,14 @@
       <tr class="table_body">
         <td @click="click_twolevel('9')">场所码数据</td>
         <td @click="click_threelevel('10', '1')">场所码异常数</td>
-      </tr>
-      <tr class="table_body">
+      </tr> -->
+      <!-- <tr class="table_body">
         <td @click="click_twolevel('11')" rowspan="2">中高风险返企数</td>
         <td @click="click_threelevel('12', '1')">境外人员</td>
       </tr>
       <tr class="table_body">
         <td @click="click_threelevel('13', '1')">境内人员</td>
-      </tr>
+      </tr> -->
       <!-- 人员安全 -->
       <tr class="table_body">
         <td rowspan="14" @click="click_onelevel('14')">人员安全</td>
@@ -441,11 +441,11 @@ export default {
     return {
       display_data: {},
       one_index_three_level: [
-        { id: 5, levelIndexThree: "疫苗接种数" },
+        /* { id: 5, levelIndexThree: "疫苗接种数" },
         { id: 8, levelIndexThree: "核算检测率" },
         { id: 10, levelIndexThree: "场所码异常数" },
         { id: 12, levelIndexThree: "境外人员" },
-        { id: 13, levelIndexThree: "境内人员" },
+        { id: 13, levelIndexThree: "境内人员" }, */
       ],
     };
   },
diff --git a/src/views/systemManagement/safeIndex/components/indexmassageOne.vue b/src/views/systemManagement/safeIndex/components/indexmassageOne.vue
index 9b1dc28..a2e294c 100644
--- a/src/views/systemManagement/safeIndex/components/indexmassageOne.vue
+++ b/src/views/systemManagement/safeIndex/components/indexmassageOne.vue
@@ -75,7 +75,7 @@ export default {
   created() {
     // 首次加载
     this.params = {
-      safeRuleId: 3,
+      safeRuleId: 14,
       levelIndex: 1,
     };
     safeCalculation(this.params).then((res) => {
diff --git a/src/views/systemManagement/safeIndex/index.vue b/src/views/systemManagement/safeIndex/index.vue
index 65d3611..7dc5fd3 100644
--- a/src/views/systemManagement/safeIndex/index.vue
+++ b/src/views/systemManagement/safeIndex/index.vue
@@ -15,15 +15,15 @@
           <!-- 综合指数算法表单 -->
           <div class="index_form">
             <el-form v-if="!btn_flag" ref="form" :model="form" class="form">
-              <el-form-item label="+ 防疫安全 ×" prop="rate_two">
+              <!-- <el-form-item label="+ 防疫安全 ×" prop="rate_two">
                 <label slot="label"
                   >+&nbsp;&nbsp;&nbsp;&nbsp;防疫安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
                 >
                 <el-input v-model="form.rate_two"></el-input>
-              </el-form-item>
-              <el-form-item label="+ 人员安全 ×" prop="rate_three">
+              </el-form-item> -->
+              <el-form-item label="人员安全 ×" prop="rate_three">
                 <label slot="label"
-                  >+&nbsp;&nbsp;&nbsp;&nbsp;人员安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
+                  >&nbsp;&nbsp;&nbsp;&nbsp;人员安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
                 >
                 <el-input v-model="form.rate_three"></el-input>
               </el-form-item>
@@ -77,15 +77,15 @@
               class="text_form"
               :disabled="disabled"
             >
-              <el-form-item label="+ 防疫安全 ×" prop="rate_two">
+              <!-- <el-form-item label="+ 防疫安全 ×" prop="rate_two">
                 <label slot="label"
                   >+&nbsp;&nbsp;&nbsp;&nbsp;防疫安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
                 >
                 <el-input v-model="form.rate_two"></el-input>
-              </el-form-item>
-              <el-form-item label="+ 人员安全 ×" prop="rate_three">
+              </el-form-item> -->
+              <el-form-item label="人员安全 ×" prop="rate_three">
                 <label slot="label"
-                  >+&nbsp;&nbsp;&nbsp;&nbsp;人员安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
+                  >&nbsp;&nbsp;&nbsp;&nbsp;人员安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
                 >
                 <el-input v-model="form.rate_three"></el-input>
               </el-form-item>
@@ -246,7 +246,7 @@ export default {
         const obj = {
           calculation: [
             { indexName: "内部治安管理", rate: this.form.rate_one, sort: "1" },
-            { indexName: "防疫安全", rate: this.form.rate_two, sort: "2" },
+            /* { indexName: "防疫安全", rate: this.form.rate_two, sort: "2" }, */
             { indexName: "人员安全", rate: this.form.rate_three, sort: "3" },
             {
               indexName: "道路交通安全秩序管理",