luowei修改bug

src/views/core/accessPlan/index.vue

@@ -133,21 +133,30 @@
 
 
 
-        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
+        <!-- <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
           <el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择时间">
           </el-date-picker>
-        </el-form-item>
-
+        </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-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
+        <!-- <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
           <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择时间">
           </el-date-picker>
-        </el-form-item>
-
+        </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-form-item label="调阅角色" prop="roleId">
@@ -186,6 +195,16 @@ export default {
   },
   data() {
     return {
+      startDatepickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24);
+          return time.getTime() < date;
+        },
+      },
+      endDatepickerOptions: {
+        disabledDate: this.disabledDate,
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -244,6 +263,7 @@ export default {
           { required: true, message: '请选择调阅频次', trigger: 'change' },
         ],
       }
+      
     };
   },
   created() {
@@ -301,6 +321,24 @@ export default {
       this.queryParams.checkSub = state;
       this.handleQuery();
     },
+    startDateChanged(time) {
+      debugger
+      console.log(time+"*********************")
+      if (this.form.startTime > this.form.endTime) {
+        this.form.endTime = this.form.startTime;
+      }
+    },
+    disabledDate(time) {
+      //小于开始日期禁止选择
+      let startTiem = new Date();
+      startTime.setTime(startTiem.getTime() - 3600 * 1000 * 24);
+      if (this.form.startTime) {
+        startTiem = new Date(this.formatTime(this.form.startTiem, 'YYYY-MM-DD'));
+        startTiem.setTime(startTiem.getTime() - 3600 * 1000 * 24);
+      }
+      debugger
+      return time.getTime() < new Date(startTiem).getTime()
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

src/views/system/device/index.vue

@@ -125,11 +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 devices" :key="item.id" :label="item.dictLabel" :value="item.id"></el-option>
+           
+                <el-option v-for="item in roleList" :key="item.id" :label="item.dictLabel" :value="item.id"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> 
           </el-col>
           <el-col :span="10">
             <el-form-item label="设备名称" prop="deviceName">
@@ -219,10 +220,10 @@ export default {
         ],
         hostId: [{ required: true, message: '请选择主机', trigger: 'blur' }],
         channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],
-        deviceType: [
-          { required: true, message: '请选择设备分类', trigger: 'blur' },
+        // deviceType: [
+        //   { required: true, message: '请选择设备分类', trigger: 'change' },
 
-        ],
+        // ],
         checkTime: [
           { required: true, message: '请选择有效期', trigger: 'blur' },
         ]