ming %!s(int64=2) %!d(string=hai) anos
pai
achega
d82a0ad211
Modificáronse 1 ficheiros con 20 adicións e 14 borrados
  1. 20 14
      src/views/index.vue

+ 20 - 14
src/views/index.vue

@@ -118,18 +118,10 @@
       </el-row>
 
       <!-- 详情对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="1600px" append-to-body :before-close="cancel"
+      <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :before-close="cancel"
         :close-on-click-modal="false">
         <div style="height:700px" class="index-dialog">
-          <el-row :gutter="40">
-            <el-col :span="10">
-              <div class="store-container">
-                <!-- <iframe id="myIframe" style="width:100%;height:100%;border:none;"
-                  src='https://www.thingjs.com/s/b11227d4fd5505106989737c?params=105b0f77fd24654d4eebc434e9'></iframe> -->
-              </div>
-            </el-col>
-            <el-col :span="14">
-              <div class="detail-container">
+          <div class="detail-container">
                 <div class="project-status "  v-if="!showNowClick">
                   <h3>项目信息</h3>
                   <br>
@@ -202,8 +194,21 @@
                       <p>{{currentOneData.status_time}}</p>
                     </el-col>
                     <el-col :span="12">
-                      <div style="height:240px;width:80%;background:#e1dede">
-                        视频播放区域
+                      <div style="height:240px;width:80%;background:#e1dede" v-if="currentOneData.dwtype=='YTVA'">
+                        视频播放区域 
+                      </div>
+                      <div style="height:240px;width:80%;" v-else>
+                          <div style="font-size:20px">{{currentOneData.device_name}}</div>
+
+                          <div class="tit" style="display:inline-block">{{currentOneData.status_list[0].point_name }}: </div>
+                          <p style="display:inline-block"> {{currentOneData.status_list[0].content }}</p>
+                          <br>
+
+                         <div v-for="(item, index) in statusListData " :key="index">                      
+                             <div class="tit" style="display:inline-block">{{item.point_name }}: </div>
+                             <p style="display:inline-block"> {{ item.point_data}}</p>
+                             <br>
+                         </div>
                       </div>
 
                     </el-col>
@@ -228,8 +233,6 @@
                   </el-table>
                 </div>
               </div>
-            </el-col>
-          </el-row>
 
         </div>
 
@@ -324,6 +327,7 @@ export default {
 
       innerData:{},
       currentOneData:{},
+      statusListData:[],
       // building_name:'',
       // username:'',
       // address:'',
@@ -481,6 +485,8 @@ export default {
       }).then((res) => {
         this.open = true
         this.currentOneData=res.data.devices[0];
+        this.statusListData=res.data.devices[0].status_list.splice(1);
+
         var dwtype=res.data.devices[0].dwtype
         if (dwtype == "YTUI") {
           this.innerData.imgUrl=ui_large  //用户传输装置