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

src/views/SchedulingPage/EnergyManagePage.vue

@@ -7,6 +7,7 @@ import { postEnergyManage, postEnergyDel, postEnergyUpdate } from "@/api/schedul
 import http from '../../api/http'
 import loading from 'element-plus'
 import store from '../../store'
+import { vFloatNumber } from "@/utils/directives.js";
 const { proxy } = getCurrentInstance()
 const tableData = ref([{}])
 const formEnergy = ref({
@@ -15,7 +16,7 @@ const formEnergy = ref({
   "energyType": "",
   "record": "",
   "recordDate": "",
-  "energyName":''
+  "energyName": ''
 })
 const energyForm = ref()
 const dialogVisible = ref(false)
@@ -138,11 +139,11 @@ const handleDelete = async (row) => {
     type: 'warning',
     confirmButtonClass: 'ExitConfirmButton'
   })
- const res =  await http.get("api/energy/Delete",{params:{EnergyId:row.energyId}}, false)
-  if(res.success) {
+  const res = await http.get("api/energy/Delete", { params: { EnergyId: row.energyId } }, false)
+  if (res.success) {
     ElMessage.success("删除成功")
     getEnergyData()
-  }else {
+  } else {
     ElMessage.error("删除失败")
   }
 }
@@ -174,7 +175,7 @@ const handleEdit = (val) => {
   dialogVisible.value = true
   nextTick(() => {
     Object.assign(formEnergy.value, { ...val })
-    console.log("val:",val);
+    console.log("val:", val);
     // var newArr = []
     // formEnergy.supplyId.map((item)=> {
     //   newArr.push(item[item.length-1])
@@ -220,7 +221,7 @@ const onSubmit = () => {
     }
   })
 }
-const props = { multiple: false, emitPath: false,checkStrictly: true  }
+const props = { multiple: false, emitPath: false, checkStrictly: true }
 const enterpriseId = ref();
 let supplyIdOptions = reactive([])
 getEnterprise();
@@ -400,7 +401,7 @@ onMounted(() => {
               <tr>
                 <td style="text-align: left;">
                   <el-form-item prop="record" style="margin: 0;padding: 0;width: 100%;">
-                    <el-input v-model="formEnergy.record" placeholder="请输入能源用度" />
+                    <el-input v-float-number v-model="formEnergy.record" placeholder="请输入能源用度" />
                   </el-form-item>
                 </td>
               </tr>

src/views/SchedulingPage/InstantHeatPage.vue

@@ -26,7 +26,7 @@
               <table cellpadding="0" cellspacing="0">
                 <tr>
                   <td style="text-align: left">
-                    <el-input style="width: 80%" v-model="List.diffPercentage"></el-input>
+                    <el-input v-float-number style="width: 80%" v-model="List.diffPercentage"></el-input>
                   </td>
                 </tr>
               </table>
@@ -54,7 +54,7 @@
               <table cellpadding="0" cellspacing="0">
                 <tr>
                   <td style="text-align: left">
-                    <el-input style="width: 80%" v-model="List.tempRegulation"></el-input>
+                    <el-input v-float-number style="width: 80%" v-model="List.tempRegulation"></el-input>
                   </td>
                 </tr>
               </table>
@@ -93,6 +93,7 @@ import { postInstantHeat, postInstantHeatUpdate } from "@/api/scheduling"
 import { toRaw } from "@vue/reactivity";
 import { ElMessage } from "element-plus";
 import http from "../../api/http";
+import { vFloatNumber } from "@/utils/directives.js";
 const loading = ref(false)