From 0e50007f5d563713caf778bf1798307b738aa465 Mon Sep 17 00:00:00 2001
From: loveflow <5269966+loveflow@user.noreply.gitee.com>
Date: Thu, 28 Mar 2024 01:17:46 +0800
Subject: [PATCH] update

---
 public/index.html                             |   7 +-
 public/map_load.js                            |  21 ++-
 public/static/config.js                       |   2 +-
 .../{编组 36备份 (2).png => mapei.png}    | Bin
 src/loveflow/assets/index.less                |   2 +
 src/loveflow/mixins/commonMixins.js           |  22 +++
 src/router/index.js                           |  10 ++
 src/router/routes/enterpriseTeamWork.js       |   4 +-
 src/router/routes/enterpriseTopic.js          |  16 +-
 src/router/routes/integration.js              |   9 ++
 src/views/archives/index.vue                  |   2 +-
 src/views/companyCanban/index.vue             |   2 +-
 .../compositeIndex/components/mapWrap.vue     |   6 +-
 src/views/compositeIndex/index.vue            |   3 +
 .../enterpriseRiskIndex/estimateDetail.vue    |   3 +-
 .../enterpriseTeamWork/elementInfo/hbar.vue   |   2 +-
 .../elementInfo/juageMap.vue                  |   6 +-
 .../problemAnalysis/bar.vue                   |   2 +-
 .../enterpriseTeamWork/problemRectify/bar.vue |   2 +-
 .../problemRectify/index.vue                  | 139 ++++++++++++++++--
 .../problemRectify/indexTrack.vue             |   5 +-
 .../enterpriseTeamWork/problemRectify/map.vue | 106 ++++++++++---
 .../enterpriseTeamWork/riskHandle/index.vue   |   6 +-
 .../riskHandle/indexDetail.vue                |   5 +-
 .../riskHandle/indexDetailForm.vue            |   1 +
 .../antiAttack/indexDetail.vue                |   2 +-
 .../enterpriseTopic/components/barOne.vue     |   2 +-
 .../enterpriseTopic/components/colWrap.vue    |  13 +-
 .../enterpriseTopic/personSafety/screen.vue   |  41 +++++-
 .../enterpriseTopic/roadSafety/ytTable.vue    |   2 +-
 src/views/enterpriseTopic/screen.vue          |   7 +-
 src/views/factor/components/factorMap.vue     |   6 +-
 .../realtimeWarning/components/warnMap.vue    |   3 +-
 33 files changed, 382 insertions(+), 77 deletions(-)
 rename src/assets/images/team/{编组 36备份 (2).png => mapei.png} (100%)

diff --git a/public/index.html b/public/index.html
index 4da0a61..1208d50 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,16 +5,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <script src="./static/config.js"></script>
-    <script>
-      document.title = window.$SYSTEMCONFIG.SYS_NAME || "镇海平安企业（园区）";
-    </script>
     <script src="<%= BASE_URL %>baiduapi.js"></script>
     <script src="<%= BASE_URL %>TextIconOverlay_min.js"></script>
     <script src="<%= BASE_URL %>MarkerClusterer_min.js"></script>
     <script src="<%= BASE_URL %>map_load.js"></script>
     <script src="<%= BASE_URL %>liveplayer-lib.min.js"></script>
