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

src/views/AlarmPage/AlarmStatusPage.vue

@@ -566,8 +566,8 @@ const getCnNames = () => {
   data.then(function (val) {
     cnNames_before.value = val.data.before
     cnNames_after.value = val.data.after
-    console.log("cnNames_before@@@@", cnNames_before);
-    console.log("cnNames_after@@@@", cnNames_after);
+    // console.log("cnNames_before@@@@", cnNames_before);
+    // console.log("cnNames_after@@@@", cnNames_after);
     // console.log("cnNames_before.transParaBaseId:", cnNames_before.transParaBaseId)
   });
 }
@@ -591,16 +591,16 @@ const selectBeforeParams = (row) => {
     newType.value = 3
     param.value.baseId = "transParaBaseId"
   }
-  console.log("+++++++++++++++++", param.value.baseId);
+  // console.log("+++++++++++++++++", param.value.baseId);
   param.value.baseId = row[param.value.baseId]
   newRow.value = param.value.baseId
   if (param.value.baseId) {
     const data = http.post("api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
-    console.log("查看baseId --- dataaaaa:", data);
+    // console.log("查看baseId --- dataaaaa:", data);
     data.then(function (val) {
-      console.log("valllll:", val);
+      // console.log("valllll:", val);
       params.value = val.data
-      console.log("!!!!!Params.value:", params.value);
+      // console.log("!!!!!Params.value:", params.value);
       param.value.cnName = row.cnName
     });
   } else {
@@ -631,10 +631,11 @@ const selectAfterParams = (row) => {
     const data = http.post("/api/alarm/para/GetAlarmParaInfo", { type: newType.value, id: dept.value, baseid: param.value.baseId }, false)
     console.log("查看baseId --- dataaaaa:", data);
     data.then(function (val) {
-      console.log("valllll:", val);
+      // console.log("valllll:", val);
+      // 数据回显
       addParams.value = { ...val.data }
-      console.log("addParams.value/////////", addParams.value);
-      console.log("!!!!!Params.value:", params.value);
+      // console.log("addParams.value/////////", addParams.value);
+      // console.log("!!!!!Params.value:", params.value);
       param.value.cnName = row.cnName
       if (type.value === 1) {
         delId.value = val.data.pipeAlarmParaId
@@ -651,7 +652,7 @@ const selectAfterParams = (row) => {
 
 // 总管
 const onAdd = () => {
-  console.log("!!!!!!!", addParams.value);
+  // console.log("!!!!!!!", addParams.value);
   addParams.value.updateNullFields = ""
   if (newType.value === 1) {
     addParams.value.pipeId = dept.value
@@ -663,7 +664,7 @@ const onAdd = () => {
     }
     http.post("api/alarm/para/pipesave", { ...addParams.value }, false).then((res) => {
       if (res.success) {
-        ElMessage.success("总管新增成功！！")
+        ElMessage.success(res.message)
         delete addParams.value.pipeId
         delete addParams.value.pipeParaBaseId
         delete addParams.value.gatherType
@@ -672,7 +673,7 @@ const onAdd = () => {
         param.value.cnName = ""
         getCnNames()
       } else {
-        ElMessage.error("总管修改失败！！")
+        ElMessage.error("操作失败")
       }
     })
   } else if (newType.value === 2) {
@@ -680,14 +681,14 @@ const onAdd = () => {
     addParams.value.boilerId = dept.value
     http.post("api/alarm/para/boilersave", { ...addParams.value }, false).then((res) => {
       if (res.success) {
-        ElMessage.success("锅炉修改成功！！")
+        ElMessage.success(res.message)
         delete addParams.value.boilerParaBaseId
         delete addParams.value.boilerId
         reset()
         param.value.cnName = ""
         getCnNames()
       } else {
-        ElMessage.error("锅炉修改失败！！")
+        ElMessage.error("操作失败")
       }
     })
 
@@ -696,14 +697,14 @@ const onAdd = () => {
     addParams.value.unitId = dept.value
     http.post("api/alarm/para/transsave", { ...addParams.value }, false).then((res) => {
       if (res.success) {
-        ElMessage.success("换热机修改成功！！")
+        ElMessage.success(res.message)
         delete addParams.value.transParaBaseId
         delete addParams.value.unitId
         reset()
         param.value.cnName = ""
         getCnNames()
       } else {
-        ElMessage.error("换热机修改失败！！")
+        ElMessage.error("操作失败")
       }
     })
   }
@@ -720,7 +721,7 @@ const onDel = () => {
     if (type.value === 1) {
       http.post("api/alarm/para/pipedelete", { id: delId.value }, false).then((res) => {
         if (res.success) {
-          ElMessage.success("总管参数删除成功！！")
+          ElMessage.success(res.message)
           reset()
         } else {
           ElMessage.error("删除失败！！")
@@ -729,19 +730,19 @@ const onDel = () => {
     } else if (type.value === 2) {
       http.post("api/alarm/para/boilerdelete", { id: delId.value }, false).then((res) => {
         if (res.success) {
-          ElMessage.success("锅炉参数删除成功！！")
+          ElMessage.success(res.message)
           reset()
         } else {
-          ElMessage.error("删除失败！！")
+          ElMessage.error("删除失败")
         }
       })
     } else {
       http.post("api/alarm/para/transdelete", { id: delId.value }, false).then((res) => {
         if (res.success) {
-          ElMessage.success("换热站参数删除成功！！")
+          ElMessage.success(res.message)
           reset()
         } else {
-          ElMessage.error("删除失败！！")
+          ElMessage.error("删除失败")
         }
       })
     }
@@ -790,7 +791,6 @@ onUnmounted(() => {
   padding: 4px;
   margin-left: 20px;
   height: 30px;
-  //background-color: #8939cf;
   vertical-align: middle;
 }
 

src/views/SchedulingPage/ConfigBoilerPage.vue

@@ -2,7 +2,7 @@
   <div class="contentBlock">
     <div class="contentBlockInn">
       <el-card class="card-contianer">
-        <table cellpadding="0" cellspacing="1" style="background-color: #99bbe8">
+        <table v-loading="loading" cellpadding="0" cellspacing="1" style="background-color: #99bbe8">
           <tr>
             <th style="width: 25%">电调阈开启度</th>
             <td style="width: 60%; margin: 0; padding: 0">
@@ -24,15 +24,6 @@
           <tr>
             <th style="width: 25%">换热站</th>
             <td style="text-align: left">
-              <!-- <el-checkbox-group v-model="formDatas.transferIds" style="width: 60%;">
-                <el-checkbox v-for="(option, index) in options" :key="index" :label="option" :value="options.value">
-                  {{ option.label }}
-                </el-checkbox>
-              </el-checkbox-group> -->
-              <!-- <el-checkbox-group v-model="checkList" style="width: 60%;">
-                <el-checkbox v-for="(option, index) in options" :key="index" :label="option" :value="option.value">
-                  {{ option.label }}
-                </el-checkbox> -->
               <el-checkbox-group v-model="formDatas.transferIds" style="width: 60%">
                 <el-checkbox v-for="(option, index) in options" :label="option.value" :key="index">
                   {{ option.label }}
@@ -169,7 +160,7 @@ import { ElMessage } from "element-plus";
 const options = reactive([]);
 import store from "../../store/index";
 import { vFloatNumber } from "@/utils/directives.js";
-import { ElLoading } from "element-plus";
+const loading = ref(false)
 const form = ref({
   types: [],
 });
@@ -189,32 +180,25 @@ const formDatas = ref([
   },
 ]);
 const getListData = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: "获取数据中",
-    background: "rgba(0, 0, 0, 0.7)",
-  });
-
+  loading.value = true
   http.get("/api/configboiler/getData").then((result) => {
-    formDatas.value = result.data;
-    formDatas.value.transferIds = formDatas.value.transferIds.split(",");
-    formDatas.value.updateNullFields = "";
-    loading.close();
+    if (result.success) {
+      formDatas.value = result.data;
+      ElMessage.success(result.message)
+      formDatas.value.transferIds = formDatas.value.transferIds.split(",");
+      formDatas.value.updateNullFields = "";
+      loading.value = false
+    }
+  }).catch(err => {
+    console.log(err);
   });
 };
 const onSave = async () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: "保存数据中",
-    background: "rgba(0, 0, 0, 0.7)",
-  });
-
   formDatas.value.transferIds = formDatas.value.transferIds.join(",");
   const result = await postConfigBoilerUpdate({ ...formDatas.value });
   if (result.success) {
+    ElMessage.success(result.message)
     getListData();
-    loading.close();
-    ElMessage.success("修改成功");
   }
 };
 

src/views/SchedulingPage/EnergyManagePage.vue

@@ -7,6 +7,7 @@ import {
   postEnergyManage,
   postEnergyDel,
   postEnergyUpdate,
+  getOrganizationStructureInterface
 } from "@/api/scheduling";
 import http from "../../api/http";
 import loading from "element-plus";
@@ -14,6 +15,7 @@ import store from "../../store";
 import { vFloatNumber } from "@/utils/directives.js";
 const { proxy } = getCurrentInstance();
 const tableData = ref([{}]);
+// 获取渲染
 const formEnergy = ref({
   "updateNullFields": "",
   "supplyId": "",
@@ -22,19 +24,32 @@ const formEnergy = ref({
   "recordDate": "",
   "energyName": ''
 })
+// 获取 energyId 
+const reset = () => {
+  formEnergy.value = {
+    "updateNullFields": "",
+    "supplyId": "",
+    "energyType": "",
+    "record": "",
+    "recordDate": "",
+    "energyName": ''
+  }
+}
+
 const energyForm = ref()
 const dialogVisible = ref(false)
-const getEnergyData = async () => {
-  await http
-    .post("/api/energy/getData", config.supplyType)
-    .then((res) => {
-      // console.log("res:", res);
+const getEnergyData = () => {
+  http.post("/api/energy/getData", config.supplyType).then((res) => {
+    if (res.success) {
       tableData.value = res.data;
-    })
+      ElMessage.success(res.message);
+    } else {
+      ElMessage.error("系统繁忙, 请稍后再试")
+    }
+  })
     .catch((err) => {
       console.log(error);
     });
-  ElMessage.success("获取数据成功");
 };
 
 const tableLabel = reactive([
@@ -97,89 +112,91 @@ const rules = reactive({
   energyType: [
     { required: true, message: "能源类型是必填项", trigger: "blur" },
   ],
-  record: [{ required: true, message: "能源用度是必选项", trigger: "change" }],
+  record: [{ required: true, message: "能源用度是必选项", trigger: "blur" }],
   recordDate: [{ required: true, message: "日期是必选项" }],
 });
 
 // 删除
-const handleDelete = async (row) => {
+const handleDelete = (row) => {
   console.log(row.energyId);
-  console.log('"' + row.energyId + '"');
   let EnergyId = row.energyId;
-  await ElMessageBox.confirm("你确定要删除吗？", {
+  ElMessageBox.confirm("你确定要删除吗？", {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
     confirmButtonClass: 'ExitConfirmButton'
   })
-  const res = await http.post("api/energy/Delete", { id: row.energyId }, false)
-  if (res.success) {
-    ElMessage.success("删除成功");
-    getEnergyData();
-  } else {
-    ElMessage.error("删除失败");
-  }
+  http.post("api/energy/Delete", { id: row.energyId }, false).then(res => {
+    if (res.success) {
+      ElMessage.success(res.message)
+      getEnergyData();
+    } else {
+      ElMessage.error("删除失败");
+    }
+  })
+
 };
 
 // 新增
 const action = ref('add')
 const handleClose = () => {
   dialogVisible.value = false
-  proxy.$ref['energyForm'].resetFields()
+  reset()
 }
 const handleCancel = () => {
   dialogVisible.value = false
-  proxy.$ref['energyForm'].resetFields()
 }
 const handleAdd = () => {
   action.value = "add",
     dialogVisible.value = true;
-  proxy.$refs['energyForm'].resetFields()
-  formEnergy.supplyType = '',
-    formEnergy.energyType = ''
+  reset()
 }
 
 const handleEdit = (val) => {
+  // console.log("supplyData===>", supplyData.value);
+  supplyData.value.forEach((item) => {
+    if (item.supplyName === val.supplyName) {
+      val.supplyId = item.supplyId
+    }
+  })
+  console.log("一行的数据val===>", val);
   action.value = "edit";
   dialogVisible.value = true;
-  nextTick(() => {
-    Object.assign(formEnergy.value, { ...val });
-    console.log("val:", val);
-  });
+  // nextTick(() => {
+  //   Object.assign(formEnergy.value, { ...val });
+  //   console.log("val:", val);
+  // });
+  formEnergy.value = { ...val }
 };
 
-const onSubmit = (formEl) => {
-  energyForm.value.validate(async (valid) => {
+const onSubmit = () => {
+  loading.value = true
+  energyForm.value.validate((valid) => {
     if (valid) {
       let res = null;
       formEnergy.recordDate = /^\d{4}-\d{2}-\d{2}$/.test(formEnergy.recordDate)
         ? formEnergy.recordDate
         : timeFormat(formEnergy.recordDate);
       if (action.value === "add") {
-        await http
-          .post("api/energy/Save", { ...formEnergy.value }, false)
-          .then((res) => { })
-          .then((res) => {
-            ElMessage({
-              type: "success",
-              message: "新增成功",
-            });
+        http.post("api/energy/Save", { ...formEnergy.value }, false).then(res => {
+          if (res.success) {
+            dialogVisible.value = false
+            // ElMessage.success(res.message)
             getEnergyData();
-          });
-        if (res) {
-          dialogVisible.value = false;
-          getEnergyData();
-          if (!formEl) return;
-          formEl.resetFields();
-        }
+            loading.value = false
+          }
+        })
       } else {
-        res = postEnergyUpdate(formEnergy.value);
-        if (!formEl) return;
-        formEl.resetFields();
-        dialogVisible.value = false;
-        formEnergy.value.supplyId = "";
-        formEnergy.energyType = "";
-        getEnergyData();
+        delete formEnergy.value.supplyName;
+        formEnergy.value.updateNullFields = "";
+        http.post("api/energy/Save", { ...formEnergy.value }, false).then((res => {
+          if (res.success) {
+            dialogVisible.value = false
+            // ElMessage.success(res.message)
+            getEnergyData();
+            loading.value = false
+          }
+        }))
       }
     } else {
       ElMessage({
@@ -192,7 +209,6 @@ const onSubmit = (formEl) => {
 };
 const props = { multiple: false, emitPath: false, checkStrictly: true };
 const enterpriseId = ref();
-let supplyIdOptions = reactive([]);
 getEnterprise();
 function getEnterprise() {
   var result = store.getters.getEnterprise();
@@ -208,49 +224,32 @@ const PatrolInfo = reactive({
   count: 30,
   sort: "",
 });
-const options = reactive([]);
-const getSupplys = () => {
-  loading.value = true;
-  options.length = 0;
-  PatrolInfo.Id.length = 0;
-  var result = store.getters.getEnterprise();
-  if (result) {
-    result.forEach((element) => {
-      if (element.enterpriseId === enterpriseId.value) {
-        if (
-          element.enterpriseId ===
-          "9BCA54BC-8F27-4849-8D7D-50C5099E1949".toLowerCase()
-        ) {
-          element.serviceCenterList.forEach((center) => {
-            let c = [];
-            center.supplyList.forEach((supply) => {
-              let chi = [];
-              supply.transferList.forEach(unit => {
-              });
-              c.push({
-                children: chi,
-                label: supply.supplyName,
-                value: supply.supplyId,
-              });
-            });
-            options.push({ children: c, label: center.serviceCenterName });
-          });
-        } else {
-          element.supplyList.forEach((element) => {
-            let chi = [];
-            element.transferList.forEach((unit) => {
-              chi.push({ value: unit.unitId, label: unit.unitName });
-            });
-            options.push({ children: chi, label: element.supplyName });
-          });
-        }
-      }
-    });
-  }
+
+const organizationStructure = ref([]) // 组织结构数据
+const supplyData = ref([]) // 供热站数据
+function getSupply() {
+  organizationStructure.value[0].serviceCenterList.forEach(fir_item => {
+    fir_item.supplyList.forEach(sec_item => {
+      supplyData.value.push({
+        supplyId: sec_item.supplyId,
+        supplyName: sec_item.supplyName
+      })
+    })
+  })
+}
+// 根据组织结构获取供热站数据
+function getOrganizationStructure() {
+  getOrganizationStructureInterface().then(res => {
+    organizationStructure.value = res.data
+    getSupply()
+    // getAllTransfer()
+  }).catch(err => {
+    ElMessage.error('接口异常，获取数据失败.')
+  })
 }
 onMounted(() => {
+  getOrganizationStructure()
   getEnergyData()
-  getSupplys()
 })
 </script>
 
@@ -318,13 +317,12 @@ onMounted(() => {
             <table cellpadding="0" cellspacing="0">
               <tr>
                 <td style="text-align: left">
-                  <!-- <el-select v-model="formEnergy.supplyId" placeholder="请选择">
-                    <el-option label="东部供热站" value="DFA20074-8731-457F-B63F-4E1858CFE266" />
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-                  </el-select> -->
                   <el-form-item prop="supplyName" style="margin: 0; padding: 0; width: 100%">
-                    <el-cascader :options="options" v-model="formEnergy.supplyId" :props="props" collapse-tags clearable
-                      :show-all-levels="false" placeholder="请选择" class="el-cascader-menu" />
+                    <el-select v-model="formEnergy.supplyId" placeholder="" style="width: 210px;" class="custom-select"
+                      size="small">
+                      <el-option v-for="item in supplyData" :key="item.supplyId" :label="item.supplyName"
+                        :value="item.supplyId" />
+                    </el-select>
                   </el-form-item>
                 </td>
               </tr>
@@ -383,7 +381,7 @@ onMounted(() => {
       </table>
       <div class="dialog-footer">
         <el-button type="primary" @click="handleCancel(energyForm)">关闭</el-button>
-        <el-button type="primary" @click="onSubmit(energyForm)">保存</el-button>
+        <el-button type="primary" @click="onSubmit()">保存</el-button>
       </div>
     </el-form>
   </el-dialog>

src/views/SchedulingPage/InstantHeatPage.vue

@@ -5,9 +5,7 @@
         <div class="card-header">
           <span>瞬时热量对比配置</span>
         </div>
-
-
-        <table cellpadding="0" cellspacing="1">
+        <table v-loading="loading" cellpadding="0" cellspacing="1">
           <tr>
             <th style="width: 25%">计划名称：</th>
             <td style="width: 60%; margin:0; padding: 0">
@@ -96,7 +94,7 @@ import { vFloatNumber } from "@/utils/directives.js";
 const loading = ref(false)
 
 
-const List = ref([
+const List = ref(
   {
     "planId": "",
     "planName": "",
@@ -106,25 +104,28 @@ const List = ref([
     "description": "",
     "isActive": ''
   }
-])
+)
 
 
-const getInstanceHeat = async () => {
+const getInstanceHeat = () => {
   loading.value = true
-  const data = await postInstantHeat();
-  console.log(data);
-  List.value = data.data[0]
-  loading.value = false
+  http.post("api/Scheduling/BizInstantaneousHeat/Get", false).then(res => {
+    if (res.success) {
+      List.value = res.data[0]
+      console.log("res.data===>", res.data);
+      loading.value = false
+    }
+  })
 }
-const onSave = async () => {
-  // await postInstantHeatUpdate(List.value)
-
-  await http.post("/api/Scheduling/BizInstantaneousHeat/Update", { ...List.value }, false).then((result) => {
+const onSave = () => {
+  http.post("/api/Scheduling/BizInstantaneousHeat/Update", { ...List.value }, false).then((res) => {
+    if (res.success) {
+      ElMessage.success(res.message)
+      getInstanceHeat()
+    }
   }).catch((error) => {
     console.log(error)
   })
-  ElMessage.success('修改成功')
-  getInstanceHeat()
 }
 onMounted(() => {
   getInstanceHeat()