BUG修改

src/components/map/index.vue

@@ -113,7 +113,7 @@ export default {
         center: fromLonLat([116.389, 39.903]), //地图中心
         zoom: 5, //默认缩放级别
         minZoom: 5, //最小缩放级别
-        maxZoom: 12, //最大缩放级别
+        maxZoom: 15, //最大缩放级别
         extent: [
           70.3671875, 18.14576369243164, 134.92927612304688, 55.667146064662596,
         ],
@@ -121,8 +121,8 @@ export default {
       layers: [
         new TileLayer({
           source: new XYZ({
-            // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内外
+            url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
+            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内外
           }),
         }),
         new VectorLayer({

src/views/admin/cockpitManage/Index.vue

@@ -18,24 +18,20 @@
 
       <p>
         <span class="SpText">登录人风场总数：</span>
-        {{
-          totalList.fieldSumNumber !== null ? totalList.fieldSumNumber : 0
-        }}
+        {{ totalList?.fieldSumNumber ? totalList.fieldSumNumber : 0 }}
         个
       </p>
       <p>
         <span class="SpText">已完成分析风场：</span>
         {{
-          totalList.analysisFinishNumber !== null
-            ? totalList.analysisFinishNumber
-            : 0
+          totalList?.analysisFinishNumber ? totalList.analysisFinishNumber : 0
         }}
         个
       </p>
       <p>
         <span class="SpText">未完成分析风场：</span>
         {{
-          totalList.analysisUnFinishedNumber !== null
+          totalList?.analysisUnFinishedNumber
             ? totalList.analysisUnFinishedNumber
             : 0
         }}
@@ -43,9 +39,7 @@
       </p>
       <p>
         <span class="SpText">风机数量：</span>
-        {{
-          totalList.engineGroupNumber !== null ? totalList.engineGroupNumber : 0
-        }}
+        {{ totalList?.engineGroupNumber ? totalList.engineGroupNumber : 0 }}
         个
       </p>
       <p>

src/views/admin/cockpitManage/component/rightdata.vue

@@ -9,20 +9,13 @@
       <div class="BOX">
         <div style="display: flex">
           <div class="YC01">
-            <strong>
-              {{
-                equipment.errCount !== null && equipment.errCount !== undefined
-                  ? equipment.errCount
-                  : 0
-              }}</strong
-            >
+            <strong> {{ equipment?.errCount ? equipment.errCount : 0 }}</strong>
             <span>异常总数</span>
           </div>
           <div class="YC02">
             <strong>
               {{
-                equipment.errCountInCurrentMonth !== null &&
-                equipment.errCountInCurrentMonth !== undefined
+                equipment?.errCountInCurrentMonth
                   ? equipment.errCountInCurrentMonth
                   : 0
               }}</strong
@@ -34,10 +27,7 @@
           <div class="YC02">
             <strong class="textred">
               {{
-                equipment.errCountNotDeal !== null &&
-                equipment.errCountNotDeal !== undefined
-                  ? equipment.errCountNotDeal
-                  : 0
+                equipment?.errCountNotDeal ? equipment.errCountNotDeal : 0
               }}</strong
             >
             <span>未处理异常</span>
@@ -45,10 +35,7 @@
           <div class="YC02">
             <strong class="texyellow">
               {{
-                equipment.errDeviceCount !== null &&
-                equipment.errDeviceCount !== undefined
-                  ? equipment.errDeviceCount
-                  : 0
+                equipment?.errDeviceCount ? equipment.errDeviceCount : 0
               }}</strong
             >
             <span>异常设备数</span>

vue.config.js

@@ -65,9 +65,9 @@ module.exports = {
     proxy: {
       "/api": {
         // target: "http://192.168.5.4:16200", // 石月
-        target: "http://192.168.50.235:16200", //内网
+        // target: "http://192.168.50.235:16200", //内网
         // target: "http://192.168.5.15:16200",
-        // target: "http://106.120.102.238:16600", //外网
+        target: "http://106.120.102.238:16600", //外网
         changeOrigin: true,
         pathRewrite: {
           "^/api": "", // 需要regit write重写的,