-    <!-- <title></title> -->
-    <title></title>
   </head>
   <style>
     body {
@@ -28,6 +23,6 @@
     </noscript> -->
     <div id="app"></div>
     <!-- built files will be auto injected -->
-    <script src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=CSfWwqFqSVkQaqcAAMxKyXg6Moe9UUqA"></script>
+
   </body>
 </html>
diff --git a/public/map_load.js b/public/map_load.js
index 1a21f14..0ff8025 100644
--- a/public/map_load.js
+++ b/public/map_load.js
@@ -1,4 +1,5 @@
 console.log(window.$mapCfg);
+let mapType = window.$mapCfg.mapType;
 
 let bmapcfg = {
   imgext: ".png", //瓦片图的后缀 ------ 根据需要修改，一般是 .png .jpg
@@ -13,13 +14,23 @@ let bmapcfg = {
 var scripts = document.getElementsByTagName("script");
 var JS__FILE__ = scripts[scripts.length - 1].getAttribute("src"); //获得当前js文件路径
 bmapcfg.home = JS__FILE__.substr(0, JS__FILE__.lastIndexOf("/") + 1); //地图API主目录
+
 (function () {
   window.BMap_loadScriptTime = new Date().getTime();
+
   //加载地图API主文件
-  document.write(
-    '<script type="text/javascript" src="' +
-      bmapcfg.home +
-      'baiduapi.js"></script>'
-  );
+  if (mapType === "offline") {
+    document.write(
+      '<script type="text/javascript" src="' +
+        bmapcfg.home +
+        'baiduapi.js"></script>'
+    );
+  }
+
+  if (mapType === "online") {
+    document.write(
+      '<script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=CSfWwqFqSVkQaqcAAMxKyXg6Moe9UUqA"></script>'
+    );
+  }
 })();
 ///////////////////////////////////////////////////////////////////
diff --git a/public/static/config.js b/public/static/config.js
index 9862f07..b366935 100644
--- a/public/static/config.js
+++ b/public/static/config.js
@@ -1,5 +1,5 @@
 window.$mapCfg = {
-  mapType: "online", //在线；offline:离线
+  mapType: "online", //在线;  offline:离线
   lgt: "", //经度
   lat: "", //纬度
   center: [121.619992, 30.025703],
diff --git a/src/assets/images/team/编组 36备份 (2).png b/src/assets/images/team/mapei.png
similarity index 100%
rename from src/assets/images/team/编组 36备份 (2).png
rename to src/assets/images/team/mapei.png
diff --git a/src/loveflow/assets/index.less b/src/loveflow/assets/index.less
index b8b6ad3..52e2795 100644
--- a/src/loveflow/assets/index.less
+++ b/src/loveflow/assets/index.less
@@ -100,9 +100,11 @@
   font-weight: 400;
   font-size: 14px;
   color: #30c4ff !important;
+
   &:hover {
     opacity: 0.8;
     cursor: pointer;
+    text-decoration: underline;
   }
 }
 /* 字体 END */
diff --git a/src/loveflow/mixins/commonMixins.js b/src/loveflow/mixins/commonMixins.js
index 307e07e..ab249b6 100644
--- a/src/loveflow/mixins/commonMixins.js
+++ b/src/loveflow/mixins/commonMixins.js
@@ -277,6 +277,28 @@ export const commonMixins = {
           value: "4",
         },
       ],
+      companyArr: [
+        "宁波市鼎瑞翔新材料科技有限公司",
+        "镇海石化海达发展有限责任公司",
+        "宁波四明化工有限公司",
+        "宁波特粒科技有限公司",
+        "宁波市镇海欣利工艺品有限公司",
+        "宁波安捷化工物流有限公司",
+        "宁波和盛达能源科技有限公司",
+        "宁波市镇海俞范三合电镀厂",
+        "宁波华梦贸易有限公司",
+        "英力士苯领高分子材料（宁波）有限公司",
+        "宁波市镇海金泰金属有限公司",
+        "宁波市银舟表面技术有限公司",
+        "图腾纺织（宁波）有限公司",
+        "宁波人健化学制药有限公司",
+        "宁波明峰检验检测研究院股份有限公司",
+        "宁波铝亿合金材料有限公司",
+        "宁波龙宝泰生环保科技有限公司",
+        "浙江杭州湾腈纶有限公司",
+        "镇海蛟川物业管理有限公司",
+        "宁波镇海炼化利安德化工销售有限公司",
+      ],
     };
   },
   created() {},
