bug修复

src/views/siteManage/basicInfo/index.vue

@@ -31,6 +31,7 @@
                 style="width: 100%"
                 type="date"
                 placeholder="选择日期时间"
+                 @change="comPareTime(1)"
               ></el-date-picker>
             </el-form-item>
             <el-form-item label="服务截止：" prop="serviceDeadline">
@@ -38,6 +39,7 @@
                 v-model="ruleForm.serviceDeadline"
                 type="date"
                 placeholder="选择日期时间"
+                @change="comPareTime(2)"
               ></el-date-picker>
             </el-form-item>
 
@@ -365,6 +367,24 @@ export default defineComponent({
     function resetForm() {
       formInfo.value.clearValidate()
     }
+    function comPareTime(type){
+      console.log(type)
+      var start=ruleForm.value.operationTime;
+      var end=ruleForm.value.serviceDeadline;
+      console.log(new Date(start).getTime())
+        console.log(new Date(end).getTime())
+      if(new Date(start).getTime()>new Date(end).getTime()){
+       
+        if(type==1){
+            ElMessage.warning('运投时间不能大于服务截止，请重新选择！')
+          ruleForm.value.operationTime=''
+        }else{
+           ElMessage.warning('服务截止不能小于运投时间，请重新选择！')
+          ruleForm.value.serviceDeadline=''
+        }
+       
+      }
+    }
 
     // 动态属性下拉请求
     function dynamicPropertiesDroplist(dataArea) {
@@ -643,6 +663,7 @@ export default defineComponent({
       fileListImages,
 
       overLength,
+      comPareTime,
 
       accessToken,
       ruleForm,

src/views/siteManage/camera/dialogComponent.vue

@@ -20,24 +20,31 @@
         <el-input v-model="form.deviceCode"></el-input>
       </el-form-item>
       <el-form-item label="楼层:" prop="floor">
-        <el-input-number
-          v-model="form.floor"
-          controls-position="right"
-          :min="-20"
-          :max="100"
-        ></el-input-number>
-      </el-form-item>
 
+
+       <el-select
+          v-model="form.floor"
+          placeholder="请选择所属楼层"
+        >
+          <el-option value="" >请选择所属楼层</el-option>
+          <el-option
+            v-for="item in [20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1]"
+            :key="item"
+            :label="'楼层B'+item"
+            :value="'-'+item"
+          ></el-option>
+          <el-option
+            v-for="item in 100"
+            :key="item"
+            :label="'楼层'+item"
+            :value="''+item"
+          ></el-option>
+        </el-select>
+       </el-form-item> 
       <el-form-item label="所属站点：" prop="siteId">
         <el-select
           v-model="form.siteId"
-          :disabled="
-            deviceNumDataContent != '' &&
-            form.siteId != null &&
-            form.siteId != ''
-              ? true
-              : false
-          "
+         :disabled="dialogTitle === '编辑'"
           placeholder="请选择所属站点"
         >
           <el-option
@@ -56,20 +63,7 @@
         <el-select
           v-model="form.deviceType"
           placeholder="请选择设备类型"
-          disabled
-          v-if="dialogTitle == '编辑'"
-        >
-          <el-option
-            v-for="item in deviceType"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-        <el-select
-          v-model="form.deviceType"
-          placeholder="请选择设备类型"
-          v-else
+         :disabled="dialogTitle === '编辑'"
         >
           <el-option
             v-for="item in deviceType"
@@ -78,6 +72,7 @@
             :value="item.value"
           ></el-option>
         </el-select>
+       
       </el-form-item>
       <el-form-item label="sim卡" prop="sim">
         <el-input v-model="form.sim"></el-input>
@@ -122,6 +117,9 @@ export default defineComponent({
     const open = () => {
       store.commit('publicSiteList')
       form.value = props.itemInfo.value
+        console.log('form.value.floor')
+
+      console.log(form.value.floor)
 
     }
 

src/views/siteManage/camera/index.vue

@@ -271,7 +271,7 @@ export default defineComponent({
       tableItem.value = {
         deviceName: '',
         deviceCode: '',
-        floor: 1,
+        floor: '',
         siteId: '',
         deviceAddress: '',
         deviceType: '',