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; 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..39659ea 100644 --- a/src/views/tunnel-manage/index.vue +++ b/src/views/tunnel-manage/index.vue @@ -90,16 +90,23 @@
{{ title }}
- + - - - + + + + + + + + + + @@ -174,6 +181,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 +197,22 @@ 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: '请输入序列号', trigger: ['blur', 'change']}, - {validator: validateNumber, message: '请输入英文、数字、英文数字组合的用户名', trigger: ['blur', 'change']} + {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']}], @@ -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 () {