diff --git a/src/router/index.js b/src/router/index.js
index 32a7ead..cb9839d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,11 +11,17 @@ const routes = [
   {
     path: "/workspace",
     name: "workspace",
+    meta: {
+      title: "首页",
+    },
     component: () => import("@/views/home/workspace"),
   },
   {
     path: "/login",
     name: "login",
+    meta: {
+      title: "登录",
+    },
     component: () => import("@/components/login"),
   },
 
@@ -38,6 +44,10 @@ router.beforeEach((to, from, next) => {
   /* console.log(to);
   console.log(from);
   console.log(getToken()); */
+  if (to.meta.title) {
+    document.title = to.meta.title;
+  }
+
   if (getToken() || to.path === "/login") {
     if (to.path == "/") {
       router.push({
diff --git a/src/router/routes/enterpriseTeamWork.js b/src/router/routes/enterpriseTeamWork.js
index 4149b73..f634b5f 100644
--- a/src/router/routes/enterpriseTeamWork.js
+++ b/src/router/routes/enterpriseTeamWork.js
@@ -24,7 +24,7 @@ export default [
         name: "riskOverview",
         meta: {
           head: false,
-          title: "风险概览详情",
+          title: "风险概览",
         },
         component: () =>
           import("@/views/enterpriseTeamWork/riskOverview/indexDetail"),
@@ -73,7 +73,7 @@ export default [
         name: "riskHandle",
         meta: {
           head: false,
-          title: "风险处置详情",
+          title: "风险处置",
         },
         component: () =>
           import("@/views/enterpriseTeamWork/riskHandle/indexDetail"),
diff --git a/src/router/routes/enterpriseTopic.js b/src/router/routes/enterpriseTopic.js
index 7fb6491..3d7383e 100644
--- a/src/router/routes/enterpriseTopic.js
+++ b/src/router/routes/enterpriseTopic.js
@@ -6,16 +6,25 @@ export default [
   {
     path: "/topic/screen",
     name: "screen",
+    meta: {
+      title: "专题驾驶舱",
+    },
     component: () => import("@/views/enterpriseTopic/screen"),
   },
   {
     path: "/topic/personSafety/screen",
     name: "personSafety",
+    meta: {
+      title: "人员安全",
+    },
     component: () => import("@/views/enterpriseTopic/personSafety/screen"),
   },
   {
     path: "/topic/inSecurity/cmyDetail",
     name: "inSecurityCmyDetail",
+    meta: {
+      title: "内部治安",
+    },
     component: () => import("@/views/enterpriseTopic/inSecurity/cmyDetail"),
   },
   {
@@ -23,6 +32,9 @@ export default [
     name: "topic",
     component: box,
     redirect: "/workspace",
+    meta: {
+      title: "专题驾驶舱",
+    },
     children: [
       {
         path: "/topic/screen",
@@ -56,7 +68,7 @@ export default [
         name: "dangerTransport",
         meta: {
           head: false,
-          title: "危险品运输详情",
+          title: "危险品运输",
         },
         component: () =>
           import("@/views/enterpriseTopic/dangerTransport/carDetail"),
@@ -75,7 +87,7 @@ export default [
         name: "antiAttack",
         meta: {
           head: false,
-          title: "防攻击详情",
+          title: "防攻击",
         },
         component: () =>
           import("@/views/enterpriseTopic/antiAttack/indexDetail"),
diff --git a/src/router/routes/integration.js b/src/router/routes/integration.js
index 88676fe..3e252e2 100644
--- a/src/router/routes/integration.js
+++ b/src/router/routes/integration.js
@@ -73,16 +73,25 @@ export default [
       {
         path: "/integration/safetyIndex",
         name: "safetyIndex",
+        meta: {
+          title: "综合指数",
+        },
         component: () => import("@/views/safetyIndex"),
       },
       {
         path: "/integration/archives",
         name: "archives",
+        meta: {
+          title: "企业档案",
+        },
         component: () => import("@/views/archives"),
       },
       {
         path: "/integration/companyCanban",
         name: "companyCanban",
+        meta: {
+          title: "综合指数",
+        },
         component: () => import("@/views/companyCanban"),
       },
       //企业排名
diff --git a/src/views/archives/index.vue b/src/views/archives/index.vue
index 1031e28..9b5bbde 100644
--- a/src/views/archives/index.vue
+++ b/src/views/archives/index.vue
@@ -431,7 +431,7 @@ export default {
       });
     },
     goBack() {
-      this.$router.go(-1);
+      this.$router.back();
     },
     downloadPic() {},
     uploadPic() {},
diff --git a/src/views/companyCanban/index.vue b/src/views/companyCanban/index.vue
index 1fbddff..d746a81 100644
--- a/src/views/companyCanban/index.vue
+++ b/src/views/companyCanban/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="mainBox">
+  <div class="mainBox" style="height:100%">
     <div class="leftBox">
       <!-- <fangyi :companyId="companyId" v-if="companyId"></fangyi> -->
       <xiaofang :companyId="companyId" v-if="companyId"></xiaofang>
diff --git a/src/views/compositeIndex/components/mapWrap.vue b/src/views/compositeIndex/components/mapWrap.vue
index 7a2f613..fbe35e9 100644
--- a/src/views/compositeIndex/components/mapWrap.vue
+++ b/src/views/compositeIndex/components/mapWrap.vue
@@ -28,9 +28,9 @@ export default {
     },
     initMap(data) {
       // 创建地图实例
-      let BMapGL = window.BMap;
-      let map = new BMapGL.Map("container", {
-      }); // 创建地图实例
+      let BMapGL =
+        window.$mapCfg.mapType === "online" ? window.BMapGL : window.BMap;
+      let map = new BMapGL.Map("container", {}); // 创建地图实例
       let company_list = data;
 
       console.log("data01", company_list);
diff --git a/src/views/compositeIndex/index.vue b/src/views/compositeIndex/index.vue
index 074ab53..d4d3f2f 100644
--- a/src/views/compositeIndex/index.vue
+++ b/src/views/compositeIndex/index.vue
@@ -147,12 +147,14 @@ export default {
     width: 24vw;
     left: 20px;
     top: 0vh;
+    z-index: 11;
   }
   .right_box {
     position: absolute;
     width: 24vw;
     right: 14px;
     top: 0vh;
+    z-index: 11;
   }
   .select_box {
     position: absolute;
@@ -160,6 +162,7 @@ export default {
     height: 4vh;
     top: 0.8vh;
     right: 26vw;
+    z-index: 12;
     /deep/.el-input__inner {
       background: #223335;
       color: aliceblue;
diff --git a/src/views/enterpriseRiskIndex/estimateDetail.vue b/src/views/enterpriseRiskIndex/estimateDetail.vue
index 5748928..c48b712 100644
--- a/src/views/enterpriseRiskIndex/estimateDetail.vue
+++ b/src/views/enterpriseRiskIndex/estimateDetail.vue
@@ -403,7 +403,8 @@ export default {
   },
   methods: {
     goBack() {
-      this.$router.push("/riskIndex/estimate");
+      //this.$router.push("/riskIndex/estimate");
+      this.$router.back();
     },
   },
 };
diff --git a/src/views/enterpriseTeamWork/elementInfo/hbar.vue b/src/views/enterpriseTeamWork/elementInfo/hbar.vue
index d119343..774a5db 100644
--- a/src/views/enterpriseTeamWork/elementInfo/hbar.vue
+++ b/src/views/enterpriseTeamWork/elementInfo/hbar.vue
@@ -102,7 +102,7 @@ export default {
             barWidth: 10,
             itemStyle: {
               color: (params) => {
-                console.log(params);
+                //console.log(params);
                 let color = {
                   type: "linear",
                   x: 0,
diff --git a/src/views/enterpriseTeamWork/elementInfo/juageMap.vue b/src/views/enterpriseTeamWork/elementInfo/juageMap.vue
index 47edd71..3a2c229 100644
--- a/src/views/enterpriseTeamWork/elementInfo/juageMap.vue
+++ b/src/views/enterpriseTeamWork/elementInfo/juageMap.vue
@@ -2,13 +2,13 @@
   <div class="juageMapPanel">
     <div class="mapLeftWrap mr14">
       <div class="mapTop">各区域频繁出现事件及次数</div>
-      <div class="mapBtm">
+      <div class="mapBtm canvasDefault">
         <hbar :chartObj="qyObj"></hbar>
       </div>
     </div>
     <div class="mapRightWrap">
       <div class="mapTop">热点事件分布预测</div>
-      <div class="mapBtm">
+      <div class="mapBtm canvasDefault">
         <mapWrap></mapWrap>
       </div>
     </div>
@@ -61,7 +61,7 @@ export default {
     background: url("~@/assets/images/team/screent.png") no-repeat center center;
     background-size: 100% 100%;
     font-weight: bold;
-    font-size: vw(20);
+    font-size: vw(18);
     color: #ffffff;
   }
   .mapBtm {
diff --git a/src/views/enterpriseTeamWork/problemAnalysis/bar.vue b/src/views/enterpriseTeamWork/problemAnalysis/bar.vue
index b4b1f0f..dc33f61 100644
--- a/src/views/enterpriseTeamWork/problemAnalysis/bar.vue
+++ b/src/views/enterpriseTeamWork/problemAnalysis/bar.vue
@@ -124,7 +124,7 @@ export default {
             barWidth: 6,
             itemStyle: {
               color: (params) => {
-                console.log(params);
+                //console.log(params);
                 let color = {
                   type: "linear",
                   x: 0,
diff --git a/src/views/enterpriseTeamWork/problemRectify/bar.vue b/src/views/enterpriseTeamWork/problemRectify/bar.vue
index ca44231..d6babae 100644
--- a/src/views/enterpriseTeamWork/problemRectify/bar.vue
+++ b/src/views/enterpriseTeamWork/problemRectify/bar.vue
@@ -102,7 +102,7 @@ export default {
             barWidth: 6,
             itemStyle: {
               color: (params) => {
-                console.log(params);
+                //console.log(params);
                 let color = {
                   type: "linear",
                   x: 0,
diff --git a/src/views/enterpriseTeamWork/problemRectify/index.vue b/src/views/enterpriseTeamWork/problemRectify/index.vue
index 25e1fcf..a727d0c 100644
--- a/src/views/enterpriseTeamWork/problemRectify/index.vue
+++ b/src/views/enterpriseTeamWork/problemRectify/index.vue
@@ -26,7 +26,7 @@
                       clearable
                       v-model="searchParam.state"
                       placeholder="请选择"
-                      @change="changeChart('gauge')"
+                      @change="changeChart"
                     >
                       <el-option
                         v-for="item in stateList"
@@ -42,7 +42,7 @@
                       clearable
                       v-model="searchParam.area"
                       placeholder="全部"
-                      @change="changeChart('dpie')"
+                      @change="areaChange"
                     >
                       <el-option
                         v-for="item in zhAreaList"
@@ -57,7 +57,11 @@
             </div>
           </div>
           <div class="midWrap">
-            <mapWrap></mapWrap>
+            <mapWrap
+              :chartObj="dataObj"
+              ref="mapChart"
+              @mapClick="mapClick"
+            ></mapWrap>
           </div>
           <div class="btmWrap">
             <div
@@ -72,11 +76,19 @@
           </div>
         </div>
         <div class="rightWrap">
-          <div class="zgHead">各区域整改企业数量</div>
-          <div class="zgBody zgBarBody" v-if="chartType == 'bar'">
+          <div
+            class="zgHead"
+            @click="gotoPage('/teamWork/problemRectify/indexTrack')"
+          >
+            {{ title }}
+          </div>
+          <div class="zgBody zgBarBody canvasDefault" v-if="chartType == 'bar'">
             <barWrap :chartObj="qyObj"></barWrap>
           </div>
-          <div class="zgBody zgPieBody" v-if="chartType == 'dpie'">
+          <div
+            class="zgBody zgPieBody canvasDefault"
+            v-if="chartType == 'dpie'"
+          >
             <div class="topWrap">
               <div class="label">整改企业总数</div>
               <div class="value">298</div>
@@ -91,7 +103,7 @@
               <div class="label">易制毒</div>
               <div class="label">重点消防单位</div>
             </div>
-            <div class="midWrap">
+            <div class="midWrap canvasDefault">
               <gaugeWrap :chartObj="qyObj"></gaugeWrap>
             </div>
             <div class="btmWrap">
@@ -175,6 +187,85 @@ export default {
       disableMixinCreated: true,
       timeArr: [],
       timeValue: "",
+      title: "各区域整改企业数量",
+      dataObj: {
+        points: [
+          [
+            121.716889,
+            29.964717,
+            { name: "招宝山街道", value: "330211000", yn: 32, zn: 5, wn: 3 },
+          ],
+          [
+            121.672319,
+            29.961326,
+            { name: "蛟川街道", value: "330211006", yn: 28, zn: 8, wn: 1 },
+          ],
+          [
+            121.582491,
+            29.97749,
+            { name: "骆驼街道", value: "330211003", yn: 24, zn: 7, wn: 2 },
+          ],
+          [
+            121.632643,
+            29.932736,
+            { name: "庄市街道", value: "330211004", yn: 21, zn: 10, wn: 4 },
+          ],
+          [
+            121.618127,
+            29.974399,
+            { name: "贵驷街道", value: "330211005", yn: 18, zn: 11, wn: 5 },
+          ],
+          [
+            121.630811,
+            30.024586,
+            { name: "澥浦镇", value: "330211002", yn: 27, zn: 9, wn: 3 },
+          ],
+          [
+            121.525171,
+            30.019719,
+            { name: "九龙湖镇", value: "330211001", yn: 25, zn: 8, wn: 2 },
+          ],
+        ],
+        temp: [
+          [
+            121.716889,
+            29.964717,
+            { name: "招宝山街道", value: "330211000", yn: 32, zn: 5, wn: 3 },
+          ],
+          [
+            121.672319,
+            29.961326,
+            { name: "蛟川街道", value: "330211006", yn: 28, zn: 8, wn: 1 },
+          ],
+          [
+            121.582491,
+            29.97749,
+            { name: "骆驼街道", value: "330211003", yn: 24, zn: 7, wn: 2 },
+          ],
+          [
+            121.632643,
+            29.932736,
+            { name: "庄市街道", value: "330211004", yn: 21, zn: 10, wn: 4 },
+          ],
+          [
+            121.618127,
+            29.974399,
+            { name: "贵驷街道", value: "330211005", yn: 18, zn: 11, wn: 5 },
+          ],
+          [
+            121.630811,
+            30.024586,
+            { name: "澥浦镇", value: "330211002", yn: 27, zn: 9, wn: 3 },
+          ],
+          [
+            121.525171,
+            30.019719,
+            { name: "九龙湖镇", value: "330211001", yn: 25, zn: 8, wn: 2 },
+          ],
+        ],
+        optType: "",
+        val: "",
+      },
     };
   },
   mounted() {
@@ -188,11 +279,22 @@ export default {
     timeSelect(val) {
       this.timeValue = val;
     },
-    changeChart(type) {
-      this.chartType = type;
+    changeChart(val) {
+      this.dataObj.optType = "state";
+      this.dataObj.val = val;
     },
     areaChange(val) {
-      console.log(val);
+      this.chartType = "dpie";
+      /* if (!val) {
+        this.dataObj.points = this.dataObj.temp;
+        return;
+      }
+      let findIndex = this.dataObj.temp.findIndex((e) => {
+        return (e[2]["value"] = val);
+      });
+      if (findIndex > -1) {
+        this.dataObj.points = this.dataObj.temp[findIndex];
+      } */
     },
     getLast12Months() {
       const now = new Date();
@@ -210,6 +312,11 @@ export default {
         path: path,
       });
     },
+    mapClick(e) {
+      console.log(e);
+      this.chartType = "gauge";
+      this.title = e.name || e.data[2]["name"];
+    },
   },
 };
 </script>
@@ -246,8 +353,6 @@ export default {
                 center center;
               background-size: 100% 100%;
             }
-            .name {
-            }
           }
           .value {
             font-weight: 400;
@@ -259,6 +364,9 @@ export default {
           &:hover {
             opacity: 0.8;
             cursor: pointer;
+            .name {
+              text-decoration: underline;
+            }
           }
         }
       }
@@ -308,11 +416,16 @@ export default {
         background: url("~@/assets/images/team/screenct.png") no-repeat center
           center;
         background-size: 100% 100%;
+        &:hover {
+          cursor: pointer;
+          opacity: 0.8;
+          text-decoration: underline;
+        }
       }
       .zgBody {
         margin-top: -10px;
         margin-left: 9px;
-        height: calc(100% - 40px);
+        height: calc(100% - 30px);
         background: linear-gradient(
           177deg,
           rgba(165, 200, 199, 0.1) 0%,
diff --git a/src/views/enterpriseTeamWork/problemRectify/indexTrack.vue b/src/views/enterpriseTeamWork/problemRectify/indexTrack.vue
index f1c3839..2a0bb3c 100644
--- a/src/views/enterpriseTeamWork/problemRectify/indexTrack.vue
+++ b/src/views/enterpriseTeamWork/problemRectify/indexTrack.vue
@@ -157,9 +157,10 @@
 <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"),
@@ -175,7 +176,7 @@ export default {
     this.dataSource = [];
     for (let i = 0; i < 20; i++) {
       this.dataSource.push({
-        cmy: "海兴达化工有限公司" + i,
+        cmy: this.companyArr[i % 9],
         iszg: i % 3,
         rate: (i % 9) * 10,
         yList: [
diff --git a/src/views/enterpriseTeamWork/problemRectify/map.vue b/src/views/enterpriseTeamWork/problemRectify/map.vue
index 4ea976f..2c0a194 100644
--- a/src/views/enterpriseTeamWork/problemRectify/map.vue
+++ b/src/views/enterpriseTeamWork/problemRectify/map.vue
@@ -1,11 +1,11 @@
 <template>
-  <div style="height: 100%; width: 100%">
-    <g-chart :echartdata="option"></g-chart>
+  <div style="height: 100%; width: 100%; position: relative">
+    <div ref="dom" class="mapChart"></div>
   </div>
 </template>
 
 <script>
-let img = require("@/assets/images/team/zzzg.png");
+let img = require("@/assets/images/team/mapei.png");
 export default {
   props: {
     chartObj: {
@@ -17,14 +17,27 @@ export default {
   },
   data() {
     return {
+      dom: null,
       option: {},
     };
   },
   mounted() {
     this.setOption();
+    this.$nextTick(() => {
+      setTimeout(() => {
+        this.dom = this.$echarts.init(this.$refs.dom);
+        this.dom.setOption(this.option, true);
+        this.dom.on("click", (e) => {
+          this.$emit("mapClick", e);
+        });
+      }, 100);
+    });
   },
   methods: {
     setOption() {
+      console.log(this.chartObj);
+      let optType = this.chartObj.optType;
+      let stateVal = this.chartObj.val;
       const that = this;
       that.$echarts.registerMap("镇海区", that.getData());
       let data = that.getData().features.map((item) => {
@@ -33,15 +46,7 @@ export default {
         };
       });
 
-      const points = [
-        [121.716889, 29.964717, { name: "招宝山街道", value: "3" }],
-        [121.672319, 29.961326, { name: "蛟川街道", value: "5" }],
-        [121.582491, 29.97749, { name: "骆驼街道", value: "8" }],
-        [121.632643, 29.932736, { name: "庄市街道", value: "5" }],
-        [121.618127, 29.974399, { name: "贵驷街道", value: "2" }],
-        [121.630811, 30.024586, { name: "澥浦镇", value: "7" }],
-        [121.525171, 30.019719, { name: "九龙湖镇", value: "4" }],
-      ];
+      let points = that.chartObj.points;
       that.option = {
         geo: [
           {
@@ -260,12 +265,45 @@ export default {
             zlevel: 5,
             label: {
               normal: {
+                position: "right",
                 show: true,
                 formatter: function (params) {
-                  var name = params.data[2].name;
-                  var value = params.data[2].value;
-                  var text = `正在整改\n{tline|${name}} : {fline|${value}家}`;
-                  // var text = `{tline|项目个数} : {fline|${value}}`
+                  var name =
+                    (Array.isArray(params.value) && params.value[2].name) ||
+                    params.data.name ||
+                    "";
+                  var yn =
+                    (Array.isArray(params.value) && params.value[2].yn) ||
+                    params.data.yn ||
+                    "";
+                  var zn =
+                    (Array.isArray(params.value) && params.value[2].zn) ||
+                    params.data.zn ||
+                    "";
+                  var wn =
+                    (Array.isArray(params.value) && params.value[2].wn) ||
+                    params.data.wn ||
+                    "";
+                  if (!name) {
+                    return;
+                  }
+
+                  var text = `{tline|${name}\n}{label|已整改}: {fline|${yn}\n}{label|正在整改}: {fline|${zn}\n}{label|未整改}: {fline|${wn}\n}`;
+                  console.log(text);
+                  if (optType == "state") {
+                    if (stateVal === "0") {
+                      //未完成
+                      text = `{tline|${name}\n}{label|未整改}: {fline|${wn}\n}`;
+                    }
+                    if (stateVal === "1") {
+                      //整改中
+                      text = `{tline|${name}\n}{label|正在整改}: {fline|${zn}\n}`;
+                    }
+                    if (stateVal === "2") {
+                      //已完成
+                      text = `{tline|${name}\n}{label|已整改}: {fline|${yn}\n}`;
+                    }
+                  }
                   return text;
                 },
                 color: "#fff",
@@ -277,14 +315,20 @@ export default {
                     fontWeight: 400,
                   },
                   tline: {
-                    padding: [4, 0, 0, 0],
-                    color: "#ABF8FF",
+                    padding: [4, 0, 0, -10],
+                    color: "#E3F3FF",
+                    fontSize: 12,
+                  },
+                  label: {
+                    padding: [4, 0, 0, -10],
+                    color: "#E3F3FF",
                     fontSize: 12,
                   },
                 },
               },
               emphasis: {
                 show: true,
+                scale: false,
               },
             },
             itemStyle: {
@@ -292,8 +336,8 @@ export default {
               opacity: 1,
             },
             symbol: "image://" + img,
-            symbolSize: [160, 50],
-            symbolOffset: [0, -20],
+            symbolSize: [48, 48],
+            symbolOffset: [-30, 0],
             z: 999,
             data: points,
           },
@@ -1691,5 +1735,27 @@ export default {
       return res;
     },
   },
+  watch: {
+    chartObj: {
+      handler(newval) {
+        this.setOption();
+        setTimeout(() => {
+          if (this.dom) {
+            this.dom.setOption(this.option, false);
+          }
+        }, 500);
+      },
+      deep: true,
+      // immediate: true,
+    },
+  },
 };
 </script>
+<style scoped lang="less">
+.mapChart {
+  position: absolute;
+  z-index: 10;
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/enterpriseTeamWork/riskHandle/index.vue b/src/views/enterpriseTeamWork/riskHandle/index.vue
index 3b807c8..7c26200 100644
--- a/src/views/enterpriseTeamWork/riskHandle/index.vue
+++ b/src/views/enterpriseTeamWork/riskHandle/index.vue
@@ -2,11 +2,11 @@
   <div class="riskHandleIndexPanel loveflow">
     <tableMain>
       <div class="riskHandleIndexWrap">
-        <div class="titleWrap">
+        <!-- <div class="titleWrap">
           <span @click="gotoPage('/teamWork/riskHandle/indexMy')">
             闭环处置</span
           >
-        </div>
+        </div> -->
         <div class="btmBody">
           <div class="flexSpaceBetween">
             <div class="tableOperator"></div>
@@ -349,7 +349,7 @@ export default {
       padding-top: vw(14);
       display: flex;
       flex-direction: column;
-      height: calc(100% - 50px);
+      height: calc(100% - 4px);
       overflow-y: scroll;
       &::-webkit-scrollbar {
         display: none;
diff --git a/src/views/enterpriseTeamWork/riskHandle/indexDetail.vue b/src/views/enterpriseTeamWork/riskHandle/indexDetail.vue
index 8475e99..d45b94f 100644
--- a/src/views/enterpriseTeamWork/riskHandle/indexDetail.vue
+++ b/src/views/enterpriseTeamWork/riskHandle/indexDetail.vue
@@ -73,6 +73,9 @@ export default {
         this.content = indexDetailRecord;
       }
     },
+    goBack() {
+      this.$router.back();
+    },
     gotoPage(val) {
       this.$router.push({
         path: val,
@@ -138,7 +141,7 @@ export default {
       flex-direction: column;
       height: calc(100% - 100px);
       overflow-y: scroll;
-      &::-webkit-scrollbar{
+      &::-webkit-scrollbar {
         display: none;
       }
       .failWrap {
diff --git a/src/views/enterpriseTeamWork/riskHandle/indexDetailForm.vue b/src/views/enterpriseTeamWork/riskHandle/indexDetailForm.vue
index eb9cab8..3c35fed 100644
--- a/src/views/enterpriseTeamWork/riskHandle/indexDetailForm.vue
+++ b/src/views/enterpriseTeamWork/riskHandle/indexDetailForm.vue
@@ -11,6 +11,7 @@
               </div>
               <div class="item">
                 <div class="label">企业名称：</div>
+
                 <div class="value clickText" @click="toDangan(info)">
                   {{ info.cmy }}
                 </div>
diff --git a/src/views/enterpriseTopic/antiAttack/indexDetail.vue b/src/views/enterpriseTopic/antiAttack/indexDetail.vue
index 44acc9c..9e25805 100644
--- a/src/views/enterpriseTopic/antiAttack/indexDetail.vue
+++ b/src/views/enterpriseTopic/antiAttack/indexDetail.vue
@@ -546,7 +546,7 @@ export default {
               align-items: center;
               .label {
                 color: #d0deee;
-                width: vw(86);
+                //width: vw(86);
               }
               .value {
                 color: #ffffff;
diff --git a/src/views/enterpriseTopic/components/barOne.vue b/src/views/enterpriseTopic/components/barOne.vue
index 7cf9140..b6500c5 100644
--- a/src/views/enterpriseTopic/components/barOne.vue
+++ b/src/views/enterpriseTopic/components/barOne.vue
@@ -109,7 +109,7 @@ export default {
             barWidth: 6,
             itemStyle: {
               color: (params) => {
-                console.log(params);
+                //console.log(params);
                 var color = {
                   type: "linear",
                   x: 0,
diff --git a/src/views/enterpriseTopic/components/colWrap.vue b/src/views/enterpriseTopic/components/colWrap.vue
index 1e2e269..7d16683 100644
--- a/src/views/enterpriseTopic/components/colWrap.vue
+++ b/src/views/enterpriseTopic/components/colWrap.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="screenColWrap">
-    <div class="screenName">
+    <div class="screenName" @click="navClick">
       <div class="screenIcon"></div>
       <div class="screenNameText">{{ title }}</div>
     </div>
@@ -18,10 +18,21 @@ export default {
         return "";
       },
     },
+    url: {
+      type: String,
+      default: () => {
+        return "";
+      },
+    },
   },
   data() {
     return {};
   },
+  methods: {
+    navClick() {
+      this.$emit("navClick", this.url);
+    },
+  },
 };
 </script>
 <style lang="scss">
diff --git a/src/views/enterpriseTopic/personSafety/screen.vue b/src/views/enterpriseTopic/personSafety/screen.vue
index db4e5da..a18560c 100644
--- a/src/views/enterpriseTopic/personSafety/screen.vue
+++ b/src/views/enterpriseTopic/personSafety/screen.vue
@@ -1,9 +1,15 @@
 <template>
   <div class="personSafetyWrap">
     <head-wrap title="人员安全风险评估"></head-wrap>
-    <div class="enterpriseTopicBody canvasPointer">
+    <div class="titleWrap">
+      <div class="backBtn" @click="goBack()"><img :src="backIcon" />返回</div>
+    </div>
+    <div class="enterpriseTopicBody">
       <div class="screenRow mb18">
-        <div class="screenCol mr18">
+        <div
+          class="screenCol mr18 canvasPointer"
+          @click="gotoPage('/topic/personSafety', '2', '0')"
+        >
           <div class="screenName">
             <div class="screenIcon"></div>
             <div class="screenNameText">重点岗位异常数</div>
@@ -133,6 +139,7 @@ export default {
   components: { headWrap, pCard, pTotal, pNum, pieSix, dPieOne, barFive },
   data() {
     return {
+      backIcon: require("@/assets/images/topic/left.png"),
       total: 53981 + "",
       tl1Obj: {
         name: "危险品领用人员",
@@ -241,6 +248,9 @@ export default {
     };
   },
   methods: {
+    goBack() {
+      this.$router.back();
+    },
     gotoPage(path, tab, item) {
       this.$router.push({
         path: path,
@@ -256,11 +266,38 @@ export default {
 
 <style lang="less" scoped>
 .personSafetyWrap {
+  position: relative;
   height: 100%;
   background: url("~@/assets/images/topic/allback.png") no-repeat center center;
   background-size: 100% 100%;
   box-sizing: border-box;
   overflow: hidden;
+  .titleWrap {
+    position: absolute;
+    top: 60px;
+    left: 14px;
+    display: flex;
+    align-items: center;
+    height: 46px;
+    font-weight: 600;
+    font-size: 16px;
+    color: #ebfff4;
+    letter-spacing: 2px;
+    text-shadow: 0px 0px 9px rgba(21, 255, 195, 0.6);
+    .backBtn {
+      display: flex;
+      align-items: center;
+      img {
+        margin-right: 2px;
+        width: 20px;
+        height: 20px;
+      }
+      &:hover {
+        opacity: 0.8;
+        cursor: pointer;
+      }
+    }
+  }
   .enterpriseTopicBody {
     position: absolute;
     top: 100px;
diff --git a/src/views/enterpriseTopic/roadSafety/ytTable.vue b/src/views/enterpriseTopic/roadSafety/ytTable.vue
index 3501dbd..7b73596 100644
--- a/src/views/enterpriseTopic/roadSafety/ytTable.vue
+++ b/src/views/enterpriseTopic/roadSafety/ytTable.vue
@@ -80,7 +80,7 @@ export default {
   height: 100%;
 
   .roadSafetyTableCustomWrap {
-    height: calc(100% - 8px);
+    height: calc(100% - 30px);
     overflow: scroll;
     &::-webkit-scrollbar {
       display: none;
diff --git a/src/views/enterpriseTopic/screen.vue b/src/views/enterpriseTopic/screen.vue
index 6ee5e86..491a466 100644
--- a/src/views/enterpriseTopic/screen.vue
+++ b/src/views/enterpriseTopic/screen.vue
@@ -23,7 +23,12 @@
             </div>
           </div>
           <div class="screenColTwo">
-            <colWrap class="height100" title="危险物品管理">
+            <colWrap
+              class="height100 pointer"
+              title="危险物品管理"
+              url="/topic/dangerTransport"
+              @navClick="gotoPage"
+            >
               <div
                 class="topCol canvasPointer"
                 @click="gotoPage('/topic/dangerTransport')"
diff --git a/src/views/factor/components/factorMap.vue b/src/views/factor/components/factorMap.vue
index e6b3971..acc7b6c 100644
--- a/src/views/factor/components/factorMap.vue
+++ b/src/views/factor/components/factorMap.vue
@@ -43,13 +43,15 @@ export default {
     };
   },
   mounted() {
-    console.log(this.minZoom);
+    console.log(window);
     this.init_map();
   },
   methods: {
     // 创建地图
     init_map() {
-      let BMap = window.BMap;
+      let BMap =
+        window.$mapCfg.mapType === "online" ? window.BMapGL : window.BMap;
+      //var map = new BMap.Map("allmap");
       let map = new BMap.Map("container", {
         style: {
           styleJson,
diff --git a/src/views/realtimeWarning/components/warnMap.vue b/src/views/realtimeWarning/components/warnMap.vue
index a77fd41..09672d6 100644
--- a/src/views/realtimeWarning/components/warnMap.vue
+++ b/src/views/realtimeWarning/components/warnMap.vue
@@ -37,7 +37,8 @@ export default {
   methods: {
     // 创建地图
     init_map() {
-      let BMap = window.BMap;
+      let BMap =
+        window.$mapCfg.mapType === "online" ? window.BMapGL : window.BMap;
       let map = new BMap.Map("container", {
         style: {
           styleJson,