Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

hx-ai-intelligent/src/api/IlluminationInfo.ts

@@ -21,4 +21,11 @@ export enum lightingManage {
 
   // 右侧表格修改数据提交
   submitTableData = prefix + '/illuminationCtrl/refreshPlanStatus',
+
+  // 主页 > 抽屉 > 日志 ===========================================
+
+  // 获取日志
+  getLog = prefix + '/illuminationInfo/pageAbleLog',
+  // 获取日志详情
+  getLogDetail = prefix + '/illuminationInfo/fullLog',
 }

hx-ai-intelligent/src/api/ventilatingSystem.ts

@@ -11,6 +11,8 @@ export enum ventilating {
   sendChangeList1 = prefix + '/ventilatingFanCtrl/changeToSceneMode',
   // 获得排风扇的设备状态
   getDevice1 = prefix + '/ventilatingFanCtrl/getDeviceState',
+  // 提交排风扇的修改内容
+  submitTableData1 = prefix + '/ventilatingFanCtrl/refreshPlanStatus',
 
   // 风幕机相关 =============================================
   // 获得风幕机的树形结构
@@ -21,6 +23,8 @@ export enum ventilating {
   sendChangeList2 = prefix + '/airCurtainMachineCtrl/changeToSceneMode',
   // 获得风幕机的设备状态
   getDevice2 = prefix + '/airCurtainMachineCtrl/getDeviceState',
+  // 提交风幕机的修改内容
+  submitTableData2 = prefix + '/airCurtainMachineCtrl/refreshPlanStatus',
 
   // 电动窗相关 =============================================
   // 获得电动窗的树形结构
@@ -31,4 +35,6 @@ export enum ventilating {
   sendChangeList3 = prefix + '/eleOperatedWindowCtrl/changeToSceneMode',
   // 获得电动窗的设备状态
   getDevice3 = prefix + '/eleOperatedWindowCtrl/getDeviceState',
+  // 提交电动窗的修改内容
+  submitTableData3 = prefix + '/eleOperatedWindowCtrl/refreshPlanStatus',
 }

hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanPlant.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="div-add">
     <button class="add" @click="addModal">添加</button>
-    <a-popconfirm title="是否提交以上修改？" ok-text="确定" cancel-text="取消" @confirm="sendTable">
+    <a-popconfirm
+      title="是否提交以上修改？"
+      placement="bottomLeft"
+      ok-text="确定"
+      cancel-text="取消"
+      @confirm="sendTable">
       <button class="add" style="margin-left: 20px">执行</button>
     </a-popconfirm>
   </div>
@@ -83,7 +88,7 @@
   import { ref, onMounted } from 'vue';
   // 请求
   import { http } from '/nerv-lib/util/http';
-  import { lightingManage } from '/@/api/IlluminationInfo';
+  import { ventilating } from '/@/api/ventilatingSystem';
   import { planManage } from '/@/api/planManage';
   import { message } from 'ant-design-vue';
   // 全局变量
@@ -109,9 +114,18 @@
     getTable();
     // 穿梭框原始数据
     getLeftPlan();
+    let type = props.type;
+    if (type == 3) {
+      url = ventilating.submitTableData1;
+    } else if (type == 4) {
+      url = ventilating.submitTableData2;
+    } else if (type == 5) {
+      url = ventilating.submitTableData3;
+    }
   });
   // 全局变量
   const state = items();
+  let url = '';
 
   // tab页部分 ========================================================
 
@@ -169,7 +183,7 @@
   };
   // 将对表格的修改统一发送
   const sendTable = () => {
-    http.post(lightingManage.submitTableData, dataSource.value).then(() => {
+    http.post(url, dataSource.value).then(() => {
       message.success('操作成功');
       getTable();
       getLeftPlan();