From 01c7b6b7f72a9e33c3c0c559619f22acdf48bbc2 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Thu, 19 Sep 2024 16:42:45 +0800
Subject: [PATCH] =?UTF-8?q?=20fix(=E5=A4=A7=E5=B1=8F):=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=95=BF=E5=9F=8E=E3=80=81=E8=B0=B7=E4=BA=91=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=EF=BC=8Ciconfont=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BAcdn=EF=BC=8C=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E3=80=81=E8=AE=BE=E5=A4=87=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=80=E5=90=AF=E7=BA=BF=E8=B7=AFwebsocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.cc                                       |  2 +-
 .env.ccprod                                   |  2 +-
 .env.drgy                                     |  2 +-
 .env.drgyprod                                 |  2 +-
 public/index.html                             |  4 +-
 .../DeviceManage/EDeviceChildren.vue          | 63 +++++++++++--------
 .../profileV2/DeviceManage/EDeviceTable.vue   | 10 +--
 .../profileV2/DeviceManage/EDynamicTable.vue  | 34 +++++-----
 .../project/profileV2/EObjectContainer.vue    |  8 +--
 src/views/iot/project/profileV2/details.vue   | 44 ++++++-------
 10 files changed, 91 insertions(+), 80 deletions(-)

diff --git a/.env.cc b/.env.cc
index 480c5617..e2052ba2 100644
--- a/.env.cc
+++ b/.env.cc
@@ -19,7 +19,7 @@ VUE_APP_YDXCX_URL = 'images/cc/ydxcx.jpg'
 # 备案号
 VUE_APP_RECORD_NUMBER = '沪ICP备2021036275号-1'
 # 系统名
-VUE_APP_SYSTEM_NAME = '数字用电管理系统'
+VUE_APP_SYSTEM_NAME = '数字能源一体化平台'
 # 系统登录页 login-green、login-blue-black、login-blue-white
 #VUE_APP_LOGIN_PAGE = 'login-green'
 #VUE_APP_LOGIN_PAGE = 'login-blue-black'
diff --git a/.env.ccprod b/.env.ccprod
index f00f0b01..20f39d13 100644
--- a/.env.ccprod
+++ b/.env.ccprod
@@ -20,7 +20,7 @@ VUE_APP_YDXCX_URL = 'images/cc/ydxcx.jpg'
 # 备案号
 VUE_APP_RECORD_NUMBER = '沪ICP备2021036275号-1'
 # 系统名
-VUE_APP_SYSTEM_NAME = '数字用电管理系统'
+VUE_APP_SYSTEM_NAME = '数字能源一体化平台'
 # 系统登录页 login-green、login-blue-black、login-blue-white
 #VUE_APP_LOGIN_PAGE = 'login-green'
 #VUE_APP_LOGIN_PAGE = 'login-blue-black'
diff --git a/.env.drgy b/.env.drgy
index 7d00b7ec..28adb00e 100644
--- a/.env.drgy
+++ b/.env.drgy
@@ -19,7 +19,7 @@ VUE_APP_YDXCX_URL = 'images/drgy/ydxcx.jpg'
 # 备案号
 VUE_APP_RECORD_NUMBER = '沪ICP备2024070570号-1'
 # 系统名称
-VUE_APP_SYSTEM_NAME = '数字用电管理系统'
+VUE_APP_SYSTEM_NAME = '数字一体化管理系统'
 # 系统登录页 login-green、login-blue-black、login-blue-white
 #VUE_APP_LOGIN_PAGE = 'login-green'
 #VUE_APP_LOGIN_PAGE = 'login-blue-black'
diff --git a/.env.drgyprod b/.env.drgyprod
index 110d2046..2983aeb4 100644
--- a/.env.drgyprod
+++ b/.env.drgyprod
@@ -20,7 +20,7 @@ VUE_APP_YDXCX_URL = 'images/drgy/ydxcx.jpg'
 # 备案号
 VUE_APP_RECORD_NUMBER = '沪ICP备2024070570号-1'
 # 系统名称
