From 7645995af2d59c49434e904c4c38c57b6841fd6a Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Thu, 10 Oct 2024 14:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E6=9B=B4=E6=8D=A2=E3=80=81=E8=88=86=E6=83=85?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?100%=E3=80=81=E8=88=86=E6=83=85=E5=88=86=E7=B1=BB=E5=8F=96?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=B9=B6=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=AF=94=E4=BE=8B=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E2=8C=88=20=E4=BB=8E=E5=89=8D=E7=AB=AF=E5=86=99=E6=AD=BB?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E7=9A=84=20=E2=8C=8B=E3=80=81?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=80=E4=BA=9B=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +-
 src/views/privateOrder/Screen.vue             |  4 +-
 .../ecosphere/components/componentRight.vue   |  3 +-
 .../ecosphere/components/componentmapbox.vue  | 92 ++++++++++---------
 src/views/privateOrder/ecosphere/index.vue    |  1 +
 .../components/componentRight.vue             |  4 +-
 .../security/components/Earth.vue             |  6 +-
 .../sentiment/components/TransferVolume.vue   |  2 +-
 .../commandControl/gridMemberInfo.vue         | 10 +-
 .../components/commandControl/index.vue       | 28 +++---
 .../sentiment/components/componentLeft.vue    |  3 +-
 .../sentiment/components/componentRight.vue   |  6 +-
 .../sentiment/components/mediaPie.vue         | 87 ++++++++++--------
 .../sentiment/components/sentimentPie.vue     | 86 +++++++++--------
 14 files changed, 185 insertions(+), 151 deletions(-)

diff --git a/.env.development b/.env.development
index f514633..340cfd2 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,6 @@ ENV = 'development'
 VUE_APP_BASE_API = '/dashboard'
 
 # VUE_APP_BASE_API2 = 'http://39.101.188.84:9027'
-# VUE_APP_BASE_API2 = 'http://192.168.0.110:9035'
-VUE_APP_BASE_API2 = 'http://39.101.188.84:9035'
+VUE_APP_BASE_API2 = 'http://192.168.0.108:9035'
+# VUE_APP_BASE_API2 = 'http://39.101.188.84:9035'
 BASE_API = 'http://10.10.3.35:9070'
diff --git a/src/views/privateOrder/Screen.vue b/src/views/privateOrder/Screen.vue
index a7f32d9..a5496e9 100644
--- a/src/views/privateOrder/Screen.vue
+++ b/src/views/privateOrder/Screen.vue
@@ -37,7 +37,9 @@
         </div>
         <div class="year-wrap"></div>
       </div>
-      <router-view />
+      <keep-alive include="ecosphere">
+        <router-view />
+      </keep-alive>
     </div>
     <div>
       <el-button
diff --git a/src/views/privateOrder/ecosphere/components/componentRight.vue b/src/views/privateOrder/ecosphere/components/componentRight.vue
index 43b6097..4361ea8 100644
--- a/src/views/privateOrder/ecosphere/components/componentRight.vue
+++ b/src/views/privateOrder/ecosphere/components/componentRight.vue
@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description: 总体概览右侧
  * @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2024-10-09 16:34:07
+ * @LastEditTime: 2024-10-09 17:18:59
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
 -->
 <template>
@@ -464,6 +464,7 @@ export default {
           obj.name = item.type;
           arr.push(obj)
         })
