Merge branch 'master' of http://h.gemho.cn:7099/lichunliang/yindong-tongbai-automation

src/api/device/device.js

@@ -42,3 +42,10 @@ export function delDevice(id) {
     method: 'delete'
   })
 }
+//
+export function deviceTypeList(id){
+  return request({
+    url: '/gemho/app/deviceTypeList?deviceType='+ id,
+    method: 'get'
+  })
+}

src/views/inspection/patrol/patrolLog/index.vue

@@ -41,7 +41,7 @@
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备状态" align="center" prop="deviceState">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.deviceState == 1" type="success">正常</el-tag>
+          <el-tag v-if="scope.row.deviceState == 0" type="success">正常</el-tag>
           <el-tag v-else type="danger">异常</el-tag>
         </template>
       </el-table-column>