-
+ :close-on-click-modal="false" :close-on-press-escape="false">
+ :close-on-click-modal="false" :close-on-press-escape="false">
@@ -64,7 +68,7 @@
+ @change="changeTunnel">
{{ item.label }}
@@ -91,12 +95,12 @@
+ v-if="roleKey !== 'administrator'">
-
@@ -106,14 +110,14 @@
-
+ v-if="roleKey !== 'administrator'">
{{ scope.row.lookupStatus ? '已读' : '未读' }}
@@ -125,15 +129,15 @@
详情
删除
+ link>删除
-
隧道总长度: {{ tunnelLength }}米
- 开始模拟
-
+ 开始模拟
+
+ 模拟爆破
+ 结束模拟
+
+
@@ -16,15 +20,15 @@
{{
- item.label
- }}
+ item.label
+ }}
-
@@ -36,27 +40,27 @@
-
{{ siteName }}
-
-
-
-
-
-
-
-
-
-
@@ -31,7 +21,7 @@
+
-
{{ item.tunnelName }}
@@ -48,17 +38,9 @@
-
-
-
-
去模拟
-
-
-
-
-
@@ -68,26 +50,11 @@
添加隧道
-
- 暂无图纸~ 请前往站点管理上传图纸~
-
-
-
-
-
-
-
-
{{ title }}
@@ -99,94 +66,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
是
@@ -248,48 +139,13 @@ const type = reactive(params.type)
const formRules = ref({
tunnelName: [{required: true, message: '请输入隧道名称', trigger: ['blur', 'change']}],
tunnelAlias: [{required: true, message: '请输入隧道简称', trigger: ['blur', 'change']}],
- serialNumberPrefix: [
- {required: true, message: '请输入序列号前缀', trigger: ['blur', 'change']},
- {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号前缀', trigger: ['blur', 'change']},
- {min: 14, max: 14, message: '隧道序列号前缀长度为14位', trigger: ['blur', 'change']},
- ],
- serialNumber: [
- {required: true, message: '请输入PLC序列号', trigger: ['blur', 'change']},
- {validator: validateNumber, message: '请输入英文、数字、英文数字组合的PLC序列号', trigger: ['blur', 'change']},
- {min: 16, max: 16, message: '隧道PLC序列号长度为16位', trigger: ['blur', 'change']},
- {validator: validateSerialNumberPrefix, message: '同一隧道的序列号前缀需相同', trigger: ['blur', 'change']}
- ],
- serialNumberOne: [
- // {required: true, message: '请输入序列号2', trigger: ['blur', 'change']},
- // {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号2', trigger: ['blur', 'change']},
- // { min:16,max:16,message: '隧道序列号2长度为16位',trigger: ['blur', 'change']},
- // {validator: validateSerialNumberOnePrefix, message: '同一隧道的序列号前缀需相同', trigger: ['blur', 'change']}
- ],
totalLength: [{required: true, message: '请输入隧道长度', trigger: ['blur', 'change']}],
constructionLength: [{required: true, message: '请输入施工长度', trigger: ['blur', 'change']}],
- referenceFrequency: [{required: true, message: '请输入基准频率', trigger: ['blur', 'change']}],
- upTime: [{required: true, message: '请选择升频时间', trigger: ['blur', 'change']}],
- upFrequency: [{required: true, message: '请输入升频率', trigger: ['blur', 'change']}],
- dropTime: [{required: true, message: '请选择降频时间', trigger: ['blur', 'change']}],
- dropFrequency: [{required: true, message: '请输入降频率', trigger: ['blur', 'change']}]
})
-let clickModel = ref(1)
const showFirst = ref(false)
const showOperation = ref(true)
const formInstance = ref()
const tunnelList = ref([])
-const coordsList = ref([
- {
- tunnelId: 1,
- coords: '767,1117,793,1182,2379,682,2437,454,2349,505,2298,666,2221,531,2153,578,2212,692,765,1126',
- }, {
- tunnelId: 1,
- coords: '863,1475,1135,1494,2321,1078,3023,801,3214,703,3288,752,2300,1154,1560,1438,1170,1554,844,1529',
- }, {
- tunnelId: 94,
- coords: '1181,1364,2105,622,2005,589,1116,1324'
- }
-])
const iconsList = ref([
{
icon: 'sd_icon_fj.png',
@@ -370,7 +226,7 @@ const total = ref(0);
onMounted(() => {
showOperation.value = localStorage.getItem('roleKey') !== 'tunnel_admin';
})
-const handleGoToSimulateTunnel=(tunnelId)=>{
+const handleGoToSimulateTunnel = (tunnelId) => {
router.push('/simulate/' + tunnelId)
}
const addSerialNumber = () => {
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 067aaa3..7dd632e 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -61,7 +61,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加序列号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hz
-
-
-
-
-
-
-
-
-
-
- Hz
-
-
-
-
-
+ {{initialIndex}}
@@ -113,7 +113,6 @@
-
{{ scope.row.lookupStatus ? '已读' : '未读' }}
@@ -485,7 +484,10 @@ const getTunnel = (id) => {
});
}
const changeTunnel = (e) => {
- socket.close()
+ console.info("🚀 ~method:'socket' -----", socket)
+ if(socket){
+ socket.close()
+ }
let newObj = {}
tunnelList.value.forEach((item, index) => {
if (index === e) {
@@ -519,10 +521,14 @@ const manageSelect = (index) => {
router.push("/user/" + localStorage.getItem('currentSiteId'));
}
}
- socket.close()
+ if(socket){
+ socket.close()
+ }
};
const handleChangeSite = debounce((item) => {
- socket.close()
+ if(socket){
+ socket.close()
+ }
currentSite.value = item.label
currentSiteId.value = item.value
getTunnel(item.value)
From 20440c1cc14ac8313c69efa2cf79b1c947da53dc Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 2 Sep 2024 17:53:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9A=A7?=
=?UTF-8?q?=E9=81=93=E6=A8=A1=E6=8B=9F=E9=A6=96=E9=A1=B5,=E7=BB=93?=
=?UTF-8?q?=E6=9D=9F=E6=A8=A1=E6=8B=9F=E4=B9=8B=E5=90=8E=E5=88=87=E6=8D=A2?=
=?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tunnel-simulate/index.vue | 3 +++
src/views/tunnel-simulate/tunnel-list.vue | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/views/tunnel-simulate/index.vue b/src/views/tunnel-simulate/index.vue
index 58b6f0d..0483c58 100644
--- a/src/views/tunnel-simulate/index.vue
+++ b/src/views/tunnel-simulate/index.vue
@@ -277,6 +277,9 @@ onMounted(() => {
const startSimulate = () => {
isStartSimulate.value = false
}
+const endSimulate = () => {
+ isStartSimulate.value = true
+}
const changeName = (id) => {
for (let item of equipmentOption.value) {
if (item.value === id) {
diff --git a/src/views/tunnel-simulate/tunnel-list.vue b/src/views/tunnel-simulate/tunnel-list.vue
index b2a614d..a0f0e73 100644
--- a/src/views/tunnel-simulate/tunnel-list.vue
+++ b/src/views/tunnel-simulate/tunnel-list.vue
@@ -803,7 +803,7 @@ const handleMoreDelete = debounce(() => {
}
.left-img {
- cursor: pointer;
+ //cursor: pointer;
margin-top: 110px;
margin-right: 50px;
width: 340px;