+        arr = arr.sort((a, b) => a.value < b.value ? 1 : a.value > b.value ? -1 : 0)
         // obj.value = value;
         // obj.name = '上级下发';
       }).then(res=>{
diff --git a/src/views/privateOrder/ecosphere/components/componentmapbox.vue b/src/views/privateOrder/ecosphere/components/componentmapbox.vue
index 690bb5a..17ce7fa 100644
--- a/src/views/privateOrder/ecosphere/components/componentmapbox.vue
+++ b/src/views/privateOrder/ecosphere/components/componentmapbox.vue
@@ -115,45 +115,55 @@ export default {
     }
   },
   mounted() {
-    var layer = new AMap.createDefaultLayer({
-      zooms:[14,18],    //可见级别
-      visible:true,    //是否可见
-      opacity:1,       //透明度
-      zIndex:10,         //叠加层级
-      mapStyle: 'amap://styles/d02b66b0a7f190d5a1556a3f59c86518',
+    this.$nextTick(()=>{
+      var layer = new AMap.createDefaultLayer({
+        zooms:[14,18],    //可见级别
+        visible:true,    //是否可见
+        opacity:1,       //透明度
+        zIndex:10,         //叠加层级
+        // skyColor: '#032f58',
+        mapStyle: 'amap://styles/d02b66b0a7f190d5a1556a3f59c86518',
+      })
+      var map = new AMap.Map('container',{
+        zoom: 16,  //设置地图显示的缩放级别
+        zooms: this.zooms,
+        center: this.center,//设置地图中心点坐标
+        mapStyle: 'amap://styles/d02b66b0a7f190d5a1556a3f59c86518',  //设置地图的显示样式
+        // skyColor: '#032f58',
+        layers: [
+          // 高德默认标准图层
+          // new AMap.TileLayer.Satellite(),
+          layer,
+          // 楼块图层
+          new AMap.Buildings({
+            zooms: [14, 18],
+            zIndex: 11,
+            wallColor: 'rgba(24,79,129,1)',
+            roofColor: 'rgba(24,79,129,1)',
+            // heightFactor: 2//2倍于默认高度，3D下有效
+          })
+        ],
+        resizeEnable: true,
+        rotateEnable:false,
+        pitchEnable:false,
+        pitch: 55,
+        rotation: 25,
+        viewMode: '3D',  //设置地图模式
+        lang:'zh_cn',  //设置地图语言类型
+        buildingAnimation:true,
+        // expandZoomRange:true,
+      });
+      this.layers.layer = new AMap.OverlayGroup();            // 点位
+      map.add(this.layers.layer);
+      // console.log(map.getLayers());
+      map.getLayers().forEach((m)=>{
+        if(m.CLASS_NAME == 'AMap.SkyLayer') {
+          map.remove(m)
+        }
+      })
+      this.map = map;
+      this.init(this.map);
     })
-    var map = new AMap.Map('container',{
-      zoom: 16,  //设置地图显示的缩放级别
-      zooms: this.zooms,
-      center: this.center,//设置地图中心点坐标
-      mapStyle: 'amap://styles/d02b66b0a7f190d5a1556a3f59c86518',  //设置地图的显示样式
-      layers: [
-        // 高德默认标准图层
-        // new AMap.TileLayer.Satellite(),
-        layer,
-        // 楼块图层
-        new AMap.Buildings({
-          zooms: [14, 18],
-          zIndex: 11,
-          wallColor: 'rgba(24,79,129,1)',
-          roofColor: 'rgba(24,79,129,1)',
-          // heightFactor: 2//2倍于默认高度，3D下有效
-        })
-      ],
-      resizeEnable: true,
-      rotateEnable:false,
-      pitchEnable:false,
-      pitch: 55,
-      rotation: 25,
-      viewMode: '3D',  //设置地图模式
-      lang:'zh_cn',  //设置地图语言类型
-      buildingAnimation:true,
-      // expandZoomRange:true,
-    });
-    this.layers.layer = new AMap.OverlayGroup();            // 点位
-    map.add(this.layers.layer);
-    this.map = map;
-    this.init(this.map);
     // let data = await reportList();
     // listJbmap({isStatus:1,pageNum:1,pageSize:50}).then(data=>{
     //   let arr = []
@@ -263,9 +273,6 @@ export default {
         // this.pointList = arr;
       })
     },
-    aaaa(){
-      console.log(1111111);
-    },
   }
 }
 </script>
@@ -275,8 +282,9 @@ export default {
   width: 100%;
   height: $ScreenHeight;
   #container{
-    height: 100%;
     width: 100%;
+    height: 100%;
+    background-color: rgb(26, 61, 106,0.3);
   }
 }
 
diff --git a/src/views/privateOrder/ecosphere/index.vue b/src/views/privateOrder/ecosphere/index.vue
index d0f9c7d..5e46e6d 100644
--- a/src/views/privateOrder/ecosphere/index.vue
+++ b/src/views/privateOrder/ecosphere/index.vue
@@ -25,6 +25,7 @@ import ComponentRight from './components/componentRight.vue'
 import ComponentCenter from './components/componentCenter'
 
 export default {
+  name:"ecosphere",
   components: {
     ComponentLeft,
     ComponentRight,
diff --git a/src/views/privateOrder/positiveEnergy/components/componentRight.vue b/src/views/privateOrder/positiveEnergy/components/componentRight.vue
index a6e400a..56971aa 100644
--- a/src/views/privateOrder/positiveEnergy/components/componentRight.vue
+++ b/src/views/privateOrder/positiveEnergy/components/componentRight.vue
@@ -2,7 +2,7 @@
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
  * @LastEditors: JC9527
- * @LastEditTime: 2023-10-18 16:49:10
+ * @LastEditTime: 2024-10-10 10:48:11
  * @Description:
 -->
 <template>
@@ -137,7 +137,7 @@ export default {
     getpercentageData() {
       // this.percentageName = ['太仓市', '城厢镇', '沙溪镇', '浏河镇', '浮桥镇', '璜泾镇', '双凤镇', '娄东街道', '陆渡街道', '科教新城']
       listWpyrwwcl({ pageNum: 1, pageSize: 20 }).then((res) => {
-        console.log(res,'resres')
+        // console.log(res,'resres')
         res.rows.forEach((item) => {
           // let name = JSON.parse(item.areaId);
           this.percentageName.push(item.unit)
diff --git a/src/views/privateOrder/security/components/Earth.vue b/src/views/privateOrder/security/components/Earth.vue
index b967a28..b0bd640 100644
--- a/src/views/privateOrder/security/components/Earth.vue
+++ b/src/views/privateOrder/security/components/Earth.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: lough
  * @Date: 2021-12-12 09:44:54
- * @LastEditors: lough
- * @LastEditTime: 2022-10-28 09:55:57
+ * @LastEditors: JC9527
+ * @LastEditTime: 2024-10-10 14:14:32
  * @Description:
 -->
 
@@ -10,7 +10,7 @@
   <div style="position: relative">
     <div
       id="container"
-      style="width: 100%; height: 200vh; position: relative; overflow: hidden"
+      style="width: 100%; height: 200vh; position: relative; overflow: hidden; background-color: rgba(26, 61, 106,0.7);"
     />
     <!-- 左侧 -->
 
diff --git a/src/views/privateOrder/sentiment/components/TransferVolume.vue b/src/views/privateOrder/sentiment/components/TransferVolume.vue
index 8b6d8d2..6cf112b 100644
--- a/src/views/privateOrder/sentiment/components/TransferVolume.vue
+++ b/src/views/privateOrder/sentiment/components/TransferVolume.vue
@@ -28,7 +28,7 @@ export default {
   methods: {
     getData() {
       dataZb({ pageSize: 5, pageNum: 1 }).then((res) => {
-        console.log(res);
+        // console.log(res);
         res.data.forEach((value) => {
           this.lineName.push(value.depName);
           this.lineValue.push(value.count);
diff --git a/src/views/privateOrder/sentiment/components/commandControl/gridMemberInfo.vue b/src/views/privateOrder/sentiment/components/commandControl/gridMemberInfo.vue
index 12db1d1..2fb4440 100644
--- a/src/views/privateOrder/sentiment/components/commandControl/gridMemberInfo.vue
+++ b/src/views/privateOrder/sentiment/components/commandControl/gridMemberInfo.vue
@@ -90,7 +90,7 @@ export default {
     },
     // 点击网格员点位方法
     getMember(e) {
-      console.log('e', e)
+      // console.log('e', e)
       this.mapReturnInfo = e
       this.showPopup = false
       this.changeIdx = 0
@@ -99,15 +99,15 @@ export default {
     // 获取网格员详细信息
     getMemberData() {
       const e = this.mapReturnInfo
-      console.log('e.properties', e.properties)
+      // console.log('e.properties', e.properties)
       const xzqhCode =
         this.flag === 'ssiMap' ? e.properties.BUSINESSID : e.XZQHCODE
       this.MemberData = {}
-      console.log('xzqhCode', xzqhCode)
+      // console.log('xzqhCode', xzqhCode)
       viewQueryListByViewId(xzqhCode).then((res1) => {
-        console.log('res1', res1)
+        // console.log('res1', res1)
         if (res1.data.length === 0) {
-          console.log('此网格网格员不存在！')
+          // console.log('此网格网格员不存在！')
           this.close()
           return
         } else {
diff --git a/src/views/privateOrder/sentiment/components/commandControl/index.vue b/src/views/privateOrder/sentiment/components/commandControl/index.vue
index 5402c8c..7831020 100644
--- a/src/views/privateOrder/sentiment/components/commandControl/index.vue
+++ b/src/views/privateOrder/sentiment/components/commandControl/index.vue
@@ -240,28 +240,34 @@ export default {
           REMARK: "32058551001310165214",
         },
         {
-          CODE: "32058553001310909469",
+          CODE: "32058553001310589799",
           ID: "3",
-          REMARK: "32058553001310909469",
+          REMARK: "32058553001310589799",
         },
         {
-          CODE: "32058553001310670315",
+          CODE: "32058561012151100002",
           ID: "4",
-          REMARK: "32058517001310019274",
+          REMARK: "32058556001310679173",
         },
-        { CODE: "32058553001310806219", ID: "5", REMARK: null },
         {
-          CODE: "32058553001310913850",
+          CODE: "32058553001310806219", ID: "5", REMARK: null
+        },
+        {
+          CODE: "32058500011316313617",
           ID: "6",
-          REMARK: "32058553001310913850",
+          REMARK: "32058500011316313617",
+        },
+        {
+          CODE: "32058553001310132000", ID: "7", REMARK: "万达广场2号门"
         },
-        { CODE: "32058553001310132000", ID: "17", REMARK: "万达广场2号门" },
         {
           CODE: "32058559001310035894",
-          ID: "7",
-          REMARK: "32059102011314000469",
+          ID: "8",
+          REMARK: "32058559001310035894",
         },
-        { CODE: "32058551001310651352", ID: "9", REMARK: "医院" },
+        {
+          CODE: "32058517001310615903", ID: "9", REMARK: "医院"
+        }
       ];
 
       this.multiVideo.title = "视频监控";
diff --git a/src/views/privateOrder/sentiment/components/componentLeft.vue b/src/views/privateOrder/sentiment/components/componentLeft.vue
index bd7567d..6fecfe8 100644
--- a/src/views/privateOrder/sentiment/components/componentLeft.vue
+++ b/src/views/privateOrder/sentiment/components/componentLeft.vue
@@ -30,8 +30,9 @@
               :percentage="item.value || 0"
               :color="item.color"
             ></el-progress> -->
+            <!-- :percentage="Number(item.info)" -->
             <el-progress
-              :percentage="Number(item.info)"
+              :percentage="100"
               :color="item.color"
             ></el-progress>
             <div class="StatisticsText">
diff --git a/src/views/privateOrder/sentiment/components/componentRight.vue b/src/views/privateOrder/sentiment/components/componentRight.vue
index 06cd4ce..7a71f64 100644
--- a/src/views/privateOrder/sentiment/components/componentRight.vue
+++ b/src/views/privateOrder/sentiment/components/componentRight.vue
@@ -531,7 +531,7 @@ export default {
       this.getyqbgType();
     },
     rowClick(row) {
-      console.log(row);
+      // console.log(row);
       if (!row.fileUrl) {
         this.$message({
           message: "该记录暂无文件！",
@@ -612,14 +612,14 @@ export default {
         try {
           url = window.webkitURL.createObjectURL(file);
         } catch (error) {
-          console.log(error);
+          // console.log(error);
         }
       } else if (window.URL !== undefined) {
         // mozilla(firefox)
         try {
           url = window.URL.createObjectURL(file);
         } catch (error) {
-          console.log(error);
+          // console.log(error);
         }
       }
       return url;
diff --git a/src/views/privateOrder/sentiment/components/mediaPie.vue b/src/views/privateOrder/sentiment/components/mediaPie.vue
index 8b23fb2..4d9e0a5 100644
--- a/src/views/privateOrder/sentiment/components/mediaPie.vue
+++ b/src/views/privateOrder/sentiment/components/mediaPie.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-20 10:02:55
- * @LastEditTime: 2022-03-23 09:10:47
- * @LastEditors: lough
+ * @LastEditTime: 2024-10-09 17:10:40
+ * @LastEditors: JC9527
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\sentiment\\components\\mediaPie.vue
 -->
@@ -41,39 +41,39 @@ export default {
     return {
       types: [1, 2, 3, 4, 5, 6, 7, 8],
       piedata: [
-        {
-          name: "报刊",
-          value: 0,
-        },
-        {
-          name: "网媒",
-          value: 0,
-        },
-        {
-          name: "微信",
-          value: 0,
-        },
+        // {
+        //   name: "报刊",
+        //   value: 0,
+        // },
+        // {
+        //   name: "网媒",
+        //   value: 0,
+        // },
+        // {
+        //   name: "微信",
+        //   value: 0,
+        // },
 
-        {
-          name: "微博",
-          value: 0,
-        },
-        {
-          name: "APP",
-          value: 0,
-        },
-        {
-          name: "论坛",
-          value: 0,
-        },
-        {
-          name: "短视频",
-          value: 0,
-        },
-        {
-          name: "其他",
-          value: 0,
-        },
+        // {
+        //   name: "微博",
+        //   value: 0,
+        // },
+        // {
+        //   name: "APP",
+        //   value: 0,
+        // },
+        // {
+        //   name: "论坛",
+        //   value: 0,
+        // },
+        // {
+        //   name: "短视频",
+        //   value: 0,
+        // },
+        // {
+        //   name: "其他",
+        //   value: 0,
+        // },
       ],
       lastIndex: 0,
       currentIndex: 0,
@@ -86,14 +86,21 @@ export default {
   methods: {
     getData() {
       listMtlx().then((res) => {
+        let arr = []
         res.rows.forEach((value, index) => {
-          this.piedata.forEach((value1, index1) => {
-            if (value.name == value1.name) {
-              this.piedata[index1].value = value.zb;
-            }
-          });
+          let obj = {};
+          obj.name = value.name;
+          obj.value = Number(value.zb);
+          arr.push(obj);
+          // this.piedata.forEach((value1, index1) => {
+          //   if (value.name == value1.name) {
+          //     this.piedata[index1].value = value.zb;
+          //   }
+          // });
         });
-        console.log(this.piedata);
+        // console.log(this.piedata);
+        arr = arr.sort((a, b) => a.value < b.value ? 1 : a.value > b.value ? -1 : 0)
+        this.piedata = arr;
         this.pieBox();
       });
     },
diff --git a/src/views/privateOrder/sentiment/components/sentimentPie.vue b/src/views/privateOrder/sentiment/components/sentimentPie.vue
index d809eaf..829e0b8 100644
--- a/src/views/privateOrder/sentiment/components/sentimentPie.vue
+++ b/src/views/privateOrder/sentiment/components/sentimentPie.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-20 10:02:55
- * @LastEditTime: 2022-03-22 15:39:10
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-09 17:07:13
+ * @LastEditors: JC9527
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tcingiocpro\src\views\privateOrder\sentiment\components\sentimentPie.vue
 -->
@@ -76,38 +76,38 @@ export default {
         },
       ],
       piedata: [
-        {
-          name: "治安维护",
-          value: 0,
-        },
-        {
-          name: "医疗卫生",
-          value: 0,
-        },
-        {
-          name: "执政形象",
-          value: 0,
-        },
-        {
-          name: "市场监督",
-          value: 0,
-        },
-        {
-          name: "自然灾害",
-          value: 0,
-        },
-        {
-          name: "安全事故",
-          value: 0,
-        },
-        {
-          name: "社会保障",
-          value: 0,
-        },
-        {
-          name: "市政管理",
-          value: 0,
-        },
+        // {
+        //   name: "治安维护",
+        //   value: 0,
+        // },
+        // {
+        //   name: "医疗卫生",
+        //   value: 0,
+        // },
+        // {
+        //   name: "执政形象",
+        //   value: 0,
+        // },
+        // {
+        //   name: "市场监督",
+        //   value: 0,
+        // },
+        // {
+        //   name: "自然灾害",
+        //   value: 0,
+        // },
+        // {
+        //   name: "安全事故",
+        //   value: 0,
+        // },
+        // {
+        //   name: "社会保障",
+        //   value: 0,
+        // },
+        // {
+        //   name: "市政管理",
+        //   value: 0,
+        // },
       ],
     };
   },
@@ -124,13 +124,21 @@ export default {
   methods: {
     getData() {
       listSslx().then((res) => {
+        let arr = []
         res.rows.forEach((value, index) => {
-          this.piedata.forEach((value1, index1) => {
-            if (value.name == value1.name) {
-              this.piedata[index1].value = value.zb;
-            }
-          });
+          let obj = {};
+          obj.name = value.name;
+          obj.value = Number(value.zb);
+          arr.push(obj);
+          // this.piedata.push(obj);
+          // this.piedata.forEach((value1, index1) => {
+          //   if (value.name == value1.name) {
+          //     this.piedata[index1].value = value.zb;
+          //   }
+          // });
         });
+        arr = arr.sort((a, b) => a.value < b.value ? 1 : a.value > b.value ? -1 : 0)
+        this.piedata = arr;
         this.pieBox();
       });
     },