From 0af551fe5237507b82718768d48b2bdd9d9b937a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Thu, 29 Aug 2024 16:25:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/AppMain/index.vue | 2 +- src/layout/components/NavBar/index.vue | 2 +- .../Sidebar/components/SidebarMenu.vue | 9 +- .../Sidebar/components/SidebarMenuItem.vue | 2 - src/layout/components/TagsView/index.vue | 5 +- src/styles/variables.scss | 8 +- .../delete-broadband-internet/index.vue | 2 + .../enable-broadband-internet/index.vue | 2 + .../update-broadband-internet-mode/index.vue | 2 + .../index.vue | 2 + .../update-broadband-internet/index.vue | 2 + .../update-broadband-max-number/index.vue | 2 + .../cloud-box/delete-cloud/index.vue | 2 + .../cloud-box/enable-cloud/index.vue | 2 + .../craft-order/iptv/delete-iptv/index.vue | 2 + .../craft-order/iptv/enable-iptv/index.vue | 2 + .../tyslzw/delete-tyslzw/index.vue | 4 +- .../tyslzw/enable-tyslzw/index.vue | 61 ++- .../craft-order/tyslzw/model-tyslzw/index.vue | 488 ++++++++++++++++++ .../craft-order/voip/delete-voip/index.vue | 2 + .../craft-order/voip/enable-voip/index.vue | 2 + .../craft-order/voip/tree-diagram/index.vue | 2 + .../voip/update-voip-password/index.vue | 2 + .../components/WiredIsNotAvailable.vue | 25 +- .../order/components/OrderInfoEdit.vue | 56 +- .../operate/order/components/OrderLog.vue | 4 +- src/views/personal/index.vue | 2 +- src/views/system/user/index.vue | 4 +- 28 files changed, 642 insertions(+), 58 deletions(-) create mode 100644 src/views/craft-order/tyslzw/model-tyslzw/index.vue diff --git a/src/layout/components/AppMain/index.vue b/src/layout/components/AppMain/index.vue index c8017b2..7b5049c 100644 --- a/src/layout/components/AppMain/index.vue +++ b/src/layout/components/AppMain/index.vue @@ -27,7 +27,7 @@ const cachedViews = computed(() => useTagsViewStore().cachedViews); // 缓存页 width: 100%; min-height: calc(100vh - $navbar-height); overflow: hidden; - background-color: var(--el-bg-color-page); + background-color: var(--menu-background); } .hasTagsView .app-main { diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue index 084fdc4..712183e 100644 --- a/src/layout/components/NavBar/index.vue +++ b/src/layout/components/NavBar/index.vue @@ -13,6 +13,6 @@ @apply flex-x-between; height: $navbar-height; - background: var(--el-bg-color); + background: var(--menu-background); } diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue index 3f0cc10..39e9658 100644 --- a/src/layout/components/Sidebar/components/SidebarMenu.vue +++ b/src/layout/components/Sidebar/components/SidebarMenu.vue @@ -64,6 +64,7 @@ function resolvePath(routePath: string) { diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue index 6ab5901..7a5c478 100644 --- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue +++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue @@ -157,7 +157,6 @@ function resolvePath(routePath: string) { .el-sub-menu { overflow: hidden; - & > .el-sub-menu__title { padding: 0 !important; @@ -173,7 +172,6 @@ function resolvePath(routePath: string) { .el-menu--collapse { width: $sidebar-width-collapsed; - .el-sub-menu { & > .el-sub-menu__title { & > span { diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 3cf487a..e1fb44e 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -376,7 +376,8 @@ onMounted(() => { width: 100%; height: 50px; color: #68758e; - background-color: var(--el-bg-color); + background-color: #fcfcfc; + border-radius: 4px; border: 1px solid var(--el-border-color-light); box-shadow: 0 1px 1px var(--el-box-shadow-light); @@ -388,7 +389,7 @@ onMounted(() => { //height: 32px; line-height: 25px; cursor: pointer; - background-color: #fff; + background-color: #fcfcfc; border: 1px solid var(--el-border-color-light); border-radius: 6px; &:hover { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index a2f91de..6f6a3b1 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,11 +1,11 @@ /** 全局SCSS变量 */ :root { - --menu-background: #fff; + --menu-background: #fcfcfc; --menu-text: #68758e; --menu-active-text: var(--el-menu-active-color); --menu-hover: #263445; - --sidebar-logo-background: #000; + --sidebar-logo-background: #fcfcfc; } /** 暗黑主题 */ @@ -21,9 +21,9 @@ $menu-background: var(--menu-background); // 菜单背景色 $menu-text: var(--menu-text); // 菜单文字颜色 $menu-active-text: var(--menu-active-text); // 菜单激活文字颜色 $menu-hover: var(--menu-hover); // 菜单悬停背景色 -$sidebar-logo-background: #fff; // 侧边栏 Logo 背景色 +$sidebar-logo-background: var(--menu-background); // 侧边栏 Logo 背景色 -$sidebar-width: 210px; // 侧边栏宽度 +$sidebar-width: 220px; // 侧边栏宽度 $sidebar-width-collapsed: 54px; // 侧边栏收缩宽度 $navbar-height: 50px; // 导航栏高度 $tags-view-height: 34px; // TagsView 高度 diff --git a/src/views/craft-order/broadband/delete-broadband-internet/index.vue b/src/views/craft-order/broadband/delete-broadband-internet/index.vue index eed7bef..3620772 100644 --- a/src/views/craft-order/broadband/delete-broadband-internet/index.vue +++ b/src/views/craft-order/broadband/delete-broadband-internet/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/broadband/enable-broadband-internet/index.vue b/src/views/craft-order/broadband/enable-broadband-internet/index.vue index 9687e5d..a2ed002 100644 --- a/src/views/craft-order/broadband/enable-broadband-internet/index.vue +++ b/src/views/craft-order/broadband/enable-broadband-internet/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/broadband/update-broadband-internet-mode/index.vue b/src/views/craft-order/broadband/update-broadband-internet-mode/index.vue index 0d80373..49f521d 100644 --- a/src/views/craft-order/broadband/update-broadband-internet-mode/index.vue +++ b/src/views/craft-order/broadband/update-broadband-internet-mode/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/broadband/update-broadband-internet-password/index.vue b/src/views/craft-order/broadband/update-broadband-internet-password/index.vue index 1b9595e..3517e1b 100644 --- a/src/views/craft-order/broadband/update-broadband-internet-password/index.vue +++ b/src/views/craft-order/broadband/update-broadband-internet-password/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/broadband/update-broadband-internet/index.vue b/src/views/craft-order/broadband/update-broadband-internet/index.vue index 53c1f32..8f65fa5 100644 --- a/src/views/craft-order/broadband/update-broadband-internet/index.vue +++ b/src/views/craft-order/broadband/update-broadband-internet/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/broadband/update-broadband-max-number/index.vue b/src/views/craft-order/broadband/update-broadband-max-number/index.vue index 68b1e6b..e281a19 100644 --- a/src/views/craft-order/broadband/update-broadband-max-number/index.vue +++ b/src/views/craft-order/broadband/update-broadband-max-number/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/cloud-box/delete-cloud/index.vue b/src/views/craft-order/cloud-box/delete-cloud/index.vue index 30896e9..f2bbf74 100644 --- a/src/views/craft-order/cloud-box/delete-cloud/index.vue +++ b/src/views/craft-order/cloud-box/delete-cloud/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/cloud-box/enable-cloud/index.vue b/src/views/craft-order/cloud-box/enable-cloud/index.vue index 30756eb..3d928cf 100644 --- a/src/views/craft-order/cloud-box/enable-cloud/index.vue +++ b/src/views/craft-order/cloud-box/enable-cloud/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/iptv/delete-iptv/index.vue b/src/views/craft-order/iptv/delete-iptv/index.vue index f6f94ff..b9935ce 100644 --- a/src/views/craft-order/iptv/delete-iptv/index.vue +++ b/src/views/craft-order/iptv/delete-iptv/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/iptv/enable-iptv/index.vue b/src/views/craft-order/iptv/enable-iptv/index.vue index bc9a546..4943573 100644 --- a/src/views/craft-order/iptv/enable-iptv/index.vue +++ b/src/views/craft-order/iptv/enable-iptv/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/tyslzw/delete-tyslzw/index.vue b/src/views/craft-order/tyslzw/delete-tyslzw/index.vue index 5537881..e577c61 100644 --- a/src/views/craft-order/tyslzw/delete-tyslzw/index.vue +++ b/src/views/craft-order/tyslzw/delete-tyslzw/index.vue @@ -13,7 +13,7 @@
 设备IPTV业务删除工单设备TYSLZW业务删除工单
@@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/tyslzw/enable-tyslzw/index.vue b/src/views/craft-order/tyslzw/enable-tyslzw/index.vue index 37d6baa..2cb992b 100644 --- a/src/views/craft-order/tyslzw/enable-tyslzw/index.vue +++ b/src/views/craft-order/tyslzw/enable-tyslzw/index.vue @@ -37,6 +37,7 @@ @@ -52,6 +53,7 @@ @@ -350,6 +352,34 @@ /> + + + + + + + + + + - + - + @@ -419,6 +455,7 @@ defineOptions({ }); const ruleFormRef = ref(); const loading = ref(false); +const routeShow = ref(false); const formData = ref({ operateRemark: "0", remark3: "4", @@ -426,7 +463,11 @@ const formData = ref({ orderServiceType: "0", serviceName: "TYSLZW", serviceFlag: "A", - list: [{ argsName: "ip_address" }, { argsName: "ip_mask" }], + list: [ + { argsName: "ip_address", argsValue: "" }, + { argsName: "ip_mask", argsValue: "" }, + { argsName: "rg_mode", argsValue: "1" }, + ], }); const rules = reactive>({ @@ -460,6 +501,15 @@ const rulesParams = (): boolean => { } return true; }; +const changRgModel = (value: string) => { + if (value != "0") { + routeShow.value = true; + formData.value.list[0].argsValue = ""; + formData.value.list[1].argsValue = ""; + } else { + routeShow.value = false; + } +}; function loadDomainOptions() { getDomainOptions().then(({ data }) => { domainOptions.value = data; @@ -475,7 +525,10 @@ const loadBasicInfo = () => { const submitForm = async (formEl: FormInstance | undefined) => { if (!formEl) return; await formEl.validate((valid, fields) => { - let flag = rulesParams(); + let flag = true; + if (!routeShow.value) { + flag = rulesParams(); + } if (valid && flag) { confirm("确认手动提交开通TYSLZW工单吗", () => { loading.value = true; diff --git a/src/views/craft-order/tyslzw/model-tyslzw/index.vue b/src/views/craft-order/tyslzw/model-tyslzw/index.vue new file mode 100644 index 0000000..264971e --- /dev/null +++ b/src/views/craft-order/tyslzw/model-tyslzw/index.vue @@ -0,0 +1,488 @@ + + + + + diff --git a/src/views/craft-order/voip/delete-voip/index.vue b/src/views/craft-order/voip/delete-voip/index.vue index 0ef6b22..eedb065 100644 --- a/src/views/craft-order/voip/delete-voip/index.vue +++ b/src/views/craft-order/voip/delete-voip/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/voip/enable-voip/index.vue b/src/views/craft-order/voip/enable-voip/index.vue index 699e6e0..12cd1e0 100644 --- a/src/views/craft-order/voip/enable-voip/index.vue +++ b/src/views/craft-order/voip/enable-voip/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/voip/tree-diagram/index.vue b/src/views/craft-order/voip/tree-diagram/index.vue index 8cb51e1..8157bc2 100644 --- a/src/views/craft-order/voip/tree-diagram/index.vue +++ b/src/views/craft-order/voip/tree-diagram/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/craft-order/voip/update-voip-password/index.vue b/src/views/craft-order/voip/update-voip-password/index.vue index f3d2505..e769c4f 100644 --- a/src/views/craft-order/voip/update-voip-password/index.vue +++ b/src/views/craft-order/voip/update-voip-password/index.vue @@ -36,6 +36,7 @@ > @@ -51,6 +52,7 @@ > diff --git a/src/views/family/operate/fault-management/components/WiredIsNotAvailable.vue b/src/views/family/operate/fault-management/components/WiredIsNotAvailable.vue index 73000c4..4dc274b 100644 --- a/src/views/family/operate/fault-management/components/WiredIsNotAvailable.vue +++ b/src/views/family/operate/fault-management/components/WiredIsNotAvailable.vue @@ -415,7 +415,7 @@ class-name="my-content" width="150px" > - {{ getDhcpResult["IpAddress"] }} + {{ dhcpResult["IpAddress"] }} - {{ getDhcpResult["MacAddress"] }} + {{ dhcpResult["MacAddress"] }} {{ getDhcpResult["AddressSource"] }} + >{{ dhcpResult["AddressSource"] }} ({}); const lan = ref({}); const loading = ref(false); const loadingPing = ref(false); +const dhcpResult = ref({}); const getServiceDetailInfo = (remote: string) => { loading.value = true; faultServiceStatus(prop.devId, remote) @@ -526,6 +527,7 @@ const getServiceDetailInfo = (remote: string) => { break; case "LanActiveQuery": lan.value = data; + getDhcpResult(); break; } }) @@ -547,29 +549,28 @@ function getLanValue(index?: string) { } } } -// eslint-disable-next-line vue/return-in-computed-property -const getDhcpResult = computed(() => { + +const getDhcpResult = () => { let active = lan.value["Active"]; let addressSource = lan.value["AddressSource"]; let ipAddress = lan.value["ipAddress"]; let macAddress = lan.value["MACAddress"]; if (active === undefined) { - return { IpAddress: "", MacAddress: "", AddressSource: "" }; + return; } let tmpIpAddress: string[] = ipAddress.split("#"); let tmpMacAddress: string[] = macAddress.split("#"); let tmpAddressSource: string[] = addressSource.split("#"); let tmpActive: string[] = active.split("#"); + for (let i = 0; i < tmpActive.length; i++) { if (tmpActive[i] === "true" && tmpAddressSource[i] === "DHCP") { - return { - IpAddress: tmpIpAddress[i], - MacAddress: tmpMacAddress[i], - AddressSource: tmpAddressSource[i], - }; + dhcpResult.value["IpAddress"] = tmpIpAddress[i]; + dhcpResult.value["MacAddress"] = tmpMacAddress[i]; + dhcpResult.value["AddressSource"] = tmpAddressSource[i]; } } -}); +}; const getPingResult = (remote: string) => { loadingPing.value = true; pingDNSResult(prop.devId, remote) diff --git a/src/views/family/operate/order/components/OrderInfoEdit.vue b/src/views/family/operate/order/components/OrderInfoEdit.vue index 2f12de1..6248c5a 100644 --- a/src/views/family/operate/order/components/OrderInfoEdit.vue +++ b/src/views/family/operate/order/components/OrderInfoEdit.vue @@ -37,8 +37,18 @@ v-hasPerm="['order:detail:update']" >修改 - 设备操作维护 - 工单日志 + 设备操作维护 + 工单日志 @@ -186,26 +196,26 @@ > {{ orderInfo.pppoeAccount }} - - {{ orderInfo.bandAccess }} - - - {{ orderInfo.iptvAccess }} - + + + + + + + + + + + + + + + + + + + + {