From 7120a03b1d11f90b3969cf246cfc9ebaefd3790b Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 7 Aug 2024 19:55:34 +0800 Subject: [PATCH 1/7] feat : bulid --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6812ab8..603191f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx +FROM 10.7.127.190:38080/nginx:latest RUN rm -rf /etc/nginx/conf.d/default.conf RUN rm -rf /etc/nginx/nginx.conf From a16b20f62bb207a675e3e407b0ebb0d41f72e059 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 8 Aug 2024 01:18:22 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat=20:=20=E6=96=B0=E5=A2=9E/=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=9A=A7=E9=81=93=E6=96=B0=E5=A2=9E=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8F=B71,=E5=BA=8F=E5=88=97=E5=8F=B7=E5=89=8D=E7=BC=80?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/edit/edit.vue | 16 ++++++++++---- src/views/tunnel-manage/index.vue | 36 +++++++++++++++++++++++++++---- src/views/tunnel/index.vue | 6 ++++-- 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue index b6ff4d4..96b1fea 100644 --- a/src/views/edit/edit.vue +++ b/src/views/edit/edit.vue @@ -12,15 +12,21 @@
- + - - + + + + + + + + @@ -86,7 +92,9 @@ const type = reactive(router.currentRoute.value.params.type); const modelEquipmentList = ref(null) const form = ref({ tunnelName: "", - serialNumber: "", + serialNumberPrefix: '', + serialNumberOne: '', + serialNumber: '', totalLength: "", referenceFrequency: '', upTime: '', diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue index 4f4974d..42f8f70 100644 --- a/src/views/tunnel-manage/index.vue +++ b/src/views/tunnel-manage/index.vue @@ -90,15 +90,21 @@
{{ title }}
- + - - + + + + + + + + @@ -174,6 +180,12 @@ const validateNumber = (rule, value) => { const reg = /^[A-Za-z0-9]+$/; return reg.test(value); } +const validateSerialNumberPrefix = (rule, value) => { + return value.length > 13 && value.slice(0,-2) == form.value.serialNumberPrefix; +} +const validateSerialNumberOnePrefix = (rule, value) => { + return value.length > 13 && value.slice(0,-2) == form.value.serialNumberPrefix; +} const router = useRouter() const siteImage = ref() const showAddIcon = ref(true) @@ -184,9 +196,23 @@ const type = reactive(params.type) const formRules = ref({ tunnelName: [{required: true, message: '请输入隧道名称', trigger: ['blur', 'change']}], tunnelAlias: [{required: true, message: '请输入隧道简称', trigger: ['blur', 'change']}], + // serialNumber: [ + {required: true, message: '请输入序列号1', trigger: ['blur', 'change']}, + {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号1', trigger: ['blur', 'change']}, + { min:16,max:16,message: '隧道序列号1长度为16位',trigger: ['blur', 'change']}, + {validator: validateSerialNumberPrefix, message: '同一隧道的序列号前缀需相同', trigger: ['blur', 'change']} + ], + serialNumberOne: [ {required: true, message: '请输入序列号', trigger: ['blur', 'change']}, - {validator: validateNumber, message: '请输入英文、数字、英文数字组合的用户名', trigger: ['blur', 'change']} + {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号', trigger: ['blur', 'change']}, + { min:16,max:16,message: '隧道序列号长度为16位',trigger: ['blur', 'change']}, + {validator: validateSerialNumberOnePrefix, 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'] }, ], totalLength: [{required: true, message: '请输入隧道长度', trigger: ['blur', 'change']}], constructionLength: [{required: true, message: '请输入施工长度', trigger: ['blur', 'change']}], @@ -272,6 +298,8 @@ const siteName = ref(localStorage.getItem('site')) const form = ref({ tunnelName: '', tunnelAlias: '', + serialNumberPrefix: '', + serialNumberOne: '', serialNumber: '', totalLength: '', referenceFrequency: '', diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue index df34ce9..5308035 100644 --- a/src/views/tunnel/index.vue +++ b/src/views/tunnel/index.vue @@ -435,7 +435,8 @@ const getScreenInfo = (id) => { initSceneData(id).then((res) => { tunnelLength.value = res.data.tunnelLength constructionLength.value = res.data.constructionLength - serialNumber.value = res.data.serialNumber + // serialNumber.value = res.data.serialNumber.slice(0, -2) + serialNumber.value = res.data.serialNumberPrefix initWebSocket(); }) } @@ -563,8 +564,9 @@ const nextBtn = () => { }; const initWebSocket = () => { - // let wsUrl = `ws://192.168.31.175:9000/websocket/equipment/${token}/${serialNumber.value}` + // let wsUrl = `ws://192.168.31.176:9000/websocket/equipment/${token}/${serialNumber.value}` let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/equipment/${token}/${serialNumber.value}`; + // let wsUrl = `ws://clay.frp.feashow.cn/wstunnel/websocket/equipment/${token}/${serialNumber.value}`; socket = new WebSocket(wsUrl); //连接发生错误的回调方法 socket.onerror = function () { From 3d0e88b3156072d365735b0d8f0b818f6cc30147 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 15 Aug 2024 22:36:30 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E5=BA=8F=E5=88=97=E5=8F=B7=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device-manage/index.vue | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue index 10f4cb4..60e469a 100644 --- a/src/views/device-manage/index.vue +++ b/src/views/device-manage/index.vue @@ -532,9 +532,25 @@ getList() width: 450px!important; } } -.el-table__cell{ - +.el-select.serialNumber { + border-radius: 6px!important; + border: 1px solid #05FEFF!important; + background-color: transparent!important; + .el-select__wrapper{ + //height: 53px!important; + color: #FFFFFF!important; + font-size: 40px!important; + height: auto!important; + line-height: normal!important; + } + .el-select__placeholder { + height: 54px; + line-height: 54px; + color: #FFFFFF; + } } + + .serialNumber-select.el-popper { background: #064B66 !important; border: 2px solid #05FEFF !important; @@ -542,7 +558,9 @@ getList() .el-select-dropdown { min-width: 130px !important; } - + .el-select-dropdown__item.is-hovering{ + background-color: #064B66 !important; + } .el-select-dropdown__item { color: #FFFFFF; border-bottom: 1px solid #05FEFF; From b2c85e4e4712f92f40dfe52707aeb9c05bc4ab00 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 15 Aug 2024 22:39:10 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix=20:=20=E6=B3=A8=E9=87=8A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E/=E7=BC=96=E8=BE=91=E6=A1=86=E7=9A=84=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tunnel-manage/index.vue | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue index 42f8f70..39659ea 100644 --- a/src/views/tunnel-manage/index.vue +++ b/src/views/tunnel-manage/index.vue @@ -97,15 +97,16 @@ - - - - - - - - - + + + + + + + + + + @@ -196,24 +197,23 @@ const type = reactive(params.type) const formRules = ref({ tunnelName: [{required: true, message: '请输入隧道名称', trigger: ['blur', 'change']}], tunnelAlias: [{required: true, message: '请输入隧道简称', trigger: ['blur', 'change']}], - // - serialNumber: [ - {required: true, message: '请输入序列号1', trigger: ['blur', 'change']}, - {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号1', trigger: ['blur', 'change']}, - { min:16,max:16,message: '隧道序列号1长度为16位',trigger: ['blur', 'change']}, - {validator: validateSerialNumberPrefix, message: '同一隧道的序列号前缀需相同', trigger: ['blur', 'change']} - ], - serialNumberOne: [ - {required: true, message: '请输入序列号', trigger: ['blur', 'change']}, - {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号', trigger: ['blur', 'change']}, - { min:16,max:16,message: '隧道序列号长度为16位',trigger: ['blur', 'change']}, - {validator: validateSerialNumberOnePrefix, 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: '请输入序列号1', trigger: ['blur', 'change']}, + {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号1', trigger: ['blur', 'change']}, + { min:16,max:16,message: '隧道序列号1长度为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']}], From d98eaa93686a3483d2e478b8237656ba04d8d768 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 15 Aug 2024 23:01:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E7=9A=84=E5=BA=8F=E5=88=97=E5=8F=B7?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device-manage/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue index 60e469a..51fa397 100644 --- a/src/views/device-manage/index.vue +++ b/src/views/device-manage/index.vue @@ -542,6 +542,9 @@ getList() font-size: 40px!important; height: auto!important; line-height: normal!important; + border-radius: 6px!important; + border: 1px solid #05FEFF!important; + background-color: transparent!important; } .el-select__placeholder { height: 54px; From aa1eacc423bf864f159150d8798ac0895f069e44 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 15 Aug 2024 23:14:38 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E7=9A=84=E5=BA=8F=E5=88=97=E5=8F=B7?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device-manage/index.vue | 82 +++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue index 51fa397..b3b4fbf 100644 --- a/src/views/device-manage/index.vue +++ b/src/views/device-manage/index.vue @@ -76,19 +76,19 @@ @change="changeFanData(scope.row)"> - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + +