Merge branch 'v0.1.1_alarm' of http://10.87.21.221:8000/jzyd_yyds/soc_web into v0.1.1_alarm

src/views/iot/sensorData/index.vue

@@ -160,6 +160,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-view"
+                  v-if="scope.row.deviceStatusId"
                   @click="lookView(scope.row)"
                   >历史数据</el-button
                 >

src/views/system/device/index.vue

@@ -127,7 +127,7 @@
             <el-form-item label="资产编号" prop="assetNo">
               <el-input
                 v-model="form.assetNo"
-                placeholder="请输入设备名称"
+                placeholder="请输入资产编号"
                 maxlength="50"
               />
             </el-form-item>
@@ -320,7 +320,7 @@ export default {
         assetNo: [{required: true, message: "请输入资产编号", trigger: "change"}],
         deviceName: [{required: true, message: "请输入设备名称", trigger: "change"}],
         orgId: [{required: true, message: "请选择所属机构", trigger: "blur"}],
-        assetType: [{required: true, message: '请选择资产类别', trigger: 'change'}],
+        assetType: [{required: true, message: '请选择资产分类', trigger: 'change'}],
       /*  hostId: [{required: true, message: '请选择主机', trigger: 'change'}],
         channel: [{required: true, message: '请输入通道号', trigger: 'change'}],*/
         deviceType: [{required: true, message: "请选择设备分类", trigger: "change"}],