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

src/views/SchedulingPage/AnnualParamPage.vue

 <script setup>
 import {computed, onMounted, reactive, ref} from "vue";
 import {zhCn} from "element-plus/es/locale/index";
-import {getAnnualParam,alterAnnualParam,addAnnualParam,deleteAnnualParam} from '@/api/scheduling.js'
+import {getAnnualParam, alterAnnualParam, addAnnualParam, deleteAnnualParam} from '@/api/scheduling.js'
 import {ElMessageBox} from "element-plus";
 
 const data = ref()
+const dataBackup = ref([])
 const tableHeaderClass = data => {  // 表头样式
   return 'table-header-class'
 }
@@ -16,23 +17,23 @@ const reviseWindowOpen = ref(false)
 const addWindowOpen = ref(false)
 const reviseForm = ref({})
 const addForm = ref({
-  supplyId:"00000000-0000-0000-0000-000000000000",
-  energyType:'',
-  year:'',
-  standard:'',
-  degreeStandard:'',
-  indoorTemperature:'',
-  outdoorTemperature:'',
-  backWaterTemperature:''
+  supplyId: "00000000-0000-0000-0000-000000000000",
+  energyType: '',
+  year: '',
+  standard: '',
+  degreeStandard: '',
+  indoorTemperature: '',
+  outdoorTemperature: '',
+  backWaterTemperature: ''
 })
-const energyTypeList = ref(['一步节能','二步节能','三步节能','四步节能','非节能']) // 节能等级列表
+const energyTypeList = ref(['一步节能', '二步节能', '三步节能', '四步节能', '非节能']) // 节能等级列表
 const currentMonth = ref(0)
 const currentYear = ref(0)
