Merge branch 'master' of ssh://gitlab.91isoft.com:10022/hikvision/web-project

src/views/SchedulingPage/AnnualParamPage.vue

@@ -24,7 +24,7 @@ const reviseWindowOpen = ref(false)
 const addWindowOpen = ref(false)
 const reviseForm = ref({})
 const addForm = ref({
-  supplyId: "00000000-0000-0000-0000-000000000000",
+  supplyId: "",
   energyType: '',
   year: '',
   standard: '',
@@ -96,7 +96,12 @@ function handleSearch() {
   if (!searchKey.value) {
     getData()
   } else {
-    data.value = dataBackup.value.filter(item => item.year.includes(searchKey.value))
+    data.value = dataBackup.value.filter(item => {
+      if(typeof item.year === 'object'){
+        item.year = ''
+      }
+      return item.year.includes(searchKey.value)
+    })
   }
 } // 处理查询
 function onReviseSubmit() {
@@ -174,6 +179,17 @@ onBeforeMount(() => {
 function getData() {
   getAnnualParam().then(res => {
     data.value = res.data
+    for (let item of data.value){
+      let flag = true
+      for(let supply of supplyData.value){
+        if(item.supplyId === supply.supplyId){
+          flag = false
+        }
+      }
+      if(flag){
+        item.supplyId = ''
+      }
+    }
     dataBackup.value = [...data.value]
   })
 }

src/views/SchedulingPage/PhenomenonPage.vue

@@ -18,7 +18,7 @@ const formRef = ref()
 //校验规则
 const rules = reactive({
   phenomenonTemp: [
-    { pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确的对应温度", trigger: "blur" }
+    { pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确的对应温度", trigger: "change" }
   ]
 });
 const tableHeaderClass = data => {  // 表头样式
@@ -204,7 +204,7 @@ function customSort(a, b) {
       <el-dialog title="天气工况设置修改" v-model="reviseWindowOpen" width="700px" :before-close="handleClose">
         <template #default>
           <el-form ref="formRef" :rules="rules" :model="reviseForm" label-width="auto">
-            <el-row>
+            <el-row first>
               <el-col :span="8" col-label class="energy-type-class">名称：</el-col>
               <el-col :span="16" col-value>
                 <el-select placeholder="" size="small" v-model="reviseForm.phenomenonName" style="width: 370px">
@@ -247,7 +247,7 @@ function customSort(a, b) {
           </el-col>
         </el-row> -->
           <el-form ref="formRef" :model="addForm" :rules="rules" label-width="auto">
-            <el-row>
+            <el-row first>
               <el-col :span="8" col-label class="energy-type-class">名称: </el-col>
               <el-col :span="16" col-value>
                 <el-select placeholder="" size="small" v-model="addForm.phenomenonName" style="width: 370px">
@@ -352,7 +352,6 @@ function customSort(a, b) {
   height: 35px;
   color: #124362;
 }
-
 .el-col[col-label] {
   display: flex;
   justify-content: end;

src/views/SchedulingPage/WindManagePage.vue

@@ -36,7 +36,11 @@ const formRef = ref()
 //校验规则
 const rules = reactive({
   windTemp: [
-    { pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确的对应温度", trigger: "blur" }
+    {
+      pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/,
+      message: "请输入正确的对应温度",
+      trigger: "change"
+    }
   ]
 });
 
@@ -220,14 +224,14 @@ function customSort(a, b) {
               <el-col :span="8" col-label>对应温度：</el-col>
               <el-col :span="16" col-value>
                 <el-form-item prop="windTemp" style="padding: 0; margin: 0;">
-                  <el-input v-model="reviseForm.windTemp" placeholder="" style="width: 370px" />
+                  <el-input maxlength="11" v-model="reviseForm.windTemp" placeholder="" style="width: 370px" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8" col-label>描述：</el-col>
               <el-col :span="16" col-value>
-                <el-input v-model="reviseForm.windDesc" placeholder="" style="width: 370px" />
+                <el-input maxlength="11" v-model="reviseForm.windDesc" placeholder="" style="width: 370px" />
               </el-col>
             </el-row>
           </el-form>
@@ -256,7 +260,7 @@ function customSort(a, b) {
               <el-col :span="8" col-label>对应温度：</el-col>
               <el-col :span="16" col-value>
                 <el-form-item prop="windTemp" style="padding: 0; margin: 0;">
-                  <el-input v-model="addForm.windTemp" placeholder="" style="width: 370px" />
+                  <el-input maxlength="11" v-model="addForm.windTemp" placeholder="" style="width: 370px" />
                 </el-form-item>
               </el-col>
             </el-row>