-VUE_APP_SYSTEM_NAME = '数字用电管理系统'
+VUE_APP_SYSTEM_NAME = '数字一体化管理系统'
 # 系统登录页 login-green、login-blue-black、login-blue-white
 VUE_APP_LOGIN_PAGE = 'login-green'
 #VUE_APP_LOGIN_PAGE = 'login-blue-black'
diff --git a/public/index.html b/public/index.html
index cc0765bd..1e6ead56 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,10 +8,10 @@
   <link href="<%= BASE_URL %>images/<%= process.env.VUE_APP_ICO_URL %>" rel="icon">
   <link href="<%= BASE_URL %>cdn/iconfont/1.0.0/index.css" rel="stylesheet">
   <link href="<%= BASE_URL %>cdn/iconfont/1.0.0/iconfont.css" rel="stylesheet">
-  <link href="//at.alicdn.com/t/font_2506643_9w119og75cs.css" rel="stylesheet">
+  <link href="http://static.drgyen.com/pc/smart-power-ui/font_2506643_9w119og75cs.css" rel="stylesheet">
 
 
-  <link href="//at.alicdn.com/t/c/font_2506643_51mhr4b9ys6.css" rel="stylesheet">
+  <link href="http://static.drgyen.com/pc/smart-power-ui/font_2506643_51mhr4b9ys6.css" rel="stylesheet">
 
   <script src="https://webapi.amap.com/maps?v=1.4.15&key=4b483d227a9c7dd12e46faae5a8c8af8" type="text/javascript"></script>
   <script src="<%= BASE_URL %>js/config.js"></script>
diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
index 80f6a9f8..d18c9df7 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
@@ -2,14 +2,14 @@
   <div class="e-object-device-children-table">
     <div class="device-children-header">
       <div class="left-link-home" @click="handleLinkToHome">
-        <icon class="iconfont iconfanhui_1"></icon>
+        <i class="iconfont iconfanhui_1"></i>
         <span class="link-bt-title">返回</span>
       </div>
       <div class="lift-gateway-info">
-        <span class="gateway-label">位置：</span>
-        <span class="gateway-adders">{{
-          gatewayDevice.deviceAddress || "--"
-        }}</span>
+<!--        <span class="gateway-label">位置：</span>-->
+<!--        <span class="gateway-adders">{{-->
+<!--          gatewayDevice.deviceAddress || "&#45;&#45;"-->
+<!--        }}</span>-->
         <span class="gateway-label">设备号：</span>
         <span class="gateway-did">{{ gatewayDevice.deviceId || "--" }}</span>
         <span class="gateway-label">在线状态：</span>
@@ -55,23 +55,32 @@
         >
           查找设备
         </div>
-        <el-select
-          v-model="queryParams.prodKey"
-          placeholder="请选择项目类型"
-          size="small"
-          style="margin-left: 5xp; width: 130px"
-          @change="getTableFilterList"
-        >
-          <el-option
-            v-for="dict in projectModelList"
-            :key="dict.prodKey"
-            :label="dict.modelName"
-            :value="dict.prodKey"
+<!--        <el-select-->
+<!--          v-model="queryParams.prodKey"-->
+<!--          placeholder="请选择项目类型"-->
+<!--          size="small"-->
+<!--          style="margin-left: 5xp; width: 130px"-->
+<!--          @change="getTableFilterList"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="dict in projectModelList"-->
+<!--            :key="dict.prodKey"-->
+<!--            :label="dict.modelName"-->
+<!--            :value="dict.prodKey"-->
 
-          ></el-option>
-        </el-select>
+<!--          ></el-option>-->
+<!--        </el-select>-->
       </div>
     </div>
+    <div class="device-tabs">
+      <el-tabs v-model="queryParams.prodKey" type="card" @tab-click="getTableFilterList">
+        <el-tab-pane v-for="dict in projectModelList"
+                     :key="dict.prodKey"
+                     :label="dict.modelName"
+                     :name="dict.prodKey"
+        ></el-tab-pane>
+      </el-tabs>
+    </div>
     <div class="device-children-center">
       <e-dynamic-table
         :border="true"
@@ -92,7 +101,7 @@
         @handleQuery="handleQuery"
         @tableSelectionChange="handleTableChange"
       >
-        <template v-slot:operate="scope">
+        <template v-slot:operate="scope" >
           <div class="children-device-operate">
             <span
               :class="
@@ -202,6 +211,7 @@ export default {
         width: "200px",
         slot: true,
         slotName: "operate",
+        fixed:"right"
       },
       projectModelList: [],
       tableSelectList: [],
@@ -277,10 +287,10 @@ export default {
       ).then((res) => {
         this.tableList = res.rows;
         this.deviceTotal = res.total;
-        // if (this.stompClient) {
-        //   this.closeSocket();
-        // }
-        // this.connection();
+        if (this.stompClient) {
+          this.closeSocket();
+        }
+        this.connection();
       });
     },
     // 动态表格 返回的 勾选数据
@@ -384,7 +394,7 @@ export default {
     handleDeviceInfo(param) {
       if (this.tableList && this.tableList.length > 0) {
         this.tableList = this.tableList.map((v) => {
-          if (v["deviceKey"] === param["deviceKey"]) {
+          if (v["deviceKey"] === param["deviceId"]) {
             return Object.assign(v, param);
           } else {
             return v;
@@ -412,7 +422,8 @@ export default {
     },
     socket_message(data) {
       console.log("socket-message:", data);
-      this.handleDeviceInfo(data);
+      const messagedata = JSON.parse(data.data);
+      this.handleDeviceInfo(messagedata);
       this.$forceUpdate();
     },
     socket_onclose(e) {
diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
index d0cfedc7..3bdf6c21 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
@@ -95,11 +95,11 @@
                 : 'card-left off-line'
             "
           >
-            <icon
+            <i
               v-if="devItem['deviceState'] == 'ONLINE'"
               class="iconfont iconSYS_STA_1"
             />
-            <icon v-else class="iconfont iconlixian" />
+            <i v-else class="iconfont iconlixian" />
             <span style="margin-left: 8px">{{
               devItem["deviceState"] == "ONLINE" ? "在线" : "离线"
             }}</span>
@@ -109,7 +109,7 @@
             <span class="c-number">{{ devItem.routeCount || 0 }}</span>
 
             <el-dropdown>
-              <icon class="el-icon-s-operation card-opt-i" />
+              <i class="el-icon-menu card-opt-i" />
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="handleChildrenDevice(devItem)"
                   >查看线路列表</el-dropdown-item
@@ -153,7 +153,7 @@
                     : 'card-footer dev-error'
                 "
               >
-                <icon class="iconfont icontongzhi"></icon>
+                <i class="iconfont icontongzhi"></i>
                 <span class="footer-title" stle="margin-left: 10px;">{{
                   devItem.alarmProcessStatus == 1
                     ? "正常"
@@ -301,7 +301,7 @@ export default {
               item.deviceStatus == 0 ? "card-footer" : "card-footer dev-error"
             }
           >
-            <icon class="iconfont icontongzhi"></icon>
+            <i class="iconfont icontongzhi"></i>
             <span>
               {item.deviceStatus == 0 ? "正常" : "card-footer dev-error"}
             </span>
diff --git a/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue
index 932b2430..c4b45e99 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDynamicTable.vue
@@ -3,25 +3,21 @@
     <el-table
       ref="multipleTable"
       v-loading="loading"
-      :height="tableHeight"
+      :border="border"
       :data="tableList"
       :row-key="rowKey"
-      :border="border"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
-        type="selection"
         v-if="isSelect"
-        width="50"
-        align="center"
         :reserve-selection="true"
+        align="center"
+        type="selection"
+        width="50"
       />
 
       <el-table-column
         v-if="isIndex"
-        type="index"
-        label="序号"
-        align="center"
         :index="
           (val) => {
             return (
@@ -29,16 +25,20 @@
             );
           }
         "
+        align="center"
+        label="序号"
+        type="index"
         width="80px"
       ></el-table-column>
 
       <el-table-column
-        :label="tableItem.label || ''"
-        :align="tableItem.align || 'left'"
-        :prop="tableItem.prop || ''"
-        :width="tableItem.width || ''"
         v-for="(tableItem, idx) in filterList"
         :key="idx"
+        :align="tableItem.align || 'left'"
+        :fixed="tableItem.fixed || false"
+        :label="tableItem.label || ''"
+        :prop="tableItem.prop || ''"
+        :width="tableItem.width || ''"
       >
         <template slot-scope="scope">
           <slot
@@ -48,8 +48,8 @@
           ></slot>
           <span
             v-else
-            class="lay-table-textarea"
             :title="scope.row[tableItem.prop || '']"
+            class="lay-table-textarea"
           >
             {{ scope.row[tableItem.prop || ""] }}
           </span>
@@ -57,11 +57,11 @@
       </el-table-column>
     </el-table>
     <pagination
-      style="margin-top: 5px; height: 35px"
       v-show="tableTotal > 0"
-      :total="tableTotal"
-      :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
+      :total="tableTotal"
+      style="margin-top: 5px; height: 35px"
       @pagination="handleQuery2"
     />
   </div>
@@ -72,7 +72,7 @@ export default {
   props: {
     tableHeight: {
       type: [Number, String],
-      default: "",
+      default: "450px",
     },
     border: {
       type: Boolean,
diff --git a/src/views/iot/project/profileV2/EObjectContainer.vue b/src/views/iot/project/profileV2/EObjectContainer.vue
index e37ee285..f2576d2b 100644
--- a/src/views/iot/project/profileV2/EObjectContainer.vue
+++ b/src/views/iot/project/profileV2/EObjectContainer.vue
@@ -4,15 +4,15 @@
       <el-tab-pane label="项目信息" name="info">
         <e-object-info v-if="activeName === 'info'" :infoData="projectInfo || {}" :projectTypeOptions="projectTypeOptions"></e-object-info>
       </el-tab-pane>
-      
-      <el-tab-pane label="用户" name="tenant" v-if="isShowUserTable">
+
+      <el-tab-pane v-if="isShowUserTable" label="成员" name="tenant">
         <e-object-tenant v-if="activeName === 'tenant'" :infoData="projectInfo || {}"/>
       </el-tab-pane>
 
-      <el-tab-pane label="项目人员" name="user" v-if="!isShowUserTable">
+      <el-tab-pane v-if="!isShowUserTable" label="项目人员" name="user">
         <e-tenant-user v-if="activeName === 'user'" :projectId="projectInfo.projectId"></e-tenant-user>
       </el-tab-pane>
-      
+
       <el-tab-pane label="空间" name="space">
         <e-object-space v-if="activeName === 'space'" :infoData="projectInfo || {}"/>
       </el-tab-pane>
diff --git a/src/views/iot/project/profileV2/details.vue b/src/views/iot/project/profileV2/details.vue
index 77defa17..0b3ed653 100644
--- a/src/views/iot/project/profileV2/details.vue
+++ b/src/views/iot/project/profileV2/details.vue
@@ -1,8 +1,8 @@
 <template>
   <div
-    class="project-detail-v2"
     id="project-detail-v2-id"
     ref="project-detail-v2-id"
+    class="project-detail-v2"
   >
     <!--
     比例缩放效果01
@@ -16,10 +16,10 @@
     <div :class="isFoldRight ? 'block-lift block-right-fold' : 'block-lift'">
       <div class="container-title">
         <div
-          class="title-left"
           v-for="(item, idx) in projectList"
-          :key="idx"
           v-show="item.projectId === infoData.projectId"
+          :key="idx"
+          class="title-left"
         >
           <span>{{ item.projectName }}</span>
           <i
@@ -70,7 +70,7 @@
                 padding-left: 20px;
               "
             >
-              <el-descriptions class="margin-top" title="" :column="2">
+              <el-descriptions :column="2" class="margin-top" title="">
                 <el-descriptions-item label="行业类型：">{{
                   statusFormat(infoData)
                 }}</el-descriptions-item>
@@ -86,8 +86,8 @@
                 <el-descriptions-item label="项目地址：">
                   <div class="e-descriptions-address">
                     <span
-                      class="e-address-span"
                       :title="infoData.projectAddress"
+                      class="e-address-span"
                     >
                       {{ infoData.projectAddress }}
                     </span>
@@ -96,12 +96,12 @@
                       @click="mapClick"
                     ></i>
                     <el-popover
-                      placement="bottom"
-                      title="项目地址坐标"
-                      width="1080"
-                      trigger="manual"
                       v-model="visible"
+                      placement="bottom"
                       style="top: 30px; left: -85%; position: relative"
+                      title="项目地址坐标"
+                      trigger="manual"
+                      width="1080"
                     >
                       <slot>
                         <el-row>
@@ -115,11 +115,11 @@
 
                         <shop-location
                           v-if="visible === true"
-                          style="height: 450px; margin-top: 10px"
-                          :mapCenter="mapCenter"
                           :draggable="false"
-                          @mapEvent="mapEvent"
+                          :mapCenter="mapCenter"
                           :zoom="zoom"
+                          style="height: 450px; margin-top: 10px"
+                          @mapEvent="mapEvent"
                         />
 
                         <div
@@ -133,8 +133,8 @@
                           "
                         >
                           <el-button
-                            type="primary"
                             size="mini"
+                            type="primary"
                             @click="visible = false"
                             >确 定</el-button
                           >
@@ -168,24 +168,24 @@
       </div>
       <div class="container-main">
         <div
-          class="main-block"
           :style="isShrink ? 'width: 100%;' : 'width: calc(100% - 150px);'"
+          class="main-block"
         >
           <component
             :is="activeName"
+            :isFoldRight="isFoldRight"
+            :isShrink="isShrink"
             :projectInfo="infoData"
             :projectTypeOptions="projectTypeOptions"
             :sourceId="stateSourceId"
-            :tempType="activeType"
-            :isShrink="isShrink"
-            :isFoldRight="isFoldRight"
             :tabs="selectNavChildren"
+            :tempType="activeType"
           ></component>
         </div>
       </div>
     </div>
-    <div class="block-right" v-if="!isFoldRight">
-      <e-simple-card title="最近2 天警情同比" class="today-ratio-card">
+    <div v-if="!isFoldRight" class="block-right">
+      <e-simple-card class="today-ratio-card" title="最近2 天警情同比">
         <template slot="cardBody">
           <e-today-ratio
             v-if="!isFoldRight"
@@ -194,7 +194,7 @@
         </template>
       </e-simple-card>
 
-      <e-simple-card title="类型分布统计" class="type-census-card">
+      <e-simple-card class="type-census-card" title="类型分布统计">
         <template slot="cardBody">
           <e-type-census
             v-if="!isFoldRight"
@@ -203,7 +203,7 @@
         </template>
       </e-simple-card>
 
-      <e-simple-card title="报警预警趋势" class="trend-census-card">
+      <e-simple-card class="trend-census-card" title="报警预警趋势">
         <template slot="cardBody">
           <e-trend-census
             v-if="!isFoldRight"
@@ -401,7 +401,7 @@ export default {
           ],
         },
         {
-          label: "综合管理",
+          label: "场景联动",
           key: "synthesizeManage",
           icon: "iconfont icontasks",
           template: "ENavLayout",