-const selectYearValue = computed(()=>{
-  if (currentMonth.value >= 7){
-    return currentYear.value + "年-" + (currentYear.value+1) + "年"
-  }else {
-    return (currentYear.value-1) + "年-" + currentYear.value + "年"
+const selectYearValue = computed(() => {
+  if (currentMonth.value >= 7) {
+    return currentYear.value + "年-" + (currentYear.value + 1) + "年"
+  } else {
+    return (currentYear.value - 1) + "年-" + currentYear.value + "年"
   }
 })
 
@@ -47,15 +48,18 @@ function handleDelete(val) {
       '点击确定后，该条数据将删除，是否继续？',
       'Warning',
       {
-        confirmButtonText:'确定',
-        cancelButtonText:'取消',
-        type:'warning'
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }
-  ).then(()=>{
-    deleteAnnualParam(val.paramId).then(res=>{
-      if(res.success){getData()}
+  ).then(() => {
+    deleteAnnualParam(val.paramId).then(res => {
+      if (res.success) {
+        getData()
+      }
+    })
+  }).catch(err => {
   })
-  }).catch(err=>{})
 } // 处理删除
 function handleAdd() {
   currentYear.value = new Date().getFullYear()
@@ -63,23 +67,28 @@ function handleAdd() {
   addWindowOpen.value = true
 } // 处理新增
 function handleSearch() {
+  if (!searchKey.value) {
+    getData()
+  } else {
+    data.value = dataBackup.value.filter(item => item.year.includes(searchKey.value))
+  }
 } // 处理查询
 function onSubmit() {
-  alterAnnualParam(reviseForm.value).then(res =>{
-    if(res.success){
+  alterAnnualParam(reviseForm.value).then(res => {
+    if (res.success) {
       getData()
       handleClose()
     }
   })
 } // 提交修改
-function onAddSubmit(){ // 提交新增
-  data.value.forEach((item,index,array) =>{
-    if(item.energyType === addForm.energyType && item.year === addForm.year){
+function onAddSubmit() { // 提交新增
+  data.value.forEach((item, index, array) => {
+    if (item.energyType === addForm.energyType && item.year === addForm.year) {
       alert("该类型年度已存在")
       return
     }
   })
-  addAnnualParam(addForm.value).then(res=>{
+  addAnnualParam(addForm.value).then(res => {
     getData()
     handleClose()
   })
@@ -89,24 +98,26 @@ function handleClose() {
   addWindowOpen.value = false
   resetInput()
 } // 关闭弹窗
-onMounted(()=>{
+onMounted(() => {
   getData()
 })
 
-function getData(){
-  getAnnualParam().then(res =>{
+function getData() {
+  getAnnualParam().then(res => {
     data.value = res.data
+    dataBackup.value = [...data.value]
   })
 }
-function resetInput(){
+
+function resetInput() {
   addForm.value = {
-    energyType:'',
-    year:'',
-    standard:'',
-    degreeStandard:'',
-    indoorTemperature:'',
-    outdoorTemperature:'',
-    backWaterTemperature:''
+    energyType: '',
+    year: '',
+    standard: '',
+    degreeStandard: '',
+    indoorTemperature: '',
+    outdoorTemperature: '',
+    backWaterTemperature: ''
   }
 }
 </script>
@@ -117,7 +128,7 @@ function resetInput(){
       <el-row>
         <el-col :span="8" label>年度：</el-col>
         <el-col :span="16">
-          <el-input v-model="searchKey"/>
+          <el-input clearable v-model="searchKey"/>
         </el-col>
       </el-row>
       <el-button type="primary" class="add-search-btn" @click="handleAdd">新增</el-button>
@@ -346,10 +357,12 @@ function resetInput(){
   justify-content: space-between;
   align-items: center;
 }
-.el-row[first]{
+
+.el-row[first] {
   border-top: 1px solid #a6c3e9;
 }
-.el-row{
+
+.el-row {
   border-left: 1px solid #a6c3e9;
   border-right: 1px solid #a6c3e9;
   border-bottom: 1px solid #a6c3e9;
@@ -357,7 +370,8 @@ function resetInput(){
   height: 35px;
   color: #124362;
 }
-.el-col[col-label]{
+
+.el-col[col-label] {
   display: flex;
   justify-content: end;
   align-items: center;
@@ -365,13 +379,15 @@ function resetInput(){
   background-color: #f2f6f8;
   padding-right: 5px;
 }
-.el-col[col-value]{
+
+.el-col[col-value] {
   display: flex;
   justify-content: start;
   align-items: center;
   padding-left: 5px;
 }
-.el-input{
+
+.el-input {
   color: black;
   height: 24px;
 }

src/views/SchedulingPage/PhenomenonPage.vue

@@ -4,6 +4,7 @@ import {ElMessageBox} from "element-plus";
 import {getPhenomenon,addPhenomenon,alterPhenomenon,deletePhenomenon} from "@/api/scheduling.js"
 
 const data = ref()
+const dataBackup = ref([])
 const searchKey = ref('') // 查询参数
 const reviseWindowOpen = ref(false)
 const addWindowOpen = ref(false)
@@ -39,6 +40,13 @@ function omit(val){
     })
   }).catch(err=>{})
 } // 删除按钮单击事件
+function search(){
+  if(!searchKey.value){
+    getData()
+  }else {
+    data.value = dataBackup.value.filter(item => item.phenomenonName.includes(searchKey.value) )
+  }
+}
 function handleClose(){
   reviseWindowOpen.value = false
   addWindowOpen.value = false
@@ -72,6 +80,7 @@ onMounted(()=>{
 function getData(){
   getPhenomenon().then(res => {
     data.value = res.data
+    dataBackup.value = [...data.value]
   })
 }
 </script>
@@ -81,10 +90,10 @@ function getData(){
     <el-row>
       <el-col :span="8" label>名称：</el-col>
       <el-col :span="16">
-        <el-input v-model="searchKey"/>
+        <el-input clearable v-model="searchKey"/>
       </el-col>
     </el-row>
-    <el-button type="primary" class="add-search-btn">查询</el-button>
+    <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
     <el-button type="primary" @click="add" class="add-search-btn">新增</el-button>
   </div>
   <div class="table-wrapper">