瓦斯巡检地点管理编辑修改提交

.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/"]]

src/views/vent/gas/gasInspect/components/inspectEdit.vue

@@ -6,8 +6,10 @@
                 <a-input v-model:value="formStateEdit.id" disabled />
             </a-form-item>
             <a-form-item label="瓦斯巡检地点：">
-                <a-select ref="select" v-model:value="formStateEdit.strInstallPos" placeholder="请选择..." @change="changeAddress">
-                    <a-select-option v-for="(item, index) in addressList" :key="item.value">{{ item.label
+                <a-select ref="select" v-model:value="formStateEdit.strInstallPos" placeholder="请选择..."
+                    @change="changeAddress">
+                    <a-select-option v-for="(item, index) in addressList" :key="item.value" :value="item.label">{{
+                        item.label
                         }}</a-select-option>
                 </a-select>
             </a-form-item>
@@ -31,7 +33,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from 'vue'
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import { queryAllDisTeam,getAllGasIns } from '../gasInspect.api'
+import { queryAllDisTeam, getAllGasIns } from '../gasInspect.api'
 
 let props = defineProps({
     inspectEditData: {
@@ -47,7 +49,7 @@ let formStateEdit = reactive<any>({
     strInstallPos: '',
     disTeamId: '',
     insType: '',
-    deviceId:''
+    deviceId: ''
 })
 let addressList = ref<any[]>([])//监测地点下拉选项列表
 let qdList = ref<any[]>([])//区队下拉选项列表
@@ -67,23 +69,25 @@ async function queryAllDisTeamList() {
     }
 }
 //获取所有巡检地址
-async function getAllGasInsList(){
-    let res=await getAllGasIns()
-    console.log(res,'所有巡检地点---------')
-    if(res.length!=0){
-        addressList.value=res.map(el=>{
+async function getAllGasInsList() {
+    let res = await getAllGasIns()
+    console.log(res, '所有巡检地点---------')
+    if (res.length != 0) {
+        addressList.value = res.map(el => {
             return {
-                label:el.strinstallpos,
-                value:el.strinstallpos,
+                label: el.strinstallpos,
+                value: el.strinstallpos,
                 deviceId: el.id,
             }
         })
     }
 }
 //巡检地址选项切换
-let changeAddress=(val)=>{
-    formStateEdit.deviceId=addressList.value.filter(v=>v.value==val)[0].deviceId
-    formStateEdit.strInstallPos=val
+let changeAddress = (val) => {
+    console.log(val, '888===')
+    formStateEdit.deviceId = addressList.value.filter(v => v.value == val)[0].deviceId
+    formStateEdit.strInstallPos = val
+    console.log(formStateEdit.strInstallPos, '090===')
 }
 //编辑提交
 let confirmEdit = () => {
@@ -96,16 +100,20 @@ let cancelEdit = () => {
         strInstallPos: '',
         disTeamId: '',
         insType: '',
-        deviceId:''
+        deviceId: ''
     }
     $emit('cancelEdit',)
 }
 watch(() => props.inspectEditData, (newV, oldV) => {
-    formStateEdit = Object.assign({}, newV)
+    formStateEdit.strInstallPos = newV.strInstallPos
+    formStateEdit.id = newV.id
+    formStateEdit.disTeamId = newV.disTeamId
+    formStateEdit.insType = newV.insType
+    formStateEdit.deviceId = newV.deviceId
     getAllGasInsList()
     queryAllDisTeamList()
 }, { immediate: true })
-onMounted(() => {})
+onMounted(() => { })
 </script>
 
 <style lang="less" scoped>

src/views/vent/monitorManager/alarmMonitor/common/external-gqcw.vue

@@ -0,0 +1,152 @@
+<template>
+    <div class="external-gqcw">
+        <div class="nav" v-for="(item, index) in topOutList" :key="index">
+            <div class="pic" v-if="item.imgSrc">
+                <img :src="imgUrl" alt="" />
+            </div>
+            <div class="content" v-if="item.label && item.value">
+                <span>{{ item.label }}</span>
+                <span>{{ item.value }}</span>
+            </div>
+            <div class="text" v-if="item.text">{{ item.text }}</div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { topOutList } from '../common.data';
+import imgUrl from '/@/assets/images/fire/pie.png';
+</script>
+
+<style lang="less" scoped>
+@import '/@/design/theme.less';
+
+@{theme-deepblue} {
+    .external-gqcw {
+        --image-bj1: url('/@/assets/images/themify/deepblue/fire/bj1.png');
+        --image-max: url('/@/assets/images/themify/deepblue/fire/max.svg');
+        --image-min: url('/@/assets/images/themify/deepblue/fire/min.svg');
+        --image-pj: url('/@/assets/images/themify/deepblue/fire/pj.svg');
+        --image-1: url('/@/assets/images/themify/deepblue/fire/1.png');
+        --image-contetn: url('/@/assets/images/themify/deepblue/fire/contetn.png');
+        --image-2: url('/@/assets/images/themify/deepblue/fire/2.png');
+    }
+}
+
+.external-gqcw {
+    --image-zwnr: url('/@/assets/images/fire/wy-zwnr.png');
+    --image-z: url('/@/assets/images/fire/wy-z.png');
+    --image-zt: url('/@/assets/images/fire/wy-zt.png');
+    --image-zt1: url('/@/assets/images/fire/wy-zt2.png');
+    --image-time: url('/@/assets/images/fire/wy-time.png');
+    --image-time1: url('/@/assets/images/fire/wy-time2.png');
+    --image-title: url('/@/assets/images/fire/wy-title.png');
+    --image-bj2: url('/@/assets/images/fire/wy-bj.png');
+    --image-max: url('/@/assets/images/fire/max.svg');
+    --image-min: url('/@/assets/images/fire/min.svg');
+    --image-pj: url('/@/assets/images/fire/pj.svg');
+    --image-1: url('/@/assets/images/fire/1.png');
+    --image-contetn: url('/@/assets/images/fire/contetn.png');
+    --image-2: url('/@/assets/images/fire/2.png');
+    --border-image-2: linear-gradient(to bottom, transparent, #024688, transparent);
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .nav {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        &:nth-child(1) {
+            flex: 1;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
+        }
+
+        &:nth-child(2) {
+            flex: 1;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
+        }
+
+        &:nth-child(3) {
+            flex: 1;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
+        }
+
+        &:nth-child(4) {
+            flex: 1.2;
+            color: #b3b8cc;
+            font-size: 16px;
+            height: 100%;
+            border-right: 2px solid;
+            border-image: var(--border-image-2) 1 1 1;
+        }
+
+        &:nth-child(5) {
+            flex: 0.8;
+            color: #2b87ff;
+            font-size: 14px;
+            height: 100%;
+        }
+
+        .pic {
+            width: 26%;
+            height: 84%;
+
+            img {
+                width: 100%;
+                height: 100%;
+            }
+        }
+
+        .content {
+            height: 84%;
+            margin-left: 15px;
+            color: #fff;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-around;
+
+            span {
+                font-size: 14px;
+
+                &:nth-child(1) {
+                    padding: 5px 0px;
+                    color: #b3b8cc;
+                }
+
+                &:nth-child(2) {
+                    font-family: 'douyuFont';
+                    font-size: 16px;
+                    color: var(--vent-table-action-link);
+                }
+            }
+        }
+    }
+
+    .nav:nth-child(1) .pic {
+        background: var(--image-max) no-repeat center;
+        background-size: 50% 50%;
+    }
+
+    .nav:nth-child(2) .pic {
+        background: var(--image-min) no-repeat center;
+        background-size: 50% 50%;
+    }
+
+    .nav:nth-child(3) .pic {
+        background: var(--image-pj) no-repeat center;
+        background-size: 50% 50%;
+    }
+}
+</style>