From f8bf0ba857388111d3946fcece3de46ceccdf81e Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Thu, 7 Mar 2024 09:19:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9:=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=EF=BC=8C=E6=8E=A5?= =?UTF-8?q?=E5=85=A5=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/router/index.js | 13 +++ sgzb-ui/src/store/modules/user.js | 3 + sgzb-ui/src/utils/chapter.js | 12 +-- .../claimAndRefund/receive/receiveApply.vue | 17 +++- .../receive/receiveApplyAdd.vue | 35 +++++++- .../claimAndRefund/receive/receiveExamine.vue | 16 ++-- .../claimAndRefund/receive/receiveManage.vue | 8 +- .../claimAndRefund/return/dialogForm.vue | 2 +- .../claimAndRefund/return/returnExamine.vue | 4 +- sgzb-ui/src/views/dashboard.vue | 22 +++++ sgzb-ui/src/views/login.vue | 6 +- sgzb-ui/src/views/qrCode/qrCode.vue | 16 ++-- .../newBuy/newDevices/newDevicesAccept.vue | 88 +++++++++++-------- .../newBuy/newDevices/newDevicesList.vue | 1 + sgzb-ui/vue.config.js | 12 +-- 15 files changed, 174 insertions(+), 81 deletions(-) create mode 100644 sgzb-ui/src/views/dashboard.vue diff --git a/sgzb-ui/src/router/index.js b/sgzb-ui/src/router/index.js index 449b2f72..fe0ca104 100644 --- a/sgzb-ui/src/router/index.js +++ b/sgzb-ui/src/router/index.js @@ -74,6 +74,19 @@ export const constantRoutes = [ } ] }, + { + path: '/dashboard', + component: Layout, + redirect: 'dashboard', + children: [ + { + path: 'dashboard', + component: () => import('@/views/dashboard'), + name: 'Dashboard', + meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false} + } + ] + }, { path: '/user', component: Layout, diff --git a/sgzb-ui/src/store/modules/user.js b/sgzb-ui/src/store/modules/user.js index 7f8e9270..75583aef 100644 --- a/sgzb-ui/src/store/modules/user.js +++ b/sgzb-ui/src/store/modules/user.js @@ -47,6 +47,7 @@ const user = { let data = res.data setToken(data.access_token) commit('SET_TOKEN', data.access_token) + localStorage.setItem('token', data.access_token) setExpiresIn(data.expires_in) commit('SET_EXPIRES_IN', data.expires_in) resolve() @@ -69,6 +70,7 @@ const user = { let data = res.data setToken(data.access_token) commit('SET_TOKEN', data.access_token) + localStorage.setItem('token', data.access_token) setExpiresIn(data.expires_in) commit('SET_EXPIRES_IN', data.expires_in) resolve() @@ -88,6 +90,7 @@ const user = { // console.log('登录成功1111111') setToken(data.access_token) commit('SET_TOKEN', data.access_token) + localStorage.setItem('token', data.access_token) setExpiresIn(data.expires_in) commit('SET_EXPIRES_IN', data.expires_in) }else{ diff --git a/sgzb-ui/src/utils/chapter.js b/sgzb-ui/src/utils/chapter.js index 3bebf97a..69871a34 100644 --- a/sgzb-ui/src/utils/chapter.js +++ b/sgzb-ui/src/utils/chapter.js @@ -11,23 +11,23 @@ let chapter = (text, companyName) => { context.lineWidth = 3; context.strokeStyle = "#f00"; context.beginPath(); - context.arc(width, height, 90, 0, Math.PI * 2); //宽、高、半径 + context.arc(width, height, 80, 0, Math.PI * 2); //宽、高、半径 context.stroke(); //画五角星 - create5star(context, width, height, 25, "#f00", 0); + create5star(context, width, height, 20, "#f00", 0); // 绘制印章名称 - context.font = "18px 宋体"; + context.font = "14px 宋体"; context.textBaseline = "middle"; //设置文本的垂直对齐方式 context.textAlign = "center"; //设置文本的水平对对齐方式 context.lineWidth = 1; context.strokeStyle = "#f00"; - context.strokeText(text, width, height + 60); + context.strokeText(text, width, height + 50); // 绘制印章单位 context.translate(width, height); // 平移到此位置, - context.font = "21px 宋体"; + context.font = "14px 宋体"; let count = companyName.length; // 字数 let angle = (4 * Math.PI) / (3 * (count - 1)); // 字间角度 let chars = companyName.split(""); @@ -41,7 +41,7 @@ let chapter = (text, companyName) => { } context.save(); - context.translate(70, 0); // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离 + context.translate(65, 0); // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离 context.rotate(Math.PI / 2); // 旋转90度,让字平行于x轴 context.strokeText(c, 0, 0); // 此点为字的中心点 context.restore(); diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue index 48553fd9..e646ba2d 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue @@ -129,7 +129,7 @@ size="mini" type="info" v-if="scope.row.taskStatus==98 || scope.row.taskStatus==99 || scope.row.taskStatus==100" - @click="handleUpdate(scope.row)" + @click="handleUpdate2(scope.row)" >驳回提交 { + return this.handelEchoData(item) + }) + + }, + // 驳回提交 任务详情数据 + async GetTaskDetail2(taskId){ const res = await getLeaseApplyAuditListAll({taskId}) const data = res.rows[0] diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue index 046542fc..d7167f8d 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue @@ -127,10 +127,10 @@
取 消 确 定 - 确 定5 - 确 定7 - 确 定1 - 确 定3 + 确 定 + 确 定 + 确 定 + 确 定
@@ -140,10 +140,10 @@
取 消 确 定 - 确 定6 - 确 定8 - 确 定2 - 确 定4 + 确 定 + 确 定 + 确 定 + 确 定
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue index 658fca90..ba068b22 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue @@ -113,28 +113,28 @@ @click="handleExamine(scope.row)" v-hasPermi="['receive:examine:sgb']" v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='8'||scope.row.leaseApplyInfoList[0].status=='6')" - >施管审批 + >审批 安监审批 + >审批 机具审批 + >审批 调试审批 + >审批
- 打印1 + 打印
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue index 371c4a37..38f2093e 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue @@ -282,7 +282,7 @@ v-if="scope.row.applyStatus == '0'" v-hasPermi="['receive:examine:nbry-jjfgs']" @click="handleUpdate(scope.row, 'update')" - >机具审批审批 调试审批审批 +
+ + + + \ No newline at end of file diff --git a/sgzb-ui/src/views/login.vue b/sgzb-ui/src/views/login.vue index 60b7ab31..db96bdca 100644 --- a/sgzb-ui/src/views/login.vue +++ b/sgzb-ui/src/views/login.vue @@ -249,7 +249,7 @@ export default { } console.log(this.loginForm) this.$store.dispatch("textLogin", this.loginForm).then(() => { - this.$router.push({path: this.redirect || "/"}).catch(() => { + this.$router.push({path:"/"}).catch(() => { }); }).catch(() => { this.loading = false; @@ -268,7 +268,7 @@ export default { // console.log(param) this.$store.dispatch("ssoLogin", param).then(() => { //成功后会跳转页面入首页 - this.$router.push({path: this.redirect || "/"}).catch(() => { + this.$router.push({path:"/"}).catch(() => { }); }).catch(() => { this.loading = false; @@ -300,7 +300,7 @@ export default { Cookies.remove('rememberMe'); } this.$store.dispatch("Login", this.loginForm).then(() => { - this.$router.push({path: this.redirect || "/"}).catch(() => { + this.$router.push({path:"/"}).catch(() => { }); }).catch(() => { this.loading = false; diff --git a/sgzb-ui/src/views/qrCode/qrCode.vue b/sgzb-ui/src/views/qrCode/qrCode.vue index e1183498..bf6799eb 100644 --- a/sgzb-ui/src/views/qrCode/qrCode.vue +++ b/sgzb-ui/src/views/qrCode/qrCode.vue @@ -1,7 +1,7 @@