Merge remote-tracking branch 'origin/master'

sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue

@@ -105,6 +105,8 @@
             label="联系电话"
           >
           </el-table-column>
+          <el-table-column align="center" prop="belong" label="所属机构">
+          </el-table-column>
           <el-table-column align="center" label="状态">
             <template slot-scope="scope">
               <el-tag

sample-form-manager-ui/admin/src/pages/hardware/modal/AddDevice.vue

@@ -53,8 +53,13 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12"
-            ><el-form-item label="分辨率" prop="name">
-              <el-select v-model="form.value" placeholder="请选择分辨率">
+            ><el-form-item label="分辨率" prop="resolution">
+              <el-input
+                v-model="form.resolution"
+                placeholder="请输入分辨率"
+              ></el-input>
+
+              <!-- <el-select v-model="form.value" placeholder="请选择分辨率">
                 <el-option
                   v-for="item in options"
                   :key="item.id"
@@ -62,8 +67,9 @@
                   :value="item.id"
                 >
                 </el-option>
-              </el-select> </el-form-item
-          ></el-col>
+              </el-select>  -->
+            </el-form-item></el-col
+          >
           <el-col :span="12"
             ><el-form-item label="设备IP" prop="ip">
               <el-input
@@ -216,6 +222,8 @@ export default {
         deviceInBuilding: "", // 所在楼宇
         deviceInFloor: "", // 所在楼层
         institution: "",
+        belong: "", // 所属机构
+        resolution: "", // 分辨率
       },
       rules: {
         deviceName: [