From 57b22361dcc2937d994d99917f560e942fc5f64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Fri, 29 Dec 2023 10:31:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device-manage/index.vue | 2 ++ src/views/edit/edit.vue | 4 +++- src/views/site/index.vue | 39 ++++++++++++++++++++++--------- src/views/tunnel-manage/index.vue | 18 +++++++++++--- src/views/user/index.vue | 27 ++++++++++++++++----- 5 files changed, 69 insertions(+), 21 deletions(-) diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue index bb2e07e..b06bcb9 100644 --- a/src/views/device-manage/index.vue +++ b/src/views/device-manage/index.vue @@ -484,6 +484,8 @@ const handleEditFan = () => { if (res.code === 1000) { ElMessage.success('修改成功') router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId) + }else { + ElMessage.error(res.msg) } }) } diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue index 75c3adc..cba5b8a 100644 --- a/src/views/edit/edit.vue +++ b/src/views/edit/edit.vue @@ -90,12 +90,14 @@ const handleSave = async () => { constructionLength: 500, tunnelLength: form.value.totalLength, isDefault: form.value.isDefault, - tunnelThreeConfig: JSON.stringify(await store.getEquipmentList()) + modelEquipmentList:await store.getEquipmentList() } editTunnel(data).then((res) => { if (res?.code === 1000) { ElMessage.success(res.msg) router.push('/tunnel/' + form.value.siteId+'/'+type+'/'+userId) + }else { + ElMessage.error(res.msg) } }); } diff --git a/src/views/site/index.vue b/src/views/site/index.vue index 5e31090..bfdfa48 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -93,11 +93,11 @@ @@ -146,6 +146,7 @@ const info = ref({ }) const title = ref('新增站点') const isVisited = ref(false); +const showFirst = ref(true) const total = ref(10); const showAddIcon = ref(true) const pageInfo = reactive({ @@ -164,11 +165,12 @@ const formRules = ref({ const formInstance = ref() const getList = () => { getSiteList({ - userId:userId, + // userId:userId, ...pageInfo }).then((res) => { total.value = res.data.total; showAddIcon.value = total.value % 6!==0; + showFirst.value = total.value / pageInfo.pageSize >= 1; res.data.rows.map(item => { if (item.tunnelList === null || item.tunnelList.length === 0) { item.info = info.value @@ -234,15 +236,23 @@ const handleSubmit = (instance) => { if (!valid) return if (title.value === '编辑站点') { editSite(form.value).then((res) => { - isVisited.value = false - getList() - ElMessage.success(res.msg) + if(res.code===1000){ + isVisited.value = false + getList() + ElMessage.success(res.msg) + }else { + ElMessage.warning(res.msg) + } }); } else { addSite(form.value).then((res) => { - isVisited.value = false - getList() - ElMessage.success(res.msg) + if(res.code===1000){ + isVisited.value = false + getList() + ElMessage.success(res.msg) + }else { + ElMessage.warning(res.msg) + } }); } }) @@ -290,7 +300,14 @@ const handleMoreDelete = () => { } } } - +const firstPage=()=>{ + pageInfo.pageNum = 1 + getList() +} +const lastPage=()=>{ + pageInfo.pageNum = total.value/pageInfo.pageSize + getList() +} //点击页码进行分页功能 const handleCurrentChange = (val) => { pageInfo.pageNum = val diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue index b3750d8..f0772c5 100644 --- a/src/views/tunnel-manage/index.vue +++ b/src/views/tunnel-manage/index.vue @@ -96,11 +96,11 @@ @@ -120,6 +120,7 @@ const formRules = ref({ tunnelName: [{required: true, message: '请输入隧道名称', trigger: 'blur'}], serialNumber: [{required: true, message: '请输入序列号', trigger: 'blur'}] }) +const showFirst = ref(true) const formInstance = ref() const tunnelList = ref([ { @@ -278,10 +279,19 @@ const getList = () => { if (res.code === 1000) { total.value = res.data.total tunnelList.value = res.data.rows + showFirst.value = total.value / pageInfo.pageSize >= 1; } }) } getList() +const firstPage=()=>{ + pageInfo.pageNum = 1 + getList() +} +const lastPage=()=>{ + pageInfo.pageNum = total.value/pageInfo.pageSize + getList() +} //点击页码进行分页功能 const handleCurrentChange = (val) => { pageInfo.pageNum = val @@ -303,6 +313,8 @@ const handleSubmit = (instance) => { ElMessage.success('新增成功') getList() isVisited.value = false + }else { + ElMessage.warning(res.msg) } }) } else { diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 057f1b9..9c4a4ec 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -112,11 +112,11 @@ @@ -135,12 +135,13 @@ const siteId = reactive(router.currentRoute.value.params.siteId) const tunnelIndex = ref() const username = ref() const userIds = ref() +const showFirst = ref(true) const currentSite = ref() const formInstance = ref() const userData = ref([]) const pageInfo = reactive({ pageNum: 1, - pageSize: 6 + pageSize: 10 }); const total = ref(10); const isVisited = ref(false); @@ -224,16 +225,30 @@ getRoleOptionInfo() const getInfo = () => { getUser({ siteId: siteId, - userName: username.value + userName: username.value, + ...pageInfo }).then(res => { if (res.code === 1000) { - console.log('res', res) userData.value = res.data.rows total.value = res.data.total + showFirst.value = total.value / pageInfo.pageSize >= 1; } }) } getInfo() +const firstPage=()=>{ + pageInfo.pageNum = 1 + getInfo() +} +const lastPage=()=>{ + pageInfo.pageNum = total.value/pageInfo.pageSize + getInfo() +} +//点击页码进行分页功能 +const handleCurrentChange = (val) => { + pageInfo.pageNum = val + getInfo() +} const handleSubmit = async (formInstance) => { if (!formInstance) return; formInstance.validate(async (valid) => { From a473317022193cfcc18c5e1d315c92d7c5607658 Mon Sep 17 00:00:00 2001 From: dengj <209192648@qq.com> Date: Fri, 29 Dec 2023 13:06:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 2 + src/views/site/index.vue | 14 ++- src/views/tunnel-manage/index.vue | 10 +- src/views/user/index.vue | 161 +++++++++++++++++------------- 4 files changed, 116 insertions(+), 71 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index b8ac2d9..56a2938 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -47,6 +47,8 @@ const authStore = useAuthStore(); const loginForm = reactive({ username: "admin", password: "123456", + // username: "", + // password: "", code: "", uuid: "", }); diff --git a/src/views/site/index.vue b/src/views/site/index.vue index bfdfa48..3f7b6b3 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -165,12 +165,12 @@ const formRules = ref({ const formInstance = ref() const getList = () => { getSiteList({ - // userId:userId, + userId:userId, ...pageInfo }).then((res) => { total.value = res.data.total; showAddIcon.value = total.value % 6!==0; - showFirst.value = total.value / pageInfo.pageSize >= 1; + showFirst.value = total.value / pageInfo.pageSize > 1; res.data.rows.map(item => { if (item.tunnelList === null || item.tunnelList.length === 0) { item.info = info.value @@ -188,7 +188,6 @@ const handleClickSite = (type) => { if (type.checked) { siteIds.value.push(type.siteId) siteNameList.value.push(type.siteName) - } else { siteIds.value.map((item, index) => { if (item === type.siteId) { @@ -260,6 +259,15 @@ const handleSubmit = (instance) => { const handleChooseAll=()=>{ siteList.value.map(item=>{ item.checked=!item.checked + if(item.checked&&!item.isDefault){ + siteIds.value.push(item.siteId) + }else if(!item.checked&&!item.isDefault){ + siteIds.value.map((newItem, index) => { + if (newItem === item.siteId) { + siteIds.value.splice(index, 1) + } + }) + } }) } const handleMoreDelete = () => { diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue index f0772c5..3a0196d 100644 --- a/src/views/tunnel-manage/index.vue +++ b/src/views/tunnel-manage/index.vue @@ -269,7 +269,6 @@ const handleGoSiteOrIndex = () => { } else if (type === 'i') { router.push('/') } - } const getList = () => { getTunnelList({ @@ -333,6 +332,15 @@ const handleGoToEditTunnel = (tunnelId) => { const handleChooseAll = () => { tunnelList.value.map(item => { item.checked = !item.checked + if(item.checked&&!item.isDefault){ + tunnelIds.value.push(item.tunnelId) + }else if(!item.checked&&!item.isDefault){ + tunnelIds.value.map((newItem, index) => { + if (newItem === item.tunnelId) { + tunnelIds.value.splice(index, 1) + } + }) + } }) } const handleEditDevice = (tunnelId) => { diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 9c4a4ec..64df85d 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -10,9 +10,9 @@ -
- 删除 -
+ + +
@@ -24,12 +24,18 @@ v-model="username" clearable placeholder="输入搜索内容" + @clear="getInfo" />
搜索
用户管理
-
添加用户
+
+
添加用户
+
+ 删除 +
+
{{ currentSite }}如果需要切换站点,请返回首屏切换
- - + + - - + + + + + - - - + -.current-site{ - font-size: 38px;color: #FFFFFF; +:deep(.el-input .el-input__password) { + font-size: 60px; +} + +:deep(.el-input__clear) { + font-size: 40px; +} + +.current-site { + font-size: 41px; + color: #FFFFFF; margin-top: 12px; - >span{ - font-size: 30px!important; - color: darkgray!important; + + > span { + font-size: 38px !important; + color: darkgray !important; margin-left: 20px; + } } -} + :deep(.el-table__header-wrapper .el-checkbox) { display: none } @@ -390,31 +415,32 @@ const handleSelect = async (selection, row) => { } } - .all-del-btn { - display: flex; - .del-btn { - width: 168px; - height: 60px; - background: #08B7B8; - border-radius: 11px; - } + } - .all-btn { - cursor: pointer; - padding-left: 53px; - width: 178px; - height: 70px; - line-height: 70px; - border-radius: 11px; - border: 2px solid #08B7B8; - color: #FFFFFF; - font-size: 38px; + .all-del-btn { + display: flex; - &:last-child { - margin-left: 40px; - margin-right: 70px; - } + .del-btn { + width: 168px; + height: 60px; + background: #08B7B8; + border-radius: 11px; + } + + .all-btn { + cursor: pointer; + padding-left: 53px; + width: 178px; + height: 70px; + line-height: 70px; + border-radius: 11px; + border: 2px solid #08B7B8; + color: #FFFFFF; + font-size: 38px; + + &:last-child { + margin-left: 40px; } } } @@ -433,7 +459,7 @@ const handleSelect = async (selection, row) => { border-radius: 20px; border: 2px solid #05FEFF; box-sizing: border-box; - padding: 73px 98px; + padding: 73px 58px; .user-top { width: 100%; @@ -452,14 +478,15 @@ const handleSelect = async (selection, row) => { .add-btn { cursor: pointer; - width: 170px; - height: 60px; - line-height: 60px; + width: 180px; + height: 70px; + line-height: 70px; background: #08B7B8; border-radius: 6px; color: #FFFFFF; - font-size: 35px; + font-size: 38px; padding-left: 19px; + //margin-left: 20px; } .search-box { @@ -467,25 +494,25 @@ const handleSelect = async (selection, row) => { :deep(.el-button) { width: 140px; - height: 60px; + height: 70px; background: #08B7B8; border-radius: 6px; border: none; - font-size: 35px; + font-size: 38px; color: #FFFFFF; } :deep(.el-input__wrapper) { - width: 292px; - height: 60px; + width: 300px; + height: 70px; border-radius: 6px; border: 1px solid #05FEFF; background-color: transparent; - font-size: 35px; + font-size: 38px; .el-input__inner { - height: 60px; - line-height: 60px; + height: 70px; + line-height: 70px; color: #FFFFFF; } } @@ -493,7 +520,7 @@ const handleSelect = async (selection, row) => { } :deep(.el-table--fit) { - width: 2000px !important; + width: 2110px !important; } :deep(.cell) {