yizai 3 سال پیش
والد
کامیت
a8ae22a465

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

@@ -83,7 +83,7 @@ export default {
   },
   },
   created() {
   created() {
     if (this.$route.query.token) {
     if (this.$route.query.token) {
-      this.tkySectionId = Crypto.des_decrypt(this.$route.query.token)
+      this.tkySectionId = Crypto.des_decrypt(this.$route.query.token.replace(' ', '+'))
       console.log('asdsadsd', this.tkySectionId)
       console.log('asdsadsd', this.tkySectionId)
     }
     }
     try {
     try {

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

@@ -54,7 +54,7 @@
               </el-col>
               </el-col>
               <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18">
               <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18">
                 <div class="titleup">
                 <div class="titleup">
-                  <span>最近更新时间:</span><span style="color: #0086ff;font-weight: bold;">{{ noGuide.monitorTime | datetimeseconds }}</span>
+                  <span>时间:</span><span style="color: #0086ff;font-weight: bold;">{{ noGuide.monitorTime | datetimeseconds }}</span>
                   <div style="float:right">
                   <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.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>
                     <el-button v-if="playback.anim" type="primary" size="mini" @click="stopPlayback">停止回放</el-button>

+ 5 - 5
src/views/grider-erections/beam-carrier-work-info/tky-index.vue

@@ -13,7 +13,7 @@
                   :value="item.value"
                   :value="item.value"
                 />
                 />
               </el-select>
               </el-select>
-              <el-tag type="success" style="margin-left: 6px;" size="mini">在线</el-tag>
+              <el-tag :type="data.isOnline?'success':'danger'" style="margin-left: 6px;">{{ data.isOnline?"在线":"离线" }}</el-tag>
               <el-select v-model="query.beamCode" size="mini" style="float:right;margin-right: 6px;" placeholder="请选择梁片编码">
               <el-select v-model="query.beamCode" size="mini" style="float:right;margin-right: 6px;" placeholder="请选择梁片编码">
                 <el-option
                 <el-option
                   v-for="item in beams"
                   v-for="item in beams"
@@ -23,9 +23,9 @@
                 />
                 />
               </el-select>
               </el-select>
             </el-col>
             </el-col>
-            <el-col :sm="6" :md="6">
+            <!-- <el-col :sm="6" :md="6">
               <span style="color: white;font-size: 18px;">视频监控</span>
               <span style="color: white;font-size: 18px;">视频监控</span>
-            </el-col>
+            </el-col> -->
           </el-row>
           </el-row>
           <el-row>
           <el-row>
             <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18" style="padding-right: 8px">
             <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18" style="padding-right: 8px">
@@ -50,7 +50,7 @@
                   </el-col>
                   </el-col>
                   <el-col :lg="20" :sm="20" :xs="20" :xl="20" :md="20">
                   <el-col :lg="20" :sm="20" :xs="20" :xl="20" :md="20">
                     <div class="titleup">
                     <div class="titleup">
-                      <span>最近更新时间:</span><span style="color:yellow;font-weight: bold;">{{ noGuide.uploadTime | datetimeseconds }}</span>
+                      <span>时间:</span><span style="color:yellow;font-weight: bold;">{{ noGuide.uploadTime | datetimeseconds }}</span>
                     </div>
                     </div>
                     <div ref="canvasdiv" style="background: #0AA4BC">
                     <div ref="canvasdiv" style="background: #0AA4BC">
                       <baidu-map
                       <baidu-map
@@ -59,7 +59,7 @@
                         :ak="baiduKey"
                         :ak="baiduKey"
                         :map-type="mapType"
                         :map-type="mapType"
                         :zoom="14"
                         :zoom="14"
-                        center="北京"
+                        center="杭州"
                         :scroll-wheel-zoom="true"
                         :scroll-wheel-zoom="true"
                       >
                       >
 
 

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

@@ -16,7 +16,7 @@
               <el-input v-model="query.deviceCode" disabled style="float:left;width:30%">
               <el-input v-model="query.deviceCode" disabled style="float:left;width:30%">
                 <template slot="prepend">设备编号</template>
                 <template slot="prepend">设备编号</template>
               </el-input>
               </el-input>
-              <!-- <el-tag type="success" style="margin-left: 6px;" size="mini">在线</el-tag> -->
+              <el-tag :type="data.isOnline?'success':'danger'" style="margin-left: 6px;">{{ data.isOnline?"在线":"离线" }}</el-tag>
               <el-input v-model="query.beamCode" disabled style="float:right;margin-right: 6px;width:30%">
               <el-input v-model="query.beamCode" disabled style="float:right;margin-right: 6px;width:30%">
                 <template slot="prepend">梁片编号</template>
                 <template slot="prepend">梁片编号</template>
               </el-input>
               </el-input>
@@ -56,7 +56,7 @@
                   </el-col>
                   </el-col>
                   <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18">
                   <el-col :lg="18" :sm="18" :xs="18" :xl="18" :md="18">
                     <div class="titleup">
                     <div class="titleup">
-                      <span>最近更新时间:</span><span style="color: #0086ff;font-weight: bold;">{{ noGuide.lastTime | datetimeseconds }}</span>
+                      <span>时间:</span><span style="color: #0086ff;font-weight: bold;">{{ noGuide.monitorTime | datetimeseconds }}</span>
                       <div style="float:right">
                       <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.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>
                         <el-button v-if="playback.anim" type="primary" size="mini" @click="stopPlayback">停止回放</el-button>

BIN
waidist.rar