Merge pull request 'pc-master' (#286) from pc-master into portal

Reviewed-on: #286

src/router/index.js

@@ -215,6 +215,10 @@ const routes = [
       name: 'control',
       component: control, 
       children: [{
+        path: '/targetTemperature',
+        name: 'targetTemperature',  
+        component: () => import('../views/page/targetTemperature.vue')
+      },{
         path: '/fan',
         name: 'fan',
         component: () => import('../views/page/fan.vue')
@@ -266,10 +270,6 @@ const routes = [
         path: '/snowRemoval',
         name: 'snowRemoval',
         component: () => import('../views/wufang/snowRemoval.vue')
-      },{
-        path: '/targetTemperature',
-        name: 'targetTemperature',  
-        component: () => import('../views/page/targetTemperature.vue')
       },{
         path: '/targetHumidity',
         name: 'targetHumidity',

src/views/manage/deviceSet.vue

@@ -32,6 +32,13 @@
 
         <el-table-column prop="name" :label="$t('text.deviceName')">
         </el-table-column>
+            <!-- <el-table-column prop="name" label="是否含有子名称">
+                <template slot-scope="scope">
+                  <div>
+                    {{scope.row.child&&scope.row.child.length ? '有':''}}
+                  </div>
+          </template>
+        </el-table-column> -->
         <el-table-column prop="nickName" :label="$t('text.deviceAlias')">
         </el-table-column>
         <el-table-column prop="sort" width="120px" :label="$t('text.sortOrder')">

src/views/page/largeScreen.vue

@@ -3557,10 +3557,9 @@ window.open("http://localhost:8080/");
 
         .liveVideo_content {
           width: 4rem;
-          height: 3.3rem;
+          height: 3.0rem;
           background: url("../../assets/img/liveVideo_bg.png") center no-repeat;
           background-size: 100% 100%;
-          margin-top: 0.14rem;
           display: flex;
           flex-direction: column;
           align-items: center;
@@ -3599,7 +3598,7 @@ window.open("http://localhost:8080/");
               font-weight: 500;
               color: #afd6ff;
               line-height: 0.24rem;
-              margin-top: 0.15rem;
+              margin-top: 0.05rem;
             }
 
             .swiper-button-next_video {

src/views/page/videoMonitoring.vue

@@ -259,13 +259,14 @@ export default {
                     if (res.data.code == 200) {
                       
                              let userInfo = JSON.parse(localStorage.getItem("userInfo"));
-             this.api.user_getjurisdiction(userInfo.userid).then((res1) => {
+                                       this.url = res.data.data.ezopen
-             if (res1.data.code == 200) {
-          this.limitUserId = (res1.data.data.filter(el => el.id == 2 || el.id == 1 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9 || el.id == 10 || el.id == 11|| el.id == 12|| el.id == 13))[0].id;
-           this.url = res.data.data.ezopen
                         this.accesstoken = res.data.data.accesstoken
                         this.createVideoNew(res.data.data.accesstoken)
-
+             this.api.user_getjurisdiction(userInfo.userid).then((res1) => {
+             if (res1.data.code == 200) {
+         
+ 
+ this.limitUserId = (res1.data.data.filter(el => el.id == 2 || el.id == 1 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9 || el.id == 10 || el.id == 11|| el.id == 12|| el.id == 13))[0].id;
         }
       });
                     } else {