Prechádzať zdrojové kódy

均压与低氧提交更新

lxh 6 dní pred
rodič
commit
ab0cf0cd0b

+ 4 - 4
.env.development

@@ -6,8 +6,8 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理,您可以配置多个 ,请注意,没有换行符
 #VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-# VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"], ["/python", "http://127.0.0.1:8008"], ["/tun2D", "http://127.0.0.1:8088/micro-vent-2dModal/tun2D"]]
-VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
+VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"], ["/python", "http://127.0.0.1:8008"], ["/tun2D", "http://127.0.0.1:8088/micro-vent-2dModal/tun2D"]]
+# VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
 # VITE_PROXY = [["/jeecgsystem","http://10.10.150.72:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
 #VITE_PROXY = [["/jeecgsystem","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
 
@@ -29,7 +29,7 @@ VITE_GLOB_API_URL_PREFIX=
 
 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 #VITE_APP_SUB_APP = [["micro-need-air", "//10.10.150.72:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
-VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
+# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
-# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"],["micro-vent-2dModal", "//localhost:8088/", "micro-vent-2dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
+VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"],["micro-vent-2dModal", "//localhost:8088/", "micro-vent-2dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]

+ 7 - 0
src/views/vent/monitorManager/balancePressMonitor/balancePress.api.ts

@@ -6,6 +6,7 @@ enum Api {
   baseList = '/safety/ventanalyManageSystem/list',
   deviceList = '/safety/ventanalyManageSystem/linkdevicelist',
   submit = '/monitor/demo/avePress/add',
+  submitEdit = '/monitor/demo/avePress/edit',
   subList= '/monitor/demo/avePress/list'
 }
 /**
@@ -37,3 +38,9 @@ export const submit = (params) => defHttp.post({ url: Api.submit, params });
  * @param params
  */
 export const subList = () => defHttp.get({ url: Api.subList });
+
+/**
+ * 监测参数提交-编辑
+ * @param params
+ */
+export const submitEdit = (params) => defHttp.post({ url: Api.submitEdit, params });

+ 19 - 7
src/views/vent/monitorManager/balancePressMonitor/components/balancePressHome.vue

@@ -138,7 +138,7 @@
   import { SvgIcon } from '/@/components/Icon';
   import { mountedThree, destroy, setModelType, updateText, play } from '../balancePress.threejs';
   import { settingParam1, settingParam2, settingParam3, windowParam, localFanParam, windrectParam } from '../balancePress.data';
-  import { list, submit, subList } from '../balancePress.api';
+  import { list, submit, subList,submitEdit } from '../balancePress.api';
   import { message } from 'ant-design-vue';
   import { get } from 'lodash-es';
 
@@ -172,6 +172,8 @@
     //
   };
 
+  let listData=ref<any[]>([])
+
   // https获取监测数据
   let timer: any = null;
   function getMonitor(flag?) {
@@ -229,12 +231,19 @@
 
   // 喷粉操作
   async function onSubmit() {
-    let res = await submit(formData.value);
-    if (res.code == 500) {
-      message.success(res.message);
-    } else {
-      initParamList();
-      message.success('提交成功');
+    if(listData.value.length!=0){
+      //编辑
+      let res = await submitEdit(listData.value[0]);
+      if(res){
+        initParamList();
+      }
+    }else{
+      //新增
+      let res = await submit(formData.value);
+      if(res){
+        initParamList();
+        message.success('提交成功');
+      }
     }
   }
 
@@ -242,7 +251,9 @@
   async function initParamList() {
     let res = await subList();
     if (res && res.records && res.records.length != 0) {
+      listData.value=res.records
       formData.value = res.records[0];
+      
     }
   }
 
@@ -257,6 +268,7 @@
   );
 
   const formData = ref({
+    id:'',
     coMaxStart: 0,
     o2MinStart: 0,
     coRiseStart: 0,