Browse Source

爆炸三角形修改提交

lxh 3 months ago
parent
commit
6990de5a80

+ 2 - 2
.env.development

@@ -6,7 +6,7 @@ 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://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://192.168.8.8:9999"],["/webRtc", "http://192.168.183.216:8051"]]
+VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://192.168.183.216: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"]]
 
@@ -21,7 +21,7 @@ VITE_GLOB_API_URL=/modelreq
 #后台接口全路径地址(必填)
 # VITE_GLOB_DOMAIN_URL=http://10.10.150.72:9999
 # VITE_GLOB_DOMAIN_URL=http://182.92.126.35:9999
-VITE_GLOB_DOMAIN_URL=http://192.168.8.8:9999
+# VITE_GLOB_DOMAIN_URL=http://192.168.8.8:9999
 
 # 接口前缀
 VITE_GLOB_API_URL_PREFIX=

+ 2 - 1
src/views/vent/monitorManager/deviceMonitor/components/device/modal/blastDelta.vue

@@ -100,7 +100,8 @@ function getAreas() {
 //根据A,B,E,G等点坐标绘制爆炸三角形
 function getBlast() {
   maxY.value = getCoordABY(0);
-  maxX.value = getCoordABX(0);
+  // maxX.value = getCoordABX(0);
+  maxX.value = 50;
   // 获取canvas元素
   let canvas = document.getElementById('myCanvas');
   let ctx = canvas.getContext('2d');

+ 22 - 13
src/views/vent/safetyList/common/detail.vue

@@ -124,7 +124,7 @@
                         <template #bodyCell="{ column, text }"></template>
                     </a-table>
                     <!-- 编辑弹窗 -->
-                    <a-modal v-model:visible="visibleModalEdit1" :width="1100"
+                    <a-modal v-model:visible="visibleModalEdit1" :width="1100" @cancel="cancenModal"
                         :bodyStyle="{ display: 'flex', height: '680px', 'overflow-y': 'auto', 'margin-bottom': '15px' }"
                         title="编辑信息" :footer="null">
 
@@ -172,7 +172,7 @@
                         <a-form :model="formEdit" labelAlign="right" :label-col="{ span: 7 }"
                             :wrapper-col="{ span: 17 }">
                             <a-form-item label="传感器设备:">
-                                <a-select v-model:value="formEdit.cgq" style="width: 260px;margin-right: 10px;">
+                                <a-select v-model:value="formEdit.cgq" @change="changeCgq" style="width: 260px;margin-right: 10px;">
                                     <a-select-option v-for="file in cgqList" :key="file.label" :value="file.value">{{
                                         file.label }}</a-select-option>
                                 </a-select>
@@ -457,17 +457,8 @@ function onChangeTab(tab) {
     }
 }
 
-//获取详细信息列表
-async function getStationList() {
-    let res = await get158StationData()
-    tableData1.value = res
-}
-
-//编辑
-async function handleEdit(record) {
-    cgqList.length = 0
-    visibleModalEdit1.value = true
-    devStationId.value = record.stationId
+//弹窗关闭
+function cancenModal(){
     formEdit = {
         id: '',
         cgq: '',
@@ -495,6 +486,24 @@ async function handleEdit(record) {
         dyl485btl: '',
         sgzjbcmm: '',
     }
+}
+//获取详细信息列表
+async function getStationList() {
+    let res = await get158StationData()
+    tableData1.value = res
+}
+//传感器选项切换
+function changeCgq(val){
+    console.log(val,'val---------')
+    formEdit.cgq=val
+    console.log(formEdit.cgq,'cgq------')
+}
+//编辑
+async function handleEdit(record) {
+    cgqList.length = 0
+    visibleModalEdit1.value = true
+    devStationId.value = record.stationId
+   
     let res = await get158StationDevices({ stationId: devStationId.value })
     console.log(res, '分站下设备下拉选项-------------')
     if (res.length != 0) {