diff --git a/src/assets/img/header/headerGuide.png b/src/assets/img/header/headerGuide.png index 44eb98f..92ff885 100644 Binary files a/src/assets/img/header/headerGuide.png and b/src/assets/img/header/headerGuide.png differ diff --git a/src/assets/img/header/headerSelect.png b/src/assets/img/header/headerSelect.png index 6316daa..f1c041f 100644 Binary files a/src/assets/img/header/headerSelect.png and b/src/assets/img/header/headerSelect.png differ diff --git a/src/assets/img/mountpointSetting/edit.png b/src/assets/img/mountpointSetting/edit.png new file mode 100644 index 0000000..0057493 Binary files /dev/null and b/src/assets/img/mountpointSetting/edit.png differ diff --git a/src/assets/img/mountpointSetting/mountpointList.png b/src/assets/img/mountpointSetting/mountpointList.png new file mode 100644 index 0000000..62bf877 Binary files /dev/null and b/src/assets/img/mountpointSetting/mountpointList.png differ diff --git a/src/assets/img/mountpointSetting/record.png b/src/assets/img/mountpointSetting/record.png new file mode 100644 index 0000000..4d705f6 Binary files /dev/null and b/src/assets/img/mountpointSetting/record.png differ diff --git a/src/assets/img/mountpointSetting/save.png b/src/assets/img/mountpointSetting/save.png new file mode 100644 index 0000000..232fae0 Binary files /dev/null and b/src/assets/img/mountpointSetting/save.png differ diff --git a/src/assets/img/msg/msg.png b/src/assets/img/msg/msg.png deleted file mode 100644 index aae75c1..0000000 Binary files a/src/assets/img/msg/msg.png and /dev/null differ diff --git a/src/assets/img/realTimeMsg/mountpointList.png b/src/assets/img/realTimeMsg/mountpointList.png new file mode 100644 index 0000000..80c5fb4 Binary files /dev/null and b/src/assets/img/realTimeMsg/mountpointList.png differ diff --git a/src/assets/img/realTimeMsg/msgList.png b/src/assets/img/realTimeMsg/msgList.png new file mode 100644 index 0000000..65765f4 Binary files /dev/null and b/src/assets/img/realTimeMsg/msgList.png differ diff --git a/src/assets/img/realTimeMsg/originMsgList.png b/src/assets/img/realTimeMsg/originMsgList.png new file mode 100644 index 0000000..8574747 Binary files /dev/null and b/src/assets/img/realTimeMsg/originMsgList.png differ diff --git a/src/assets/img/realTimeMsg/saveButton.png b/src/assets/img/realTimeMsg/saveButton.png new file mode 100644 index 0000000..d5f503b Binary files /dev/null and b/src/assets/img/realTimeMsg/saveButton.png differ diff --git a/src/assets/img/realTimeMsg/saveMsg.png b/src/assets/img/realTimeMsg/saveMsg.png new file mode 100644 index 0000000..7467b71 Binary files /dev/null and b/src/assets/img/realTimeMsg/saveMsg.png differ diff --git a/src/assets/img/realTimeMsg/settings.png b/src/assets/img/realTimeMsg/settings.png new file mode 100644 index 0000000..7e3d119 Binary files /dev/null and b/src/assets/img/realTimeMsg/settings.png differ diff --git a/src/assets/img/realTimeMsg/sourceTable.png b/src/assets/img/realTimeMsg/sourceTable.png new file mode 100644 index 0000000..78e08f2 Binary files /dev/null and b/src/assets/img/realTimeMsg/sourceTable.png differ diff --git a/src/components/guide/guide.vue b/src/components/guide/guide.vue index 59b7442..615c815 100644 --- a/src/components/guide/guide.vue +++ b/src/components/guide/guide.vue @@ -14,7 +14,7 @@ :id="titleId" :class="titleClass" > - 北斗短报文通信服务平台使用帮助 + 高精度定位服务平台使用帮助
- 查看消息 + 实时消息 - 汉字编码 + 查看消息 - 异或校验 + 汉字编码 + 异或校验 + + 单位管理 + + 挂载点设置 +
@@ -82,31 +97,39 @@
- +
- +
- +
+ +
+
+
+ +
+ + diff --git a/src/components/guide/msg.vue b/src/components/guide/msg.vue index a2cda6e..05b5b64 100644 --- a/src/components/guide/msg.vue +++ b/src/components/guide/msg.vue @@ -3,13 +3,6 @@ 查看消息指南：

-
- 实时短报文消息： - 左侧为接收到的实时短报文消息的内容，右侧为接收到实时短报文消息时的时间 - -
-
-
查看历史消息的全部内容： 消息内容过长时，可以点击右侧的“ + + diff --git a/src/components/manager/setMountpoint.vue b/src/components/manager/setMountpoint.vue index 65e6fac..fe66e13 100644 --- a/src/components/manager/setMountpoint.vue +++ b/src/components/manager/setMountpoint.vue @@ -9,7 +9,7 @@ placeholder="请输入挂载点名称" maxlength="100" clearable - @input="handleInputMountpoint(mountpoint, 'save')" + @input="handleInputMountpointFilter(mountpoint, 'save')" />
{ - clearTimeout(timeout.value); - timeout.value = setTimeout(() => { - const isValid = /^[a-zA-Z0-9\-_\.]$/.test(name) && name.length <= 100; - if (type == "save") { - save.value = isValid; - } else if (type == "edit") { - edit.value = isValid; - } - }, 100); +const handleInputMountpointFilter = (value, type) => { + if (type == "save") { + mountpoint.value = value.replace(/[^a-zA-Z0-9\-_\.]/g, ''); + } else if (type == "edit") { + afterEdit.value = value.replace(/[^a-zA-Z0-9\-_\.]/g, ''); + } }; -const handleInputPassword = (name, type) => { - clearTimeout(timeout.value); - timeout.value = setTimeout(() => { - const isValid = /^[a-zA-Z0-9].{8,16}$/.test(name); - if (type == "save") { - save.value = isValid; - } else if (type == "change") { - change.value = isValid; - } - }, 100); + +const handleInputPasswordFilter = (value, type) => { + if (type == "save") { + password.value = value.replace(/[^a-zA-Z0-9]/g, ''); + } else if (type == "edit") { + editPassword.value = value.replace(/[^a-zA-Z0-9]/g, ''); + } }; const clearSave = () => { @@ -340,10 +332,63 @@ const selectMountpoint = (selectedMountpoint) => { beforEdit.value = selectedMountpoint; }; -watch(beforEdit, (value) => { - if (value !== '') { - del.value = false; +const allowCheckSave = () => { + const mountpointValid = /^[a-zA-Z0-9\-_\.]/.test(mountpoint.value); + const passwordValid = /^[a-zA-Z0-9].{7,16}$/.test(password.value); + console.log(mountpointValid, passwordValid) + if (mountpointValid && passwordValid) { + save.value = false; + } else { + save.value = true; } +}; + +watch(mountpoint, (value) => { + allowCheckSave(); +}); + +watch(password, (value) => { + allowCheckSave(); +}); + +const allowCheckEdit = (type) => { + if (type == 'mountpoint') { + const mountpointValid = /^[a-zA-Z0-9\-_\.]/.test(afterEdit.value); + if (beforEdit.value !== '' && mountpointValid) { + edit.value = false; + } else { + edit.value = true; + } + } else if (type == 'password') { + const passwordValid = /^[a-zA-Z0-9].{7,16}$/.test(editPassword.value); + if (beforEdit.value !== '' && passwordValid) { + change.value = false; + } else { + change.value = true; + } + } +}; + +const allowCheckDel = () => { + if (beforEdit.value !== '') { + del.value = false; + } else { + del.value = true; + } +}; + +watch(editPassword, (value) => { + allowCheckEdit('password'); +}); + +watch(afterEdit, (value) => { + allowCheckEdit('mountpoint'); +}); + +watch(beforEdit, (value) => { + allowCheckEdit('password'); + allowCheckEdit('mountpoint'); + allowCheckDel(); }); diff --git a/src/components/operate/realTimeMsg.vue b/src/components/operate/realTimeMsg.vue index fe0bef8..93eb362 100644 --- a/src/components/operate/realTimeMsg.vue +++ b/src/components/operate/realTimeMsg.vue @@ -21,7 +21,7 @@ minlength="8" maxlength="16" clearable - @input="handleInputPassword(password)" + @input="handleInputFilter(password)" />
{ return moment.utc(time).add(8, "hours").format("YYYY-MM-DD-HH:mm:ss"); }; -const handleInputPassword = (name) => { - clearTimeout(timeout.value); - timeout.value = setTimeout(() => { - const isValid = /^[a-zA-Z0-9].{8,16}$/.test(name); - allow.value = !isValid; - }, 100); +const handleInputFilter = (value) => { + password.value = value.replace(/[^a-zA-Z0-9]/g, ''); }; const formatAsExample = (bytes) => { @@ -217,6 +212,7 @@ const formatAsExample = (bytes) => { const clear = () => { mountpoint.value = ""; + password.value = ""; MountpointListRef.value.resetSelect(); }; @@ -357,13 +353,20 @@ const clearMsg = () => { msgList.value = []; }; +const allowCheck = () => { + const isValid = /^[a-zA-Z0-9].{7,16}$/.test(password.value); + if (mountpoint.value !== "" && isValid) { + allowConnect.value = false; + } else { + allowConnect.value = true; + } +}; + defineExpose({ getMountpoint }); watch(mountpoint, (value) => { - if (value == "") { - allowConnect.value = true; - } else { - allowConnect.value = false; + allowCheck(); + if (value !== "") { clearTimeout(timeout.value); timeout.value = setTimeout(() => { const data = { mountpoint: mountpoint.value }; @@ -383,6 +386,10 @@ watch(mountpoint, (value) => { } }); +watch(password, (value) => { + allowCheck(); +}); + watch(() => msgList.value.length, () => { nextTick(() => { const wrap = scrollbarRef.value.$el.querySelector('.el-scrollbar__wrap');