wangtao %!s(int64=3) %!d(string=hai) anos
pai
achega
5c9f3752da

+ 2 - 1
README.md

@@ -1,4 +1,4 @@
-## 开发 东信运营中心
+## 开发 东信运营中心(接口涉及设备设施、安防、、)
 
 ```bash
 # 克隆项目
@@ -30,3 +30,4 @@ npm run build:prod
 
 
 ```
+

+ 0 - 3
package.json

@@ -51,9 +51,6 @@
         "jsencrypt": "3.0.0-rc.1",
         "nprogress": "0.2.0",
         "postcss-pxtorem": "^6.0.0",
-        "print-js": "^1.6.0",
-        "qrcode": "^1.5.0",
-        "qrcodejs2": "0.0.2",
         "quill": "1.3.7",
         "screenfull": "5.0.2",
         "sortablejs": "1.10.2",

+ 37 - 7
src/components2/SpringFrame/xfgj.vue

@@ -65,6 +65,22 @@
                     {{data[0].property || '--'}}
                 </el-col>
             </el-col>
+            <el-col class="data">
+                <el-col class="title" :span="8">
+                    处理状态:
+                </el-col>
+                <el-col class="content" :span="16">
+                  <span :class="data[0].clzt == '0' ? 'color3' : data[0].clzt == '1' ? 'color4' : 'color2'">{{data[0].clzt == '0' ? "未处理" : data[0].clzt == '1' ? "已处理:通过" :  data[0].clzt == '2' ? "已处理:未通过" : "--"}}</span>
+                </el-col>
+            </el-col>
+            <el-col class="data">
+                <el-col class="title" :span="8">
+                    处置时间:
+                </el-col>
+                <el-col class="content" :span="16">
+                 {{data[0].czTime || '--'}}
+                </el-col>
+            </el-col>
         </el-col>
     </el-row>
 </template>
@@ -101,16 +117,16 @@ export default {
 @import '@/assets/styles/common.scss';
 .commonWidth{
     width:950px;
-    height:680px;
+    height:760px;
     background-color: rgba(40,40,40,0.5);
-    margin:0 auto; 
+    margin:0 auto;
     border-radius: 20px;
     padding:20px;
     color:$white;
     .top{
         .title{
             width:100%;
-            margin-top:-2px; 
+            margin-top:-2px;
             margin-left:16px;
             display: inline-block;
             font-size:30px;
@@ -124,7 +140,7 @@ export default {
                 width:100%;
             }
         }
-    } 
+    }
     .contain{
         .data{
             margin-top:30px;
@@ -139,7 +155,7 @@ export default {
         .data:nth-child(1){
             margin-top:80px;
         }
-        
+
     }
 }
 
@@ -147,6 +163,20 @@ export default {
 
 </style>
 <style >
-/* 表格内背景颜色 */
+.color1 {
+    color: #6F99FA!important;
+}
+
+.color2 {
+    color: #DE8C54!important
+}
 
-</style>
+.color3 {
+    color: #FF5801!important
+}
+
+.color4 {
+    color: #37FF01!important
+}
+
+</style>

+ 1 - 1
src/components2/equipmentAlarm/seTable.vue

@@ -55,7 +55,7 @@ export default {
       }).then(res =>{
           this.initList = res.data.data.records
           this.loading = false
-          this.text = "暂无数据"
+          this.text = "目前运转正常,无告警"
       }).catch(err =>{
         this.loading = false
         this.text = "数据加载失败..."

+ 1 - 1
src/components2/equipmentStatus/seTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table ref="initList" :data="videoSelect"  height="200" @row-click="clickData" highlight-current-row @cell-mouse-enter="mouseEnter" @cell-mouse-leave="mouseLeave" v-if="select1" v-loading="loading">
+    <el-table ref="initList" :data="videoSelect"  height="212" @row-click="clickData" highlight-current-row @cell-mouse-enter="mouseEnter" @cell-mouse-leave="mouseLeave" v-if="select1" v-loading="loading">
       <template slot="empty">
           <span>{{text}}</span>
       </template>

+ 20 - 3
src/components2/fireHazard/seTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-table ref="initList" :data="initList"  height="200" @row-click="clickData" highlight-current-row @cell-mouse-enter="mouseEnter" @cell-mouse-leave="mouseLeave" v-loading="loading">
+  <el-table ref="initList" :data="initList"  height="212" @row-click="clickData" highlight-current-row @cell-mouse-enter="mouseEnter" @cell-mouse-leave="mouseLeave" v-loading="loading">
       <template slot="empty">
           <span>{{text}}</span>
       </template>
@@ -44,7 +44,7 @@ export default {
                 this.initList = data
             }
             this.loading = false
-            this.text = "暂无数据"
+            this.text = "目前运转正常,无隐患"
         }).catch(err =>{
           this.loading = false
           this.text = "数据加载失败..."
@@ -76,7 +76,24 @@ export default {
     },
     //点击行
     clickData(row){
-      this.$emit("xfgjClick",row)
+
+      axios({
+            method: 'post',
+            url: 'https://smartpark.caih.com/dmapi/workOrder/list',
+            data:{
+              id:row.workId,
+              size:1,
+              current:1
+            },
+            timeout: 3000,
+        }).then(res =>{
+            if(res.data.data.records[0]){
+              row.clzt = res.data.data.records[0].clzt
+              row.czTime = res.data.data.records[0].czTime
+              this.$emit("xfgjClick",row)
+            }
+        })
+
     },
     // cellStyle (row, column, rowIndex, columnIndex) {
     // //列的label的名称

+ 1 - 1
src/components2/iOTNetworkCard/index.vue

@@ -45,7 +45,7 @@
         <el-col :span="12" class="num">2022年12月31日</el-col>
       </el-row>
     </el-col>
-    
+
   </el-col>
 </template>
 <script>

+ 1 - 1
src/components2/keepWatch/seTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-table ref="initList" :data="initList"  height="200" @row-click="clickData" highlight-current-row @cell-mouse-enter="mouseEnter" @cell-mouse-leave="mouseLeave" v-loading="loading">
+  <el-table ref="initList" :data="initList"  height="212" @row-click="clickData" highlight-current-row @cell-mouse-enter="mouseEnter" @cell-mouse-leave="mouseLeave" v-loading="loading">
       <template slot="empty">
           <span>{{text}}</span>
       </template>

+ 1 - 1
src/components2/realTimeVideo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-col :span="24" class="realTimeVideo modular" style="padding:10px 20px 0;">
     <div class="title" style="margin-left:0">实时视频</div>
-    <div  class="videoSelect" v-if="videoSelect">
+    <div  class="videoSelect">
         <el-select @change="videoSelect1" v-model="video1" placeholder="请选择摄像头1" class="videoSelect1">
             <el-option
             v-for="item in videoSelect"

+ 2 - 2
src/components2/table1/index.vue

@@ -4,8 +4,8 @@
       <el-table-column label="告警内容" align="center" prop="evtname"  show-overflow-tooltip />
       <el-table-column label="告警类型" align="center" prop="dwtype"  show-overflow-tooltip >
          <template slot-scope="scope">
-          <span>{{scope.row.dwtype == "1" ? "用户传输装置" : scope.row.dwtype == "2" ? "喷淋水压" : 
-            scope.row.dwtype == "2" ? "喷淋水压" : scope.row.dwtype == "5" ? "消防水箱液位" : 
+          <span>{{scope.row.dwtype == "1" ? "用户传输装置" : scope.row.dwtype == "2" ? "喷淋水压" :
+            scope.row.dwtype == "2" ? "喷淋水压" : scope.row.dwtype == "5" ? "消防水箱液位" :
             scope.row.dwtype == "6" ? "RTU" : scope.row.dwtype == "16" ? "消防视频监控" : "其它"}}</span>
         </template>
       </el-table-column>

+ 6 - 3
src/views/index.vue

@@ -19,7 +19,7 @@
         </el-col>
         <el-col  id="middleWrap" >
           <!-- <iframe  style="width:100%;height:100%;border:none;" id="iframe" src='https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9'></iframe> -->
-          <!-- <iframe  style="width:100%;height:100%;border:none;" id="iframe" src='http://10.21.39.6:9000/'></iframe> -->
+          <iframe  style="width:100%;height:100%;border:none;" id="iframe" src='http://10.21.39.6:9000/'></iframe>
         </el-col>
         <el-col  class="rightWrap">
           <weather alt="天气"/>
@@ -279,16 +279,19 @@ export default {
             height:267px;
           }
           .iOTNetworkCard{
-            height:550px;
+            height:560px;
           }
 
         }
         .rightR{
           width:700px;
           display: inline-block;
-          .equipmentStatus,.fireHazard,.keepWatch{
+          .equipmentStatus{
             height:267.8px;
           }
+          .fireHazard,.keepWatch{
+            height:272.8px;
+          }
         }
 
       }