From 23a4de9e9efbc2e348f357d8c69a8295c68d29d9 Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Thu, 8 Sep 2022 11:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AE=A1=E7=90=86-=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=A1=B6=E9=83=A8=E6=A0=8F=E7=9A=84=20?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA1=E7=9B=AE=E5=89=8D=E5=8F=96?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=90=88=E5=90=8C=E5=90=8D=E7=A7=B0=E3=80=81?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA2=E9=87=8D=E5=A4=8D=E4=BA=86=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigScreen/v3/profile/typeDistribution.vue |   4 +-
 src/views/iot/project/index.vue               |  20 ++++
 .../profileV2/DeviceManage/EDeviceTable.vue   |  16 +--
 .../iot/project/profileV2/ETypeCensus.vue     |  15 +--
 src/views/iot/project/profileV2/details.vue   | 112 +++++++++++-------
 5 files changed, 102 insertions(+), 65 deletions(-)

diff --git a/src/views/bigScreen/v3/profile/typeDistribution.vue b/src/views/bigScreen/v3/profile/typeDistribution.vue
index 75394170..648c28c5 100644
--- a/src/views/bigScreen/v3/profile/typeDistribution.vue
+++ b/src/views/bigScreen/v3/profile/typeDistribution.vue
@@ -134,12 +134,12 @@ export default {
         if (list) {
           for (var i = 0; i < list.length; i++) {
             // console.log(list[i]['typeCode'].indexOf('a'))
-            if (list[i]["typeCode"].indexOf("a") === 0) {
+            if (list[i]["tag"] === 'A') {
               this.templist["alarm"].push({
                 value: list[i].alarmTotal,
                 name: list[i].typeName,
               });
-            } else if (list[i]["typeCode"].indexOf("w") === 0) {
+            } else if (list[i]["tag"] === 'B') {
               this.templist["waraing"].push({
                 value: list[i].alarmTotal,
                 name: list[i].typeName,
diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue
index f2992af5..e0bb6267 100644
--- a/src/views/iot/project/index.vue
+++ b/src/views/iot/project/index.vue
@@ -239,6 +239,26 @@
             </el-col>
           </el-row>
 
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="联系方式1" prop="contacts1">
+                <el-input v-model="form.contacts1" placeholder="请输入联系方式1" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="联系方式2" prop="contacts2">
+                <el-input v-model="form.contacts2" placeholder="请输入联系方式2" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="联系方式3" prop="contacts3">
+                <el-input v-model="form.contacts3" placeholder="请输入联系方式3" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-form-item label="总路设备:" >
             <el-input v-model="form.projectDeviceName" suffix-icon="el-icon-caret-bottom"  @focus="openTableSelectDialog()" placeholder="请输入总路设备" />
           </el-form-item>
diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
index 41a1e582..07731b93 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
@@ -9,14 +9,7 @@
     >
       <el-row>
         <el-col :span="5">
-          <el-form-item label="型号名称" prop="modelName">
-            <!-- <el-input
-              v-model="queryParams.modelName"
-              placeholder="请输入型号名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            /> -->
+          <el-form-item label="型号名称" prop="prodKey">
             <el-select v-model="queryParams.prodKey" placeholder="请选择项目类型" clearable size="small">
               <el-option
                 v-for="dict in projectModelList"
@@ -38,7 +31,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="设备状态" prop="deviceStatus">
+          <el-form-item label="设备状态" prop="deviceState">
             <el-select
               v-model="queryParams.deviceState"
               placeholder="请选择设备状态"
@@ -113,8 +106,8 @@
                 <img :src="devItem['deviceImage'] ? getIotFileUrl(devItem['deviceImage']) : '/images/devcie_default.png'" />
               </div>
               <div class="card-body-right">
-                <span :title="devItem.deviceId">{{ devItem.deviceId }}</span>
-                <span :title="devItem.deviceSecret">{{ devItem.deviceSecret }}</span>
+                <span :title="devItem.deviceName">{{ devItem.deviceName }}</span>
+                <span :title="devItem.deviceKey">{{ devItem.deviceKey }}</span>
                 <span :title="devItem.deviceAddress">{{ devItem.deviceAddress }}</span>
               </div>
             </div>
@@ -299,6 +292,7 @@ export default {
       this.getGatewayList();
     },
     resetQuery() {
+      this.resetForm("queryForm");
       this.getGatewayList();
     },
     // 获取 项目 型号列表
diff --git a/src/views/iot/project/profileV2/ETypeCensus.vue b/src/views/iot/project/profileV2/ETypeCensus.vue
index 9d0a5f51..06d73b9d 100644
--- a/src/views/iot/project/profileV2/ETypeCensus.vue
+++ b/src/views/iot/project/profileV2/ETypeCensus.vue
@@ -142,12 +142,12 @@ export default {
         if (list) {
           for (var i = 0; i < list.length; i++) {
             // console.log(list[i]['typeCode'].indexOf('a'))
-            if (list[i]["typeCode"].indexOf("a") === 0) {
+            if (list[i]["tag"] === 'A') {
               this.templist["alarm"].push({
                 value: list[i].alarmTotal,
                 name: list[i].typeName,
               });
-            } else if (list[i]["typeCode"].indexOf("w") === 0) {
+            } else if (list[i]["tag"] === 'B') {
               this.templist["waraing"].push({
                 value: list[i].alarmTotal,
                 name: list[i].typeName,
@@ -155,6 +155,7 @@ export default {
             }
           }
         }
+        console.log('result-update-', this.templist, list)
         this.updateEcharts();
       },
       deep: true,
@@ -181,7 +182,7 @@ export default {
   flex-wrap: wrap;
   .conter-block {
     width: 100%;
-    height: 238px;
+    height: 218px;
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
@@ -245,14 +246,14 @@ export default {
   .echarts-legend-c .legend-for::-webkit-scrollbar-thumb {
     /*滚动条里面小方块*/
     border-radius: 10px;
-    box-shadow: inset 0 0 5px #004eb0;
-    background: #004eb0;
+    box-shadow: inset 0 0 5px  #dbdada;
+    background:  #dbdada;
   }
   .echarts-legend-c .legend-for::-webkit-scrollbar-track {
     /*滚动条里面轨道*/
-    box-shadow: inset 0 0 5px #042764;
+    box-shadow: inset 0 0 5px #04276400;
     border-radius: 10px;
-    background: #042764;
+    background: #04276400;
   }
 }
 </style>
diff --git a/src/views/iot/project/profileV2/details.vue b/src/views/iot/project/profileV2/details.vue
index 55aa1e40..b0856fe4 100644
--- a/src/views/iot/project/profileV2/details.vue
+++ b/src/views/iot/project/profileV2/details.vue
@@ -12,10 +12,21 @@
   >
     <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">
+        <div
+          class="title-left"
+          v-for="(item, idx) in projectList"
+          :key="idx"
+          v-show="item.projectId === infoData.projectId"
+        >
           <span>{{ item.projectName }}</span>
-          <i class="el-icon-arrow-left icon-c but-icon" @click="handlePrev(idx)"></i>
-          <i class="el-icon-arrow-right icon-c but-icon" @click="handleNext(idx)"></i>
+          <i
+            class="el-icon-arrow-left icon-c but-icon"
+            @click="handlePrev(idx)"
+          ></i>
+          <i
+            class="el-icon-arrow-right icon-c but-icon"
+            @click="handleNext(idx)"
+          ></i>
         </div>
         <div class="title-but">
           <div class="but-home" @click="handleLinkToTable">
@@ -34,14 +45,14 @@
             <el-descriptions-item label="行业类型：">{{
               statusFormat(infoData)
             }}</el-descriptions-item>
-            <el-descriptions-item label="联系人1：">{{
-              infoData.contractName
-            }}</el-descriptions-item>
-            <el-descriptions-item label="联系人2："
-              >林工1586000000</el-descriptions-item
-            >
+            <el-descriptions-item label="联系人1：">
+              {{ infoData["contacts1"] || "--" }}
+            </el-descriptions-item>
             <el-descriptions-item label="联系人2：">
-              {{ infoData["projectDeviceName"] }}
+              {{ infoData["contacts2"] || "--" }}
+            </el-descriptions-item>
+            <el-descriptions-item label="联系人3：">
+              {{ infoData["contacts3"] || "--" }}
             </el-descriptions-item>
             <el-descriptions-item label="项目地址：">{{
               infoData.projectAddress
@@ -51,7 +62,10 @@
         <div class="info-divider"></div>
         <div class="info-right">
           <div>
-            <e-census-cards :propList="censusCardList" :result="projectStatistics" />
+            <e-census-cards
+              :propList="censusCardList"
+              :result="projectStatistics"
+            />
           </div>
         </div>
       </div>
@@ -81,19 +95,28 @@
     <div class="block-right" v-if="!isFoldRight">
       <e-simple-card title="最近2 天警情同比" class="today-ratio-card">
         <template slot="cardBody">
-          <e-today-ratio v-if="!isFoldRight" :result="resultInfo['warningAnalysisStatisticsVo']" />
+          <e-today-ratio
+            v-if="!isFoldRight"
+            :result="resultInfo['warningAnalysisStatisticsVo']"
+          />
         </template>
       </e-simple-card>
 
       <e-simple-card title="类型分布统计" class="type-census-card">
         <template slot="cardBody">
-          <e-type-census v-if="!isFoldRight" :result="resultInfo['alarmCategoriesList'] || []" />
+          <e-type-census
+            v-if="!isFoldRight"
+            :result="resultInfo['alarmCategoriesList'] || []"
+          />
         </template>
       </e-simple-card>
 
       <e-simple-card title="报警预警趋势" class="trend-census-card">
         <template slot="cardBody">
-          <e-trend-census v-if="!isFoldRight" :result="resultInfo['alarmChartDataVo'] || []" />
+          <e-trend-census
+            v-if="!isFoldRight"
+            :result="resultInfo['alarmChartDataVo'] || []"
+          />
         </template>
       </e-simple-card>
     </div>
@@ -101,7 +124,7 @@
 </template>
 <script>
 import { getProject, listProject } from "@/api/iot/project";
-import { statProject } from "@/api/iot/project_new"
+import { statProject } from "@/api/iot/project_new";
 import { getWarningAnalysis } from "@/api/app";
 import Cookies from "js-cookie";
 import ECensusCards from "./ECensusCards";
@@ -115,13 +138,13 @@ import ETypeCensus from "./ETypeCensus";
 import ETrendCensus from "./ETrendCensus";
 import EObjectContainer from "./EObjectContainer";
 import EDeviceManage from "./DeviceManage/index";
-import EAlarmManage from './AlarmManage/index'
-import ESafetyTemplate from './SafetyTemplate/index'
-import ELeakageCurrent from './SafetyTemplate/ELeakageCurrent'
-import EDebuff from './SafetyTemplate/EDebuff'
-import EDeviceSwitchWarning from './SafetyTemplate/EDeviceSwitchWarning'
-import EElectricity from './EnergyManage/EElectricity'
-import EEnergyLoad from './EnergyManage/EEnergyLoad'
+import EAlarmManage from "./AlarmManage/index";
+import ESafetyTemplate from "./SafetyTemplate/index";
+import ELeakageCurrent from "./SafetyTemplate/ELeakageCurrent";
+import EDebuff from "./SafetyTemplate/EDebuff";
+import EDeviceSwitchWarning from "./SafetyTemplate/EDeviceSwitchWarning";
+import EElectricity from "./EnergyManage/EElectricity";
+import EEnergyLoad from "./EnergyManage/EEnergyLoad";
 
 export default {
   name: "projectDetailV2",
@@ -143,7 +166,7 @@ export default {
     EDebuff,
     EDeviceSwitchWarning,
     EElectricity,
-    EEnergyLoad
+    EEnergyLoad,
   },
   props: {
     sourceId: {
@@ -156,7 +179,7 @@ export default {
       stateSourceId: null,
       resultInfo: {},
       activeName: "EObjectContainer",
-      activeType: 'EObjectContainer',
+      activeType: "EObjectContainer",
       activeList: [
         {
           label: "项目信息",
@@ -171,7 +194,8 @@ export default {
         {
           label: "安全监管",
           key: "safety",
-          children: [ // 漏电流 温度 漏电报警 温度报警 漏保自检 短路报警 过欠压 过流过载 电弧报警 三相报警 异常状态 分合闸警示
+          children: [
+            // 漏电流 温度 漏电报警 温度报警 漏保自检 短路报警 过欠压 过流过载 电弧报警 三相报警 异常状态 分合闸警示
             {
               label: "全部报警",
               key: "EAlarmManage",
@@ -185,7 +209,7 @@ export default {
             {
               label: "温度",
               key: "A006,A007,A008,A009,B004,B005,B006,B007",
-              template: 'ESafetyTemplate'
+              template: "ESafetyTemplate",
             },
             {
               label: "漏电报警",
@@ -232,7 +256,7 @@ export default {
               key: "A011",
               template: "EDeviceSwitchWarning",
             },
-          ]
+          ],
         },
         {
           label: "能源管理",
@@ -282,7 +306,7 @@ export default {
       fullscreen: false,
       divWidth: 1682,
       divHeight: 812,
-      projectStatistics: {}
+      projectStatistics: {},
     };
   },
   created() {
@@ -298,25 +322,25 @@ export default {
     isFoldRight: {
       handler(newValue) {
         if (!newValue) {
-          this.warningAnalysisList()
+          this.warningAnalysisList();
         }
       },
-      deep:true, // 深度监听
-			immediate: false, // 初始化监听
+      deep: true, // 深度监听
+      immediate: false, // 初始化监听
     },
     sourceId(val) {
       this.stateSourceId = this.sourceId;
     },
     stateSourceId(val) {
-      this.init()
+      this.init();
     },
     opened: {
       handler() {
         this.resize_window_project();
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     // 计算缩放比例
@@ -331,12 +355,12 @@ export default {
   computed: {
     opened() {
       return this.$store.getters.sidebar;
-    }
+    },
   },
   methods: {
     init() {
       this.getInfoByProjectId();
-      this.getProjectCount()
+      this.getProjectCount();
       this.warningAnalysisList();
     },
     resize_window_project() {
@@ -366,28 +390,28 @@ export default {
     handlePrev(idx) {
       if (idx >= 1) {
         // this.getInfoByProjectId(this.projectList[idx - 1].projectId)
-        this.stateSourceId = this.projectList[idx - 1].projectId
+        this.stateSourceId = this.projectList[idx - 1].projectId;
       }
     },
     handleNext(idx) {
       if (idx < this.projectList.length - 1) {
         // this.getInfoByProjectId(this.projectList[idx + 1].projectId)
-        this.stateSourceId = this.projectList[idx + 1].projectId
+        this.stateSourceId = this.projectList[idx + 1].projectId;
       }
     },
     // 查询 项目统计
     getProjectCount() {
-      statProject({ projectId: this.stateSourceId }).then(res => {
-        this.projectStatistics = res.data
-      })
+      statProject({ projectId: this.stateSourceId }).then((res) => {
+        this.projectStatistics = res.data;
+      });
     },
     // 查询项目列表
     getProjectList() {
       listProject({
         pageNum: 1,
         pageSize: 99999,
-        orderByColumn: 'createTime',
-        isAsc: 'desc',
+        orderByColumn: "createTime",
+        isAsc: "desc",
       }).then((response) => {
         this.projectList = response.rows;
       });
@@ -618,6 +642,4 @@ export default {
     font-size: 20px !important;
   }
 }
-
-
 </style>