Merge branch 'master' of http://47.92.161.104:10080/shuzhan/shinestar-portal

src/views/base/deviceInfo-detail.vue

@@ -130,9 +130,9 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="设备用途" prop="sceneArray">
-              <el-select v-model="formModel.sceneArray" multiple  placeholder="请选择"  style="width:80%">
+              <el-select v-model="formModel.sceneArray" multiple  placeholder="请选择"  style="width:595px" @change="$forceUpdate()">
                   <el-option
                   v-for="item in sceneList"
                   :key="item.value"
@@ -459,10 +459,10 @@ export default {
           if(jsonData.data.sceneList!=null&&jsonData.data.sceneList.length>0){
             var sceneTempList = jsonData.data.sceneList;
             var sceneArray = new Array();
-            // sceneTempList.forEach((item, index) => {
-            //   sceneArray.push(item);
-            // })
-            self.formModel.sceneArray = ["1", "3", "5"];
+            sceneTempList.forEach((item, index) => {
+              sceneArray.push(item);
+            })
+            self.formModel.sceneArray = sceneArray;
           }
 
 

src/views/base/deviceInfo-list.vue

@@ -519,7 +519,7 @@ export default {
       "catalogName" : "设备用途"
     }).then(response => {
       var jsonData = response.data;
-      this.sceneDroList = jsonData.data;
+      this.sceneList = jsonData.data;
     });
 
     var self = this;