luowei修改bug

src/views/core/accessPlan/index.vue

@@ -40,7 +40,8 @@
           </el-form-item>
 
           <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
 
           <el-form-item>
@@ -57,9 +58,8 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="planList"  row-key="id"
-          :tree-props="{ children: 'children' }">
-       
+        <el-table v-loading="loading" :data="planList" row-key="id" :tree-props="{ children: 'children' }">
+
           <el-table-column label="计划所属机构" align="center" prop="orgName" />
           <el-table-column label="计划名称" align="center" prop="planName" />
 
@@ -139,11 +139,10 @@
           </el-date-picker>
         </el-form-item> -->
         <el-form-item prop="startTime" v-if="form.planCycle == 0" label="开始日期">
-              <el-date-picker v-model="form.startTime" @change="startDateChanged"
-                              :picker-options="startDatepickerOptions"
-                              align="right" type="date" placeholder="选择开始日期">
-              </el-date-picker>
-            </el-form-item>
+          <el-date-picker v-model="form.startTime" @change="startDateChanged" :picker-options="startDatepickerOptions"
+            align="right" type="date" placeholder="选择开始日期">
+          </el-date-picker>
+        </el-form-item>
 
 
 
@@ -153,10 +152,10 @@
           </el-date-picker>
         </el-form-item> -->
         <el-form-item prop="endTime" v-if="form.planCycle == 0" label="结束日期">
-              <el-date-picker v-model="form.endTime" :picker-options="endDatepickerOptions" align="right" type="date"
-                              placeholder="选择结束日期">
-              </el-date-picker>
-            </el-form-item>
+          <el-date-picker v-model="form.endTime" :picker-options="endDatepickerOptions" align="right" type="date"
+            placeholder="选择结束日期">
+          </el-date-picker>
+        </el-form-item>
 
 
         <el-form-item label="调阅角色" prop="roleId">
@@ -181,7 +180,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
-import { listRole, findRoleByType, getRole,allRole } from "@/api/system/role";
+import { listRole, findRoleByType, getRole, allRole } from "@/api/system/role";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
 import { deptTreeSelect } from "@/api/system/public";
@@ -263,7 +262,7 @@ export default {
           { required: true, message: '请选择调阅频次', trigger: 'change' },
         ],
       }
-      
+
     };
   },
   created() {
@@ -323,7 +322,7 @@ export default {
     },
     startDateChanged(time) {
       debugger
-      console.log(time+"*********************")
+      console.log(time + "*********************")
       if (this.form.startTime > this.form.endTime) {
         this.form.endTime = this.form.startTime;
       }

src/views/system/device/index.vue

@@ -125,12 +125,12 @@
         <el-row>
 
           <el-col :span="10">
-        <el-form-item label="设备分类" prop="deviceType">
+            <el-form-item label="设备分类" prop="deviceType">
               <el-select v-model="form.deviceType" placeholder="请选择">
-           
-                <el-option v-for="item in roleList" :key="item.id" :label="item.dictLabel" :value="item.id"></el-option>
+
+                <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
               </el-select>
-            </el-form-item> 
+            </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item label="设备名称" prop="deviceName">
@@ -220,10 +220,10 @@ export default {
         ],
         hostId: [{ required: true, message: '请选择主机', trigger: 'blur' }],
         channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],
-        // deviceType: [
-        //   { required: true, message: '请选择设备分类', trigger: 'change' },
+        deviceType: [
+          { required: true, message: '请选择设备分类', trigger: 'change' },
 
-        // ],
+        ],
         checkTime: [
           { required: true, message: '请选择有效期', trigger: 'blur' },
         ]
@@ -442,6 +442,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {