设备列表：调整列显示

src/views/modules/device/device-add-or-update.vue

@@ -93,12 +93,25 @@
               <user-component v-model="dataForm.responsibilityUser"/>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
-            <el-form-item label="备注" prop="notes">
-              <el-input v-model="dataForm.notes" placeholder="备注"></el-input>
+          <el-col :span="8">
+            <el-form-item label="设备状态" prop="status">
+              <el-select v-model="dataForm.state" placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="item in stateOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row class="my-row">
+          <el-form-item label="备注" prop="notes">
+            <el-input v-model="dataForm.notes" type="textarea" placeholder="备注"></el-input>
+          </el-form-item>
+        </el-row>
         <el-row class="my-row">
           <el-col :span="8">
             <el-form-item label="操作说明书">
@@ -133,6 +146,7 @@
   import UserComponent from '../common/user-component'
   import uploadComponent from '@/views/modules/common/upload-component.vue'
   import {getDeviceDetails} from '@/api/device'
+  import {optionsEquipmentState} from '@/utils/enums'
 
 export default {
     name: 'device-add-or-update',
@@ -148,6 +162,7 @@ export default {
         fileList1: [],
         fileList2: [],
         dataForm: {},
+        stateOption: optionsEquipmentState,
         dataRule: {
           code: [{ required: true, message: '网关编码不能为空', trigger: 'blur' }],
           codeNumber: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
@@ -167,6 +182,7 @@ export default {
         await getDeviceDetails(this.id).then(({data}) => {
           if (data && data.code === '200') {
             this.dataForm = data.data
+            console.log('dataForm', this.dataForm)
             // 操作说明书
             if (this.dataForm.attachList) {
               this.fileList1 = []

src/views/modules/device/device-list.vue

@@ -52,6 +52,26 @@
           :show-overflow-tooltip="true"
           label="设备编号">
         </el-table-column>
+        <el-table-column
+          prop="online"
+          header-align="center"
+          align="center"
+          min-width="80"
+          :show-overflow-tooltip="true"
+          label="是否在线">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.online) === 0" type="danger">离线</el-tag>
+            <el-tag v-else type="success">在线</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="spindleActualSpeed"
+          header-align="center"
+          align="center"
+          min-width="120"
+          :show-overflow-tooltip="true"
+          label="设备主轴转速">
+        </el-table-column>
         <el-table-column
           prop="name"
           header-align="center"