update

src/views/bridge/device-manage/device-work.vue

@@ -57,7 +57,7 @@ export default {
   },
   watch: {
   },
-  mounted() {
+  created() {
     try {
       this.$store.dispatch('user/clientCredentials')
       this.loading = false

src/views/bridge/device-manage/tky-manage.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="app-container">
       <el-row :gutter="16">
-        <el-col :sm="18" :md="18">
+        <el-col :sm="24" :md="24">
           <!-- <el-select v-model="query.deviceManageId" size="mini" placeholder="请选择设备" @change="deviceChange">
                 <el-option
                   v-for="item in griderErections"
@@ -18,7 +18,7 @@
           <!-- <el-input v-model="query.beamCode" disabled style="float:right;margin-right: 6px;width:30%">
             <template slot="prepend">梁片编号</template>
           </el-input> -->
-          <el-select v-model="query.beamCode" size="mini" style="float:right;margin-right: 6px;" placeholder="请选择梁片编码" @change="change">
+          <el-select v-model="query.beamCode" style="float:right;margin-right: 6px;height:45px;width:30%" placeholder="请选择梁片编码" @change="change">
             <el-option
               v-for="item in beams"
               :key="item.name"
@@ -26,16 +26,16 @@
               :value="item.value"
             />
           </el-select></el-col>
-        <el-col :sm="6" :md="6">
+        <!-- <el-col :sm="6" :md="6">
           <span style="font-size: 18px;">视频监控</span>
           <a style="font-size: 18px;float:right" @click="clickAllVideos">更多视频</a>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row>
-        <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18" style="padding-right: 8px">
+        <el-col :lg="24" :sm="24" :xs="24" :xl="24" :md="24" style="padding-right: 8px">
           <div class="boxall">
             <el-row>
-              <el-col :lg="4" :sm="4" :xs="4" :xl="4" :md="4">
+              <el-col :lg="6" :sm="6" :xs="6" :xl="6" :md="6">
                 <div class="boxCenter" style="cursor:pointer " @click="warningClick">
                   <div class="box-warning"><i class="el-icon-warning" /><span style="margin-left:5px">报警信息</span></div>
                   <div class="left-div"><span style="font-size: 25px;color: #0086ff;">{{ data.warningCount }}</span>次</div>
@@ -52,7 +52,7 @@
                   <div class="left-foot">累计循环{{ data.allCycleCount }}次</div>
                 </div>
               </el-col>
-              <el-col :lg="20" :sm="20" :xs="20" :xl="20" :md="20">
+              <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18">
                 <div class="titleup">
                   <span>最近更新时间：</span><span style="color: #0086ff;font-weight: bold;">{{ noGuide.lastTime | datetimeseconds }}</span>
                   <div style="float:right">
@@ -75,7 +75,7 @@
             <div class="boxfoot" />
           </div>
         </el-col>
-        <el-col :xs="6" :sm="6" :md="6">
+        <!-- <el-col :xs="6" :sm="6" :md="6">
           <div class="boxall">
             <el-row :gutter="8" style="margin-top:6px">
               <el-col v-for="(item,index) in videos" :key="item.name" :sm="12" :md="12">
@@ -90,7 +90,7 @@
             </el-row>
             <div class="boxfoot" />
           </div>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row>
         <el-col :lg="24" :sm="24" :xs="24" :xl="24" :md="24">

src/views/grider-erections/gride-work-info/tky-index.vue

@@ -3,54 +3,60 @@
     <el-container class="content-height-fit">
       <el-container class="resize-fit-container">
         <div class="app-container">
-          <el-row :gutter="16">
-            <el-col :sm="18" :md="18">
-              <el-select v-model="query.deviceManageId" size="mini" placeholder="请选择设备" @change="deviceChange">
+          <el-row :gutter="18">
+            <el-col :lg="24" :sm="24" :xs="24" :xl="24" :md="24">
+              <!-- <el-select v-model="query.deviceManageId" size="mini" placeholder="请选择设备" @change="deviceChange">
                 <el-option
                   v-for="item in griderErections"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
                 />
-              </el-select>
-              <el-tag type="success" style="margin-left: 6px;" size="mini">在线</el-tag>
-              <el-select v-model="query.beamCode" size="mini" style="float:right;margin-right: 6px;" placeholder="请选择梁片编码">
+              </el-select> -->
+              <el-input v-model="query.deviceCode" disabled style="float:left;width:30%">
+                <template slot="prepend">设备编号</template>
+              </el-input>
+              <!-- <el-tag type="success" style="margin-left: 6px;" size="mini">在线</el-tag> -->
+              <el-input v-model="query.beamCode" disabled style="float:right;margin-right: 6px;width:30%">
+                <template slot="prepend">梁片编号</template>
+              </el-input>
+              <!-- <el-select v-model="query.beamCode" size="mini" style="float:right;margin-right: 6px;" placeholder="请选择梁片编码" @change="change">
                 <el-option
                   v-for="item in beams"
-                  :key="item.value"
-                  :label="item.label"
+                  :key="item.name"
+                  :label="item.name"
                   :value="item.value"
                 />
-              </el-select>
-            </el-col>
-            <el-col :sm="6" :md="6">
-              <span style="color: white;font-size: 18px;">视频监控</span>
-            </el-col>
-          </el-row>
+              </el-select></el-col> -->
+              <!-- <el-col :sm="6" :md="6">
+                <span style="font-size: 18px;">视频监控</span>
+                <a style="font-size: 18px;float:right" @click="clickAllVideos">更多视频</a>
+              </el-col> -->
+            </el-col></el-row>
           <el-row>
-            <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18" style="padding-right: 8px">
+            <el-col :lg="24" :sm="24" :xs="24" :xl="24" :md="24" style="padding-right: 8px">
               <div class="boxall">
                 <el-row>
-                  <el-col :lg="4" :sm="4" :xs="4" :xl="4" :md="4">
+                  <el-col :lg="6" :sm="6" :xs="6" :xl="6" :md="6">
                     <div class="boxCenter" style="cursor:pointer " @click="warningClick">
                       <div class="box-warning"><i class="el-icon-warning" /><span style="margin-left:5px">报警信息</span></div>
-                      <div class="left-div"><span style="font-size: 25px;color: yellow;">{{ data.warningCount }}</span>次</div>
+                      <div class="left-div"><span style="font-size: 25px;color: #0086ff;">{{ data.warningCount }}</span>次</div>
                       <div class="left-foot">已解除报警{{ data.doneWarningCount }}次</div>
                     </div>
                     <div class="boxCenter">
                       <div class="box-warning"><i class="el-icon-timer" /><span style="margin-left:5px">工作时长</span></div>
-                      <div class="left-div"><span style="font-size: 25px;color: yellow;">{{ data.timeCount }}</span>小时</div>
+                      <div class="left-div"><span style="font-size: 25px;color: #0086ff;">{{ data.timeCount }}</span>小时</div>
                       <div class="left-foot">累计工作{{ data.allTimeCount }}小时</div>
                     </div>
                     <div class="boxCenter">
                       <div class="box-warning"><i class="el-icon-refresh" /><span style="margin-left:5px">循环次数</span></div>
-                      <div class="left-div"><span style="font-size: 25px;color: yellow;">{{ data.cycleCount }}</span>次</div>
+                      <div class="left-div"><span style="font-size: 25px;color: #0086ff;">{{ data.allCycleCount }}</span>次</div>
                       <div class="left-foot">累计循环{{ data.allCycleCount }}次</div>
                     </div>
                   </el-col>
-                  <el-col :lg="20" :sm="20" :xs="20" :xl="20" :md="20">
+                  <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18">
                     <div class="titleup">
-                      <span>最近更新时间：</span><span style="color:yellow;font-weight: bold;">{{ noGuide.uploadTime | datetimeseconds }}</span>
+                      <span>最近更新时间：</span><span style="color: #0086ff;font-weight: bold;">{{ noGuide.lastTime | datetimeseconds }}</span>
                       <div style="float:right">
                         <el-button v-if="!playback.isAnimRunning && !playback.anim" type="primary" size="mini" @click="hitoryClick">开始回放</el-button>
                         <el-button v-if="playback.anim" type="primary" size="mini" @click="stopPlayback">停止回放</el-button>
@@ -71,25 +77,22 @@
                 <div class="boxfoot" />
               </div>
             </el-col>
-            <el-col :xs="6" :sm="6" :md="6">
-              <div class="boxall">
-                <el-row :gutter="8" style="margin-top:6px">
-                  <el-col :sm="12" :md="12">
-                    <img src="../../../assets/jqj1.png" width="100%" height="210">
-                  </el-col>
-                  <el-col :sm="12" :md="12" style="padding-bottom: 8px;">
-                    <img src="../../../assets/jqj2.jpg" width="100%" height="210">
-                  </el-col>
-                  <el-col :sm="12" :md="12">
-                    <img src="../../../assets/jqj3.jpg" width="100%" height="210">
-                  </el-col>
-                  <el-col :sm="12" :md="12">
-                    <img src="../../../assets/jqj4.jpg" width="100%" height="210">
-                  </el-col>
-                </el-row>
-                <div class="boxfoot" />
-              </div>
-            </el-col>
+            <!-- <el-col :xs="6" :sm="6" :md="6">
+          <div class="boxall">
+            <el-row :gutter="8" style="margin-top:6px">
+              <el-col v-for="(item,index) in videos" :key="item.name" :sm="12" :md="12">
+                <video
+                  :id="'video' + index"
+                  controls
+                  autoplay
+                  muted
+                  style="height:210px;width:100%;background:#000"
+                />
+              </el-col>
+            </el-row>
+            <div class="boxfoot" />
+          </div>
+        </el-col> -->
           </el-row>
           <el-row>
             <el-col :lg="24" :sm="24" :xs="24" :xl="24" :md="24">
@@ -209,8 +212,8 @@ export default {
         }
       ],
       query: {
-        deviceManageId: 'EA64ABA4-3514-9D82-0D8C-3A03141B7962',
-        beamCode: '2022060101'
+        deviceCode: this.$route.query.deviceCode,
+        beamCode: this.$route.query.TempBeamCode
       },
       listLoading: false,
       proDucitonVisible: false,

src/views/projects/components/DeviceTree.vue

@@ -56,12 +56,12 @@ export default {
     }
   },
   mounted() {
-    try {
-      this.$store.dispatch('user/clientCredentials')
-      this.loading = false
-    } catch (ex) {
-      console.log(ex)
-    }
+    // try {
+    //   this.$store.dispatch('user/clientCredentials')
+    //   this.loading = false
+    // } catch (ex) {
+    //   console.log(ex)
+    // }
   },
   methods: {
     filterTree(value, data) {