From 1c6d8e34c9df3820feb401d8652e3f422426b2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Thu, 28 Nov 2024 23:14:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=97=AE=E9=A2=98=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 16 +- src/api/model/customer.js | 10 +- src/components/scCustomer/index.vue | 2 +- src/components/scUpload/uploadListImg.vue | 1 + src/config/table.js | 4 +- src/layout/components/userbar.vue | 80 ++++++---- src/router/systemRouter.js | 16 -- src/style/app.scss | 1 + src/views/maintenance/index.vue | 9 +- src/views/maintenance/mainView.vue | 19 ++- .../personalCenter/components/feedback.vue | 137 +++++++++++++++- .../components/feedbackDetail.vue | 114 +++++++++++++ .../personalCenter/components/problem.vue | 12 +- .../components/uploadListFile.vue | 150 ++++++++++++++++++ src/views/personalCenter/index.vue | 1 + src/views/serveView/components/commonPage.vue | 84 ++++++---- src/views/serveView/components/footerPage.vue | 43 ++--- src/views/serveView/index.vue | 1 + src/views/service/infoQuery.vue | 2 +- src/views/setting/warehouse/index.vue | 2 +- 21 files changed, 578 insertions(+), 128 deletions(-) create mode 100644 src/views/personalCenter/components/feedbackDetail.vue create mode 100644 src/views/personalCenter/components/uploadListFile.vue diff --git a/.env.development b/.env.development index f23d845..295b339 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ NODE_ENV = development # 标题 -VUE_APP_TITLE = 隆姿集团 +VUE_APP_TITLE = 天姿集团 # 象纬云科 # 接口地址 diff --git a/.env.production b/.env.production index 3198248..6f8ae33 100644 --- a/.env.production +++ b/.env.production @@ -5,15 +5,15 @@ NODE_ENV = production VUE_APP_TITLE = 象纬云科 # 测试环境 -# VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1 -# VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1 -# VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss -# VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss + VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1 + VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1 + VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss + VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss # 线上环境 # 接口地址 # WS地址 - VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1 - VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1 - VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss - VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss +# VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1 +# VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1 +# VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss +# VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss diff --git a/src/api/model/customer.js b/src/api/model/customer.js index 397ad1b..da5e764 100644 --- a/src/api/model/customer.js +++ b/src/api/model/customer.js @@ -103,9 +103,17 @@ export default { }, orderMyList:{ url: `${config.API_URL}/customer.work.order.my.list`, - name: "我的工单", + name: "我的问题工单", + post: async function(data){ + return await http.post(this.url, data); + } + }, + workOrderInfo:{ + url: `${config.API_URL}/customer.work.order.info`, + name: "问题工单详情", post: async function(data){ return await http.post(this.url, data); } } + } diff --git a/src/components/scCustomer/index.vue b/src/components/scCustomer/index.vue index 19e5943..f209071 100644 --- a/src/components/scCustomer/index.vue +++ b/src/components/scCustomer/index.vue @@ -378,7 +378,7 @@ export default { const wrap = this.$refs.scrollbar; if(wrap){ const e = wrap.$el.querySelector('.el-scrollbar__wrap') - if(e && e.scrollTop){ + if(e){ e.scrollTop = e.scrollHeight; } } diff --git a/src/components/scUpload/uploadListImg.vue b/src/components/scUpload/uploadListImg.vue index 1ba8b13..89ccdc6 100644 --- a/src/components/scUpload/uploadListImg.vue +++ b/src/components/scUpload/uploadListImg.vue @@ -64,6 +64,7 @@ export default { this.num = val; } }, + immediate: true, deep:true } }, diff --git a/src/config/table.js b/src/config/table.js index 381b38e..01143c4 100644 --- a/src/config/table.js +++ b/src/config/table.js @@ -4,8 +4,8 @@ import http from "@/utils/request"; export default { successCode: 200, //请求完成代码 - pageSize: 30, //表格每一页条数 - pageSizes: [10, 20, 30, 40, 50], //表格可设置的一页条数 + pageSize: 100, //表格每一页条数 + pageSizes: [30, 50, 100, 150, 200, 300], //表格可设置的一页条数 paginationLayout: "total, sizes, prev, pager, next, jumper", //表格分页布局，可设置"total, sizes, prev, pager, next, jumper" parseData: function (res) { //数据分析 return { diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index 1f207ef..433540d 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -54,7 +54,7 @@ - +
{{ userNameF }} @@ -81,10 +81,10 @@
{{userInfo.company_info && userInfo.company_info.full_name?userInfo.company_info.full_name:''}}
- - 帐号信息 - 清除缓存 - +
+
帐号信息
+
清除缓存
+
退出登录
@@ -152,30 +152,30 @@ methods: { //个人信息 handleUser(command) { - if (command == "uc") { - this.$router.push({ path: '/user/center' }); - } if (command == "cmd") { this.$router.push({ path: '/cmd' }); } - if (command == "clearCache") { - this.$confirm('清除缓存会将系统初始化，包括登录状态、主题、语言设置等，是否继续？', '警告', { - type: 'warning', - }).then(async () => { - const loading = this.$loading() - const res = await this.$API.system.user.logout.post(); - if (res.code == 200) { - this.$TOOL.data.clear() - this.$router.replace({path: '/login'}); - setTimeout(() => { - loading.close() - location.reload() - }, 1000) - } - }).catch(() => { - //取消 - }) - } + }, + linkUser(){ + this.$router.push({ path: '/user/center' }); + }, + clearCache(){ + this.$confirm('清除缓存会将系统初始化，包括登录状态、主题、语言设置等，是否继续？', '警告', { + type: 'warning', + }).then(async () => { + const loading = this.$loading() + const res = await this.$API.system.user.logout.post(); + if (res.code == 200) { + this.$TOOL.data.clear() + this.$router.replace({path: '/login'}); + setTimeout(() => { + loading.close() + location.reload() + }, 1000) + } + }).catch(() => { + //取消 + }) }, loginOut(){ this.$confirm('确认是否退出当前用户？', '警告', { @@ -244,7 +244,7 @@ } - diff --git a/src/router/systemRouter.js b/src/router/systemRouter.js index dcf2e46..eba6aeb 100644 --- a/src/router/systemRouter.js +++ b/src/router/systemRouter.js @@ -51,14 +51,6 @@ const routes = [ title: "重置密码" } }, - { - path: "/serve", - component: () => import(/* webpackChunkName: "serveView" */ '@/views/serveView'), - meta: { - title: "信息服务" - }, - tokenShow:true - }, { path: "/maintenance", component: () => import(/* webpackChunkName: "serveView" */ '@/views/maintenance'), @@ -67,14 +59,6 @@ const routes = [ }, tokenShow:true }, - { - path: "/personalCenter", - component: () => import(/* webpackChunkName: "personalCenter" */ '@/views/personalCenter'), - meta: { - title: "个人中心" - }, - tokenShow:true - }, ] export default routes; diff --git a/src/style/app.scss b/src/style/app.scss index c0e4668..6c4fb53 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -121,3 +121,4 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo } /*定宽页面*/ .sc-page {width: 1230px;margin: 0 auto;} + diff --git a/src/views/maintenance/index.vue b/src/views/maintenance/index.vue index 6236d34..8081333 100644 --- a/src/views/maintenance/index.vue +++ b/src/views/maintenance/index.vue @@ -6,15 +6,16 @@ - + + + - diff --git a/src/views/personalCenter/components/feedbackDetail.vue b/src/views/personalCenter/components/feedbackDetail.vue new file mode 100644 index 0000000..a5f3980 --- /dev/null +++ b/src/views/personalCenter/components/feedbackDetail.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/views/personalCenter/components/problem.vue b/src/views/personalCenter/components/problem.vue index 2c531ca..56b0a13 100644 --- a/src/views/personalCenter/components/problem.vue +++ b/src/views/personalCenter/components/problem.vue @@ -14,6 +14,10 @@ + + +

请将图片拖到此处，或点击上传PNG、JPEG

+ @@ -37,7 +41,7 @@ export default { type:"", serial_number:"", purchase_time:"", - attachment:"", + attachment:[], remark:"" }, rules:{ @@ -63,6 +67,9 @@ export default { this.typeList = res.data; } }, + faultParentParams(item){ + this.form.attachment = item; + }, save(){ this.$refs.form.validate(async (valid) => { if (valid) { @@ -75,9 +82,10 @@ export default { type:"", serial_number:"", purchase_time:"", - attachment:"", + attachment:[], remark:"" } + this.$refs.form.resetFields(); } }else{ return false; diff --git a/src/views/personalCenter/components/uploadListFile.vue b/src/views/personalCenter/components/uploadListFile.vue new file mode 100644 index 0000000..0296dcd --- /dev/null +++ b/src/views/personalCenter/components/uploadListFile.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/src/views/personalCenter/index.vue b/src/views/personalCenter/index.vue index 03a46ba..ee06ddd 100644 --- a/src/views/personalCenter/index.vue +++ b/src/views/personalCenter/index.vue @@ -108,6 +108,7 @@ export default { } .pageRight{ flex: 1; + overflow: hidden; } } diff --git a/src/views/serveView/components/commonPage.vue b/src/views/serveView/components/commonPage.vue index bc55571..15b2e3e 100644 --- a/src/views/serveView/components/commonPage.vue +++ b/src/views/serveView/components/commonPage.vue @@ -33,7 +33,7 @@
- +
{{ userNameF }} @@ -56,10 +56,10 @@
{{userInfo.mobile}}
- - 帐号信息 - 清除缓存 - +
+
帐号信息
+
清除缓存
+
退出登录
@@ -110,30 +110,6 @@ export default { }, methods:{ - //个人信息 - handleUser(command) { - if (command == "uc") { - eventBus.$emit('headerRouterBack',{name:'personalCenter'}); - } - if (command == "clearCache") { - this.$confirm('清除缓存会将系统初始化，包括登录状态、主题、语言设置等，是否继续？', '警告', { - type: 'warning', - }).then(async () => { - const loading = this.$loading() - const res = await this.$API.system.user.logout.post(); - if (res.code == 200) { - this.$TOOL.data.clear() - this.$router.replace({path: '/login'}); - setTimeout(() => { - loading.close() - location.reload() - }, 1000) - } - }).catch(() => { - //取消 - }) - } - }, serverQuery(command){ eventBus.$emit('headerRouterBack',{name:'serveView'}); if (command == "termQuery") { @@ -146,6 +122,28 @@ export default { eventBus.$emit('queryBack',{name:'order'}); } }, + linkUser(){ + this.$refs.userDropdown.handleClose(); + eventBus.$emit('headerRouterBack',{name:'personalCenter'}); + }, + clearCache(){ + this.$confirm('清除缓存会将系统初始化，包括登录状态、主题、语言设置等，是否继续？', '警告', { + type: 'warning', + }).then(async () => { + const loading = this.$loading() + const res = await this.$API.system.user.logout.post(); + if (res.code == 200) { + this.$TOOL.data.clear() + this.$router.replace({path: '/login'}); + setTimeout(() => { + loading.close() + location.reload() + }, 1000) + } + }).catch(() => { + //取消 + }) + }, loginOut(){ this.$confirm('确认是否退出当前用户？', '警告', { type: 'warning', @@ -169,7 +167,7 @@ export default { } - diff --git a/src/views/serveView/components/footerPage.vue b/src/views/serveView/components/footerPage.vue index c69dfae..26c701e 100644 --- a/src/views/serveView/components/footerPage.vue +++ b/src/views/serveView/components/footerPage.vue @@ -1,24 +1,24 @@