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

src/views/base/deviceInfo-detail.vue

@@ -129,6 +129,16 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备用途" prop="scene">
+              <el-select v-model="formModel.scene" style="width:80%">
+                <el-option v-for="(item,index) in sceneList" 
+                :label="item.name" :value="item.value" :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="开门时间" prop="remoteOpenRangeTime">
@@ -281,6 +291,13 @@ export default {
       var jsonData = response.data;
       this.manufacturerList = jsonData.data;
     });
+
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "设备用途"
+    }).then(response => {
+      var jsonData = response.data;
+      this.sceneList = jsonData.data;
+    });
   },
   methods: {
     loadTree() {

src/views/base/deviceInfo-list.vue

@@ -79,6 +79,12 @@
           :label="item.name" :value="item.value" :key="index"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="设备用途" prop="scene">
+        <el-select v-model="queryModel.scene" size="mini" style="width:100px;" clearable>
+          <el-option v-for="(item,index) in sceneList" 
+          :label="item.name" :value="item.value" :key="index"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -156,6 +162,7 @@
       <el-table-column prop="columnColorN" label="立柱颜色"></el-table-column>
       <el-table-column prop="columnHeightN" label="立柱高度"></el-table-column>
       <el-table-column prop="manufacturerN" label="设备厂家"></el-table-column>
+      <el-table-column prop="sceneN" label="设备用途"></el-table-column>
       <el-table-column prop="heartbeatUpdateTime" sort-by="a.heartbeat_update_time"
         sortable="custom" label="心跳更新时间" width="160"></el-table-column>
       <el-table-column prop="updateTime" label="记录更新时间" width="160"></el-table-column>
@@ -501,6 +508,13 @@ export default {
       this.manufacturerList = jsonData.data;
     });
 
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "设备用途"
+    }).then(response => {
+      var jsonData = response.data;
+      this.sceneList = jsonData.data;
+    });
+
     var self = this;
     companyInfoApi.treeList().then(function(response) {
       var jsonData = response.data;
@@ -598,6 +612,11 @@ export default {
         formData.append("manufacturer", self.queryModel.manufacturer);
       }
 
+      
+      if (self.queryModel.scene != null) {
+        formData.append("scene", self.queryModel.scene);
+      }
+
 
       if (this.field != null) {
         formData.append("field", this.field);