liuqiao 1 gadu atpakaļ
vecāks
revīzija
d45b67f9f8

+ 12 - 1
src/App.vue

@@ -1,6 +1,17 @@
 <template>
   <!-- <viewIndex/> -->
-  <router-view></router-view>
+  <!-- <keep-alive>
+          <router-view v-if="$route.meta.keepAlive"></router-view>
+    </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"></router-view> -->
+  <!-- //<router-view></router-view> -->
+  <router-view v-slot="{ Component }">
+	<keep-alive>
+		<component :is="Component" v-if="$route.meta.keepAlive" :key="$route.name" />
+	</keep-alive>
+    <component :is="Component" v-if="$route.meta.keepAlive"
+							:key="$route.name" />
+</router-view>
 </template>
 
 <script setup>

+ 8 - 2
src/router/index.js

@@ -11,11 +11,17 @@ const router = createRouter({
         },
         {
             path: '/configurator',
-            component: configurator// 这是路由的籁加载,也可以其他方式
+            component: configurator,// 这是路由的籁加载,也可以其他方式
+            meta:{
+                keepAlive:true // 需要缓存
+            }
         },
         {
             path: '/',
-            component: () => import('@/view/appmian.vue')
+            component: () => import('@/view/appmian.vue'),
+            meta:{
+                keepAlive:true // 需要缓存
+            }
         },
 
     ]

+ 56 - 14
src/view/InfoDialoges.vue

@@ -25,7 +25,7 @@
                         <div class="borderimg"><el-button @click="dialogVisible = false">取消</el-button></div>
                     </div>
                     <div class="footerbtn">
-                        <div class="borderimg"><el-button @click="classclick()">
+                        <div class="borderimg"><el-button @click="classclick();dialogVisible= false;">
                                 确定
                             </el-button></div>
                     </div>
@@ -150,12 +150,18 @@
                                     <div class="l_padding " style="padding:20px 20px 20px 24px; ">
                                         <div class="line selecwidth">
                                             <el-form-item label="污染物选择:">
-                                                <el-select v-model="options.coid" multiple filterable allow-create
+                                                <!-- <el-select v-model="options.coid" multiple filterable allow-create
                                                     default-first-option :reserve-keyword="false" value-key="code"
                                                     @change="selectchange($event)" placeholder="请选择">
                                                     <el-option v-for="item in options" :key="item.coid"
                                                         :label="item.code" :value="item" />
-                                                </el-select>
+                                                </el-select> -->
+                                                <el-select v-model="value" multiple filterable allow-create
+                                                    default-first-option :reserve-keyword="false" value-key="code"
+                                                    @change="selectchange($event)" placeholder="请选择">
+                                                    <el-option v-for="item in options" :key="item.coid"
+                                                        :label="item.code" :value="item" />
+                                                </el-select> 
                                             </el-form-item>
                                         </div>
                                         <ul>
@@ -314,7 +320,7 @@ import t4 from "@/assets/img/t4.png";
 import mitts from "@/utils/Bus"
 import closeimg from "@/assets/img/colse.png";
 import { timestampToTime } from '@/js/lindex.js'
-let emit = defineEmits(['headerclick', 'childfun', 'moxingclick'])
+let emit = defineEmits(['headerclick', 'childfun', 'moxingclick','handleSelect'])
 const props = defineProps({
     addselect: {
         type: Function,
@@ -340,7 +346,6 @@ let shiguobj = ref({
     source: '自荐',
     type: '预演',
     sid: '-1'
-
 })
 let sgdata = ref({});
 let formull = ref({
@@ -360,7 +365,7 @@ let firesid = ref("");
 const currentPage4 = ref(1);
 const pageSize4 = ref(3)
 let total = ref(1);
-const dialogVisible = ref(true);
+const dialogVisible = ref(false);
 const classradio = ref();
 let classradio1 = ref('Fire');
 const leftcoll = ref({
@@ -473,7 +478,6 @@ const handleCurrentChange = ({ row, rowIndex }) => {
 
 // 类型选择
 const classclick = () => {
-    dialogVisible.value = false;
     dialog.value.dialogVisible_fire = true;
     classradio.value = classradio1.value;
     props.addselect();
@@ -489,19 +493,40 @@ const accident = () => {
         emit('childfun');
         emit('moxingclick', true);
         pollute();
+        emit('handleSelect', '1');
     }
     fetchFileContent();
 }
-const accident2 = () => {
-    if (classradio.value == "Fire") {
-        leftcoll.value.collfire = true;
+// const accident2 = () => {
+//     if (classradio.value == "Fire") {
+//         leftcoll.value.collfire = true;
+//         leftcoll.value.collwater = false;
+
+//     } else if (classradio.value == "Water") {
+//         leftcoll.value.collwater = true;
+//         leftcoll.value.collfire = false;
+//     }else{
+//         leftcoll.value.collfire = false;
+//         leftcoll.value.collfire = false;
+//     }
+
+// }
+const accident2 = (key) => {
+    if (key == '3') {
+        if (classradio.value== "Fire") {
+            leftcoll.value.collfire = true;
+        } else if (classradio.value== "Water") {
+            leftcoll.value.collwater = true;
+        } else {
 
-    } else if (classradio.value == "Water") {
-        leftcoll.value.collwater = true;
+        }
+
+    } else {
+        leftcoll.value.collfire = false;
+          leftcoll.value.collwater = false;
     }
 
 }
-
 //事故添加列表
 const sgadd = () => {
     const params = {
@@ -618,7 +643,17 @@ const inititimeDefaultal = () => {
 // 初始数据
 const initial = () => {
     if (classradio.value == "Fire") {
-        options.value.coid = ["CO2"];
+      //   options.value.coid = ["CO2"];
+       // selectchange(val);
+      //  options.value.coid = tuiyanobj2.value.coids;
+      value.value=[{
+        code: "SO2",
+        coid: 1,
+        density: 0,
+        diffcoe: 0.2,
+        name: "二氧化硫",
+        speheat: 0,
+      }],
         tuiyanobj2.value.pickertime = inititimeDefaultal();
         tuiyanobj2.value.acctime = inititimeDefaultal();
         tuiyanobj.value = tuiyanobj2.value;
@@ -644,6 +679,7 @@ const timeclick = () => {
 }
 //  下拉多选
 const selectchange = (val) => {
+    console.log(val);
     let arr1 = [];
     let arr2 = [];
     for (let i = 0; i <= val.length - 1; i++) {
@@ -793,9 +829,12 @@ onBeforeUnmount(() => {
     websocketclose;
     // 销毁 websocket 实例对象
     websock.value = null;
+    rizhi.logs='';
+
 });
 
 onMounted(() => {
+    dialogVisible.value=true;
 });
 
 defineExpose({ monitor, accident2, leftcoll, classradio, aid, dialogVisible });
@@ -1689,4 +1728,7 @@ ol {
 .tuiy .asideg .el-input__inner {
     font-size: 14px !important;
 }
+.spantext{
+    cursor: pointer;
+}
 </style>

+ 37 - 22
src/view/appmian.vue

@@ -22,20 +22,27 @@
                         <el-menu-item index="4">推演结果</el-menu-item>
                     </el-menu>
                     <div class="ve_right">
-                        <div class="ve_time" v-show="titlefalse" @click="titleclick()">
+                        <div class="ve_timeioc"  v-if=" aid==null"  @click="qingsel">
+                            <span>请选择</span>
+                        </div>
+                        <div  v-else>
+                        <div class="ve_time" v-show="titlefalse" @click="titleclick()" >
                             <span class="l_huoqing">{{ headerobj.name }}</span>
                             <span class="l_time">{{ headerobj.time }}</span>
                         </div>
+                    </div>
+                       <!-- <router-link to="/configurator"> -->
                         <div class="ve_timeioc" @click="tiaozhuan()">
                             <el-image :src="Vector" fit="contain"></el-image>
                             <span>模型库</span>
                         </div>
+                    <!-- </router-link> -->
                     </div>
                 </div>
             </el-header>
 
             <el-main>
-                <Dialoges ref="lliudialog" :addselect="addselect" :headerobj="headerobj" @headerclick="headerclick"
+                <Dialoges ref="lliudialog" :addselect="addselect" :headerobj="headerobj" @headerclick="headerclick" @handleSelect="handleSelect"
                     @childfun="childfun" @moxingclick="moxingclick"></Dialoges>
                 <source-disaster ref="sourcedis" :classradio="classradio" :aid="aid" />
                 <info-boundary ref="boundary" :classradio="classradio" :aid="aid" />
@@ -70,8 +77,8 @@ let boundary = ref();
 let tanimation = ref();
 let titlefalse = ref(false);
 let headerobj = ref({
-    time: '火灾事故2023.02.26',
-    name: "2024-03-20 11:30:20",
+    time: '',
+    name: "",
 })
 let router = useRouter();
 let sgdata = ref({});
@@ -80,10 +87,14 @@ onMounted(() => {
 });
 // 跳转页面,{ aid:aid.value}
 const tiaozhuan = () => {
-    router.push("/configurator");
-    console.log(router.push("/configurator"))
+   
+router.push({ path:"/configurator", query: { date: new Date().getTime()}})
+     
+    // console.log(router.push("/configurator"))
+ 
+    // console.log(router.push("/configurator"))
 }
-// 
+
 const addselect = () => {
     classradio.value = lliudialog.value.classradio;
 
@@ -91,7 +102,11 @@ const addselect = () => {
 const moxingclick = (val) => {
     titlefalse.value = val;
 }
+const qingsel=()=>{
+    lliudialog.value.dialogVisible = true;
+}
 //点击头部弹出弹框
+
 const titleclick = () => {
     lliudialog.value.dialogVisible = true;
 }
@@ -112,37 +127,37 @@ const headerclick = (data) => {
     headerobj.value.time = data.time;
     aid.value = data.aid
 }
-const handleSelect = (key, keyPath) => {
+const handleSelect = (key) => {
+    activeIndex.value='';
+    console.log(key)
     switch (key) {
         case '1':
-            sourcedis.value.accident3();
+            sourcedis.value.accident3(key);
             boundary.value.accident4(key);
-            lliudialog.value.leftcoll.collfire = false;
-            lliudialog.value.leftcoll.collwater = false;
+            lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
+            activeIndex.value='1'
             break;
         case '2':
             boundary.value.accident4(key);
-            sourcedis.value.sour.collfire = false;
-            sourcedis.value.sour.collwater = false;
-            lliudialog.value.leftcoll.collfire = false;
-            lliudialog.value.leftcoll.collwater = false;
+            sourcedis.value.accident3(key);
+            lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
+            activeIndex.value='2'
             break;
         case '3':
             boundary.value.accident4(key);
-            sourcedis.value.sour.collfire = false;
-            sourcedis.value.sour.collwater = false;
-            lliudialog.value.accident2();
+            sourcedis.value.accident3(key);
+            lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
+            activeIndex.value='3'
             break;
         case '4':
             boundary.value.accident4(key);
             tanimation.value.accident5(aid.value);
-            sourcedis.value.sour.collfire = false;
-            sourcedis.value.sour.collwater = false;
-            lliudialog.value.leftcoll.collfire = false;
-            lliudialog.value.leftcoll.collwater = false;
+            sourcedis.value.accident3(key);
+            lliudialog.value.accident2(key);
+            activeIndex.value='4'
         default:
             break;
     }

+ 20 - 10
src/view/components/InfoBoundary.vue

@@ -23,15 +23,22 @@
                                                 @row-click="handleDelete($event)"
                                                 :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.96) ' }">
                                                 <el-table-column prop="nid" label="节点选择" />
-                                                <el-table-column prop="type" label="边界类型" />
-                                                <!-- <el-table-column label="边界类型" prop="type" align="center" width="80px">
+                                                <!-- <el-table-column prop="type" label="边界类型" /> -->
+              
+                                          <el-table-column label="边界类型" prop="type" align="center" width="80px">
                                                         <template #default="scope">
-                                                        {{ scope.row.type == massflow ? '流量边界' : scope.row.type ==	Pressure ?'压力边界' }} 
+                                                            {{
+                                                            scope.row.type == 'massflow'
+                                                                ? '流量边界'
+                                                                : scope.row.type == 'Pressure'
+                                                                ? '压力边界'
+                                                                : '压力边界'
+                                                            }}
                                                         </template>
-                                                    </el-table-column> -->
-                                                <!-- <el-table-column  width="50">
-                                                        <template #default="scope">{{scope.row.type == massflow ? '流量边界' : scope.row.type ==	Pressure?'压力边界' }} </template>
-                                                    </el-table-column> -->
+                                                    </el-table-column> 
+                                              <!-- <el-table-column  width="50">
+                                                //         <template #default="scope">{{scope.row.type == massflow ? '流量边界' : scope.row.type ==	Pressure?'压力边界' }} </template>
+                                                //     </el-table-column> -->
                                                 <el-table-column prop="flow" label="流量(m³/s)" width="80" />
                                                 <el-table-column prop="pressure" label="压强(pa)" width="70" />
                                                 <el-table-column prop="temperature" label="温度(℃)" />
@@ -206,8 +213,9 @@
                     </div>
                 </div>
             </div>
+        </el-dialog>
             <!--  节点选择 -->
-            <el-dialog v-model="sdialog.dialogVisiblenode" width="50%"
+            <el-dialog v-model="sdialog.dialogVisiblenode" width="600px"
                 class="dialog_class bgcolor tianjia asideg asidegbg leftbgimg">
 
                 <template #header="{ titleId, titleClass }">
@@ -228,7 +236,6 @@
                             </div>
                         </div>
                     </div>
-                    >
                     <el-table :row-class-name="tableRowClassName" :max-height="tableHeight" ref="multipleTableRef"
                         :data="tableData2" style="width: 100%" @select="projectsSelectionSelect"
                         :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.96) ' }">
@@ -259,7 +266,7 @@
                     </div>
                 </div>
             </el-dialog>
-        </el-dialog>
+      
         <!-- 删除 -->
         <el-dialog v-model="sdialog.dialogsgdelect" width="400" class="dialog_class bgcolor tianjia">
 
@@ -1002,6 +1009,9 @@ defineExpose({ boun, accident4, addboundary });
     border-radius: 0px 0px 0px 0px;
     position: relative;
 }
+.log_class{
+    background-color: rgba(13, 22, 57, 0.96) !important;   
+}
 </style>
 
 <style>

+ 13 - 4
src/view/components/InfoDisaster.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 所有弹出框 -->
+  <!-- 所有弹出框 灾情源设置-->
     <div class="l_Dialog bbb" >
     <!--火灾左侧栏-->
     <div class="common-layout" style="margin: 0;"  v-show="sour.collfire"> 
@@ -174,7 +174,8 @@
         </el-aside>
     </div>
      <!-- 灾害点源数据的添加-->
-     <el-dialog v-model="sdialog.dianadddialog" width="400"  class="dialog_class bgcolor tianjia">
+     <el-dialog v-model="sdialog.dianadddialog" width="400" align-center :modal="false" :close-on-click-modal="false"
+            draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"  class="dialog_class bgcolor tianjia">
           <template #header="{titleId, titleClass }">
           <div class="my-header ">
               <el-image :src="icon" fit="contain" ></el-image>
@@ -284,7 +285,8 @@
    </div>
    </el-dialog>
  <!-- 灾害火灾源检测数据的添加-->
-      <el-dialog v-model="sdialog.adddialog" width="400"   class="dialog_class bgcolor tianjia">
+      <el-dialog v-model="sdialog.adddialog" width="400" align-center :modal="false" :close-on-click-modal="false"
+            draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"  class="dialog_class bgcolor tianjia">
           <template #header="{titleId, titleClass }">
           <div class="my-header ">
               <el-image :src="icon" fit="contain" ></el-image>
@@ -440,14 +442,21 @@ let tableobj=ref({});
   const tableData = ref([]);
   const tableDatay = ref([]);
   const tableData4=ref([]);
-  const  accident3=()=>{
+  const  accident3=(key)=>{
+    if (key == '1') {
       console.log(props.classradio);
       if(props.classradio=="Fire"){
           sour.value.collfire=true;
+          sour.value.collwater=false;
   
       }else if(props.classradio=="Water"){
           sour.value.collwater=true;
+          sour.value.collfire=false;
       }
+    }else{
+      sour.value.collwater=false;
+      sour.value.collfire=false;
+    }
   }
   //灾情源查询列表
   const handledisaster=(aidval)=>{

+ 15 - 5
src/view/components/MenuCheck.vue

@@ -14,13 +14,14 @@
                     <div class="jc_content tablecolor jc_content">
 
                         <div class="font12 my_content1">
-                            <div class="xian btncolor tablefocus bmar tianjia">
+                            <div class="btncolor tablefocus bmar">
 
-                                <el-table :data="tableData" style="width:468px" :max-height="tableHeight"
+                                <el-table :data="tableData" style="width:480px" :max-height="tableHeight"
                                     :highlight-current-row="currentrow" :row-class-name="tableRowClassName"
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.9) ' }">
                                     <el-table-column type="index" label="编号"  />
+                                    <el-table-column prop="chname" label="所在巷道" />
                                     <el-table-column prop="pname" label="所在巷道" />
                                     <el-table-column prop="site" label="位置" />
                                 </el-table>
@@ -41,7 +42,7 @@
                                     </el-button></div>
                             </div>
                             <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="sendialogVisible = false">
+                                <div class="borderimg"><el-button @click="sendialogVisible = false;currentrow=false">
                                         确定
                                     </el-button></div>
                             </div>
@@ -81,7 +82,13 @@
 
           </div>
           </template>
+          <el-form-item label="监测点名称:" :label-width="formLabelWidth5">
+          <el-input  v-model="source.chname"
+              class="w-50 m-2"
+              placeholder="请输入"  />
+          </el-form-item>
           <div class="demo-input-suffix firsttitle magintop guand_1">
+            
        <el-form-item label="巷道名称" :label-width="formLabelWidth5">
           <el-input  v-model="source.selectstr"
               class="w-50 m-2"
@@ -207,7 +214,8 @@ const pageSize4 = ref(5)
 let cid=ref("");
 let source=ref({
     selectstr:'',
-    site:''
+    site:'',
+    chname:''
 })
 let  firepid=ref("")
 const resultactiveName = ref("first");
@@ -293,7 +301,8 @@ const addEditaip=()=>{
         transCode: 'D10005',
         cid:cid.value,
         pid:firepid.value,
-        site:source.value.site
+        site:source.value.site,
+        chname:source.value.chname
     }
     request(params)
         .then((res) => {
@@ -314,6 +323,7 @@ const amend = () => {
     } else {
         sdialog.value.dianadddialog= true; 
         cid.value = tableobj.value.cid;
+        source.value.chname = tableobj.value.chname;
         source.value.site = tableobj.value.site;
         source.value.selectstr=tableobj.value.pname;
         firepid.value=tableobj.value.pid;

+ 29 - 12
src/view/components/MenuMine.vue

@@ -53,7 +53,7 @@
                                             </el-button></div>
                                     </div>
                                     <div class="footerbtn flex1">
-                                        <div class="borderimg"><el-button @click="dialogVisible = false">
+                                        <div class="borderimg"><el-button @click="dialogVisible = false;currentrow= false;">
                                                 确认
                                             </el-button></div>
                                     </div>
@@ -132,7 +132,7 @@
                                 <div class="font12 my_content1">
                                     <div class="btncolor tablefocus bmar">
                                         <el-table :row-class-name="tableRowClassName" :max-height="tableHeight"
-                                            ref="multipleTableRef"   :highlight-current-row="currentrow"    @row-click="handleDelete2($event)" :data="tableData3" style="width: 100%"
+                                            ref="multipleTableRef"   :highlight-current-row="currentrow1"    @row-click="handleDelete2($event)" :data="tableData3" style="width: 100%"
                                     
                                             :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.96) ' }">
                                             <el-table-column property="snId" label="开始节点" />
@@ -172,7 +172,7 @@
                                             </el-button></div>
                                     </div>
                                     <div class="footerbtn flex1">
-                                        <div class="borderimg"><el-button @click="dialogVisible = false">
+                                        <div class="borderimg"><el-button @click="dialogVisible = false;currentrow1= false">
                                                 确认
                                             </el-button></div>
                                     </div>
@@ -190,8 +190,6 @@
                                 </div>
                             </template>
                             <div>
-                                <el-form>
-
                                     <el-form-item label="名称" :label-width="formLabelWidth7">
                                         <el-input v-model="guandaoobj.name" class="w-50 m-2" placeholder="请输入" />
                                     </el-form-item>
@@ -214,9 +212,20 @@
                                     <el-form-item label="粗糙系数" :label-width="formLabelWidth7">
                                         <el-input v-model="guandaoobj.roughCoe" class="w-50 m-2" placeholder="请输入" />
                                     </el-form-item>
-                                    <el-form-item label="截面类型" :label-width="formLabelWidth7">
-                                        <el-input v-model="guandaoobj.sectionType" class="w-50 m-2" placeholder="请输入" />
+                                 <!-- <el-form-item label="截面类型" :label-width="formLabelWidth7">
+                                       <el-input v-model="guandaoobj.sectionType" class="w-50 m-2" placeholder="请输入" /> 
+                                    </el-form-item>  -->
+                                    <div class="demo-input-suffix firsttitle magintop guand_1">
+                                        <el-form-item label="截面类型" :label-width="formLabelWidth7">
+                                        <el-select v-model="guandaoobj.sectionType" placeholder="请选择">
+                                            <el-option v-for="item in options" :key="item.id" :label="item.label"
+                                                :value="item.value"></el-option>
+                                        </el-select>
+                                        <div class="btn2">
+                                                <span> 圆</span>
+                                        </div>
                                     </el-form-item>
+                                </div>
                                     <el-form-item label="截面参数1" :label-width="formLabelWidth7">
                                         <el-input v-model="guandaoobj.sectionPara1" class="w-50 m-2" placeholder="请输入" />
                                     </el-form-item>
@@ -232,7 +241,6 @@
                                     <el-form-item label="截面参数5" :label-width="formLabelWidth7">
                                         <el-input v-model="guandaoobj.sectionPara5" class="w-50 m-2" placeholder="请输入" />
                                     </el-form-item>
-                                </el-form>
                             </div>
                             <div class="dialog-footer footer_div l_btn">
                                 <div class="footerbtn flex1">
@@ -302,9 +310,17 @@ const resultactiveName = ref("first");
 let tableHeight = ref(570);
 let total = ref(1);
 let searchtag = ref("");
+let options=ref([{
+    label:'circle',value:"circle"
+},
+{
+    label:'square',value:"square"
+},
+])
 const currentPage4 = ref(1);
 const pageSize4 = ref(5)
 let currentrow = ref(false);
+let currentrow1 = ref(false);
 let sdialog = ref({
     adddialog: false,
     dialogsgdelect: false,
@@ -330,7 +346,7 @@ let guandaoobj = ref({
     snId: 0,
     enId: 0,
     roughCoe: '',
-    sectionType: '',
+    sectionType: 'circle',
     sectionPara1: '',
     sectionPara2: '',
     sectionPara3: '',
@@ -354,7 +370,6 @@ onMounted(() => {
 })
 // tab选项事件
 const handleClick = (Tab, val) => {
-    console.log(Tab.props.name);
     switch (Tab.props.name) {
         case 'first':
             pipelinedata()
@@ -396,6 +411,7 @@ const pipelinedata = () => {
 //节点的添加
 const addsg = () => {
     zhtext.value = '添加';
+    currentrow.value = false;
     sdialog.value.adddialog = true;
     nodeobj.value.name = "";
     nodeobj.value.x = "";
@@ -436,7 +452,7 @@ const handleDelete = (val) => {
 
 }
 const handleDelete2 = (val) => {
-    currentrow.value = true;
+    currentrow1.value = true;
     gddata.value = val;
 
 }
@@ -518,12 +534,13 @@ const queding=(row)=>{
 // 管道的add
 const guandaoadd=()=>{
     sdialog.value.gdadddialog=true;
+     currentrow1.value = false;
         guandaoobj.value.pid='';
         guandaoobj.value.name= '';
         guandaoobj.value.snId= 0;
         guandaoobj.value.enId= 0;
         guandaoobj.value.roughCoe= '';
-        guandaoobj.value.sectionType= '';
+        guandaoobj.value.sectionType= 'circle';
         guandaoobj.value.sectionPara1='';
         guandaoobj.value.sectionPara2='';
         guandaoobj.value.sectionPara3='';

+ 5 - 2
src/view/components/MenuPhysics.vue

@@ -17,7 +17,7 @@
                             <div class="btncolor tablefocus bmar">
 
                                 <el-table :data="tableData" style="width:480px" :max-height="tableHeight"
-                                    :highlight-current-row="true" :row-class-name="tableRowClassName"
+                                :highlight-current-row="currentrow" :row-class-name="tableRowClassName"
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.9) ' }">
                                     <el-table-column prop="name" label="名称" />
@@ -42,7 +42,7 @@
                                     </el-button></div>
                             </div>
                             <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="sendialogVisible = false">
+                                <div class="borderimg"><el-button @click="sendialogVisible = false;currentrow=false;">
                                         确认
                                     </el-button></div>
                             </div>
@@ -125,6 +125,7 @@ import icon from "@/assets/img/icon.png";
 import { timestampToTime } from '@/js/lindex.js'
 let pipeline = ref();
 let sendialogVisible = ref(false);
+let currentrow=ref(true);
 let addVisible = ref(false);
 let dialogsgdelect = ref(false)
 let classradio1 = ref('Fire');
@@ -157,6 +158,7 @@ const tableRowClassName = ({ row, rowIndex }) => {
 }
 // 选中一行
 const handleDelete = (val) => {
+    currentrow.value=true;
     tableobj.value = val;
     console.log(tableobj.value)
 }
@@ -204,6 +206,7 @@ const getsensor = () => {
 //添加
 const addsg = () => {
     add.value = "添加";
+    currentrow.value=false;
     addVisible.value = true;
     wuliobj.value.coid = '';
     wuliobj.value.code = '';

+ 6 - 3
src/view/components/MenuSensor.vue

@@ -17,7 +17,7 @@
                             <div class="btncolor tablefocus bmar">
 
                                 <el-table :data="tableData" style="width:480px" :max-height="tableHeight"
-                                    :highlight-current-row="true" :row-class-name="tableRowClassName"
+                                :highlight-current-row="currentrow"  :row-class-name="tableRowClassName"
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.9) ' }">
                                     <el-table-column type="index" label="编号" />
@@ -45,7 +45,7 @@
                                     </el-button></div>
                             </div>
                             <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="sendialogVisible = false">
+                                <div class="borderimg"><el-button @click="sendialogVisible = false;currentrow=false;">
                                         确认
                                     </el-button></div>
                             </div>
@@ -130,6 +130,7 @@ import icon from "@/assets/img/icon.png";
 import pipelines from "./PipeIine.vue"
 import { timestampToTime } from '@/js/lindex.js'
 let pipeline = ref();
+let currentrow=ref(true);
 let sendialogVisible = ref(false);
 let addVisible = ref(false);
 let dialogsgdelect = ref(false)
@@ -163,7 +164,8 @@ const tableRowClassName = ({ row, rowIndex }) => {
 // 选中一行
 const handleDelete = (val) => {
     tableobj.value = val;
-    console.log(tableobj.value)
+    currentrow.value=true;
+   // console.log(tableobj.value)
 }
 // 删除
 const shanchu = () => {
@@ -211,6 +213,7 @@ const getsensor = () => {
 //添加
 const addsg = () => {
     add.value = "添加";
+    currentrow.value=false;
     addVisible.value = true;
     senobj.value.seid = '';
     senobj.value.pid = '';

+ 8 - 2
src/view/components/PipeIine.vue

@@ -3,7 +3,7 @@
         <el-dialog
      v-model="dialogVisiblenode"
      width="700"
-     class="dialog_class bgcolor tianjia asideg asidegbg leftbgimg"
+     class="log_class bgcolor tianjia asideg asidegbg leftbgimg"
    >
    <template #header="{titleId, titleClass }">
           <div class="my-header ">
@@ -301,7 +301,7 @@ const projectsSelectionSelect=(selection, row)=>{
     border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255, 0.48)) 1 1;
 }
 
-.dialog_class {
+.log_class {
     .my-header {
         line-height: 10px;
         height: 40px;
@@ -431,4 +431,10 @@ const projectsSelectionSelect=(selection, row)=>{
     border: 1px solid;
     border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255, 0.48)) 1 1;
 }
+
+   </style>
+   <style>
+ .log_class{
+    background-color: rgba(13, 22, 57, 0.96) !important;
+}  
    </style>

+ 9 - 5
src/view/configurator.vue

@@ -32,7 +32,7 @@
                     <el-menu-item index="1">矿井信息</el-menu-item>
                     <el-menu-item index="2">传感器信息</el-menu-item>
                 
-                    <el-menu-item index="3" >测点信息</el-menu-item>
+                    <el-menu-item index="3" >测点信息</el-menu-item>
                     <el-menu-item index="4">物理属性</el-menu-item>
                 </el-menu>
                 <div class="ve_right" @click="clickreture()">
@@ -60,7 +60,7 @@
   </template>
   
   <script setup>
-import { ref, onMounted, reactive,nextTick } from "vue";
+import { ref, onMounted,watch,reactive,nextTick } from "vue";
 import {RouterView,RouterLink,useRouter,createRouter } from "vue-router"
 import MenuMine  from "./components/MenuMine.vue"
 import MenuSensor  from "./components/MenuSensor.vue"
@@ -80,8 +80,8 @@ let menusen=ref();
 let menucheck =ref();
 let menuphysics=ref();
 const clickreture=()=>{
- router.push("/");
- // console.log(  router.push("/appmian",{ aid:"1"}));
+// router.push("/");
+router.back()
 }
 const handleSelect = (key,keyPath) => {
     switch (key) {
@@ -113,7 +113,11 @@ const handleSelect = (key,keyPath) => {
         break;
 }
 }
-  
+
+watch(router, (to, from) => {
+  router.go(0)
+})
+
   </script>
   
   <style lang="scss" scoped>