From 92c4b98314851f0217a9bc0c3d456757a01a14cf Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 12 Dec 2023 15:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=AB=98=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4,noData?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/screenCenter/screenCenter.vue | 41 ++++++++++---------------
 src/views/screenLeft/left1.vue          |  3 +-
 src/views/screenRight/right1.vue        |  2 +-
 src/views/screenRight/right3.vue        | 12 +++++++-
 vue.config.js                           |  2 +-
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/views/screenCenter/screenCenter.vue b/src/views/screenCenter/screenCenter.vue
index 3a93f1f..49ba7b7 100644
--- a/src/views/screenCenter/screenCenter.vue
+++ b/src/views/screenCenter/screenCenter.vue
@@ -349,7 +349,15 @@ export default {
     },
     watch: {
         shibeiAId(value) {
-        }
+        },
+        srcGridData(val, oldValue) {
+            if (oldValue == null) {
+                this.iniMap();
+            } else {
+                this.updateGrid();
+            }
+            this.zoomInABit();
+        },
     },
     methods: {
         handleClickTabs(val){
@@ -732,7 +740,7 @@ export default {
                 logoVisible: false,
                 map: myMap,
             });
-            scene.on("loaded", async () => {
+            scene.on("loaded",  () => {
                 this.iniMapGrid(shibeiJson);
             });
         },
@@ -742,25 +750,7 @@ export default {
             if (this.mapStyleType == "light") {
                 styleConfig = lightStyle;
             }
-
-            // lineLayerBig = new LineLayer({
-            //     zIndex: 6,
-            //     name: "line2",
-            // })
-            //     .source(shibeiJson1)
-            //     .shape("wall")
-            //     .size(50)
-            //     .color('rgb(163, 255, 245)')
-            //     .style({
-            //         opacity: 1,
-            //         raisingHeight: 600,
-            //         sourceColor: 'rgb(0, 153, 188,0.5)',
-            //         targetColor: 'rgb(0, 153, 188)',
-            //         linearDir: 'algin',
-
-            //     })
-            // scene.addLayer(lineLayerBig);
-            // 画区域面积
+            // 画区域面积 
             polygonLayer = new PolygonLayer({
                 autoFit: true,
             })
@@ -776,7 +766,7 @@ export default {
                     },
                     opacity: 0.8,
                     heightfixed: true,
-                    raisingHeight: 300,
+                    // raisingHeight: 300,
                     sourceColor: '#4ee8fc',
                     targetColor: '#00284e',
                 });
@@ -794,7 +784,7 @@ export default {
                 .color("name", styleConfig.lineColor)
                 .style({
                     opacity: 1,
-                    raisingHeight: 600,
+                    raisingHeight: 300,
                 })
                 .animate({
                     interval: 1, // 间隔
@@ -932,7 +922,10 @@ export default {
                     delete f.subId
                     delete f.subName
                 })
-                this.iniMapGrid(obj)
+            this.iniMapGrid(obj)
+           
+            if(this.level == 'community'){
+            }
             }).catch(f => {
                 console.log(f);
             })
diff --git a/src/views/screenLeft/left1.vue b/src/views/screenLeft/left1.vue
index 7e6c19a..4cc6d6b 100644
--- a/src/views/screenLeft/left1.vue
+++ b/src/views/screenLeft/left1.vue
@@ -83,8 +83,7 @@
             </screen-custom-table>
 
         </div>
-
-        <el-dialog :visible.sync="ifShowDlzz" width="90%" :modal="false">
+        <el-dialog :visible.sync="ifShowDlzz" width="70%" :modal="false">
             <screen-org-tree :list="treeList" @onClickNode="onClickNode"></screen-org-tree>
             <!-- <div style="color: #fff;display: flex; align-items: center;
             justify-content: center;flex-direction: column;">
diff --git a/src/views/screenRight/right1.vue b/src/views/screenRight/right1.vue
index e133cce..925e2b5 100644
--- a/src/views/screenRight/right1.vue
+++ b/src/views/screenRight/right1.vue
@@ -25,7 +25,7 @@
             <screen-title :titleName="'党员风采'"></screen-title>
             <div class="b-dyfc-scroll"
                  v-on:mouseover="onHover($event)"
-                 v-on:mouseout="onHover" v-if="dyfcList">
+                 v-on:mouseout="onHover" v-if="dyfcList.length > 0">
                 <div style="overflow: hidden">
                     <screen-popup bottom="80px"
                                   left="4200px"
diff --git a/src/views/screenRight/right3.vue b/src/views/screenRight/right3.vue
index 882853a..463efc4 100644
--- a/src/views/screenRight/right3.vue
+++ b/src/views/screenRight/right3.vue
@@ -63,7 +63,7 @@
             </div>
             <div b-dxal>
                 <screen-title :titleName="'典型案例'" style="width:310px" :type="'short'"></screen-title>
-                <div @mouseenter="tableMouseEnter" @mouseleave="tableMouseLeave" class="ytal-list">
+                <div @mouseenter="tableMouseEnter" @mouseleave="tableMouseLeave" class="ytal-list" v-if="ytalList.length >0">
                     <div class="ytal-list-tran" :style="{ top: top, transition: transition }">
                         <div class="ytal-item" v-for="(item, index) in ytalList" :key="index" @click="handleClickEvent(item)">
                             <div class="ytal-item-detail">{{ item.itemContent }}</div>
@@ -71,6 +71,9 @@
                         </div>
                     </div>
                 </div>
+                <div v-else class="no-data">
+                    暂无数据~
+                </div>
             </div>
         </div>
         <div class='b-hztj'>
@@ -627,4 +630,11 @@ export default {
     height: 327px;
     display: flex;
 }
+.no-data{
+      width: 297px;
+      height: 269px;
+      line-height: 269px;
+      text-align: center;
+      color: #fff;
+    }
 </style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 2580093..ca23896 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,7 +33,7 @@ module.exports = defineConfig({
   publicPath: diffPublicPath(), //部署应用包时的基本URL， 用法和webpack本身的output.publicPath一致.
 
   // 打包根路径
-  // outputDir: diffOutputDir(), // npm run build  打包构建后存放的目录
+  outputDir: 'ring-screen', // npm run build  打包构建后存放的目录
 
   // 静态资源文件夹名
   assetsDir: 'static',