From c55ca6e6d52254f2acca7af443403fa215c42ded Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 22 五月 2024 17:22:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-report-preparation.vue | 3 ++-
src/components/do/b1-inspect-order-plan/Inspection.vue | 2 +-
src/components/tool/onlyoffice.vue | 1 -
src/components/view/a6-personnel-overview.vue | 2 +-
src/assets/api/controller.js | 3 ++-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 6dfa195..38aa153 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -35,6 +35,7 @@
const user = {
selectUserList: "/user/selectUserList", //鑾峰彇鐢ㄦ埛鍒楄〃
+ selectPersonnelOverview: "/user/selectPersonnelOverview", // 璧勬簮瑕佹眰-浜哄憳鎬昏
selectRoleList: "/role/selectRoleList", //鑾峰彇瑙掕壊鍒楄〃
updateUser: "/user/updateUser", //淇敼鐢ㄦ埛淇℃伅
addUser: "/user/addUser", //娣诲姞鐢ㄦ埛淇℃伅
@@ -50,7 +51,7 @@
addCustom: "/user/addCustom", //鏂板瀹㈡埛淇℃伅
getUserNow: "/user/getUserNow", //鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
getUserInfo: "/user/getUserInfo", //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�
- upUserPassword: "/user/upUserPassword", //淇敼鐢ㄦ埛瀵嗙爜
+ upUserPassword: "/user/upUserPassword", //淇敼鐢ㄦ埛瀵嗙爜
}
const dataReporting = {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index f4e9b58..49302c5 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -320,7 +320,7 @@
</el-drawer>
<el-drawer title="浠诲姟鍒囨崲" :visible.sync="taskVisible" :size="500">
<ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.selectInsOrderPlanList"
- :componentData="componentData" :key="upIndex" style="max-height: 100%;height: inherit;"/>
+ :componentData="componentData" :key="upIndex" style="height: 100%;"/>
</el-drawer>
<el-dialog title="妫�楠屽鏍�" :visible.sync="reviewDia" width="500px">
<div class="body" style="display: flex;padding: 10px;" v-if="reviewDia">
diff --git a/src/components/tool/onlyoffice.vue b/src/components/tool/onlyoffice.vue
index f9865c6..4002dac 100644
--- a/src/components/tool/onlyoffice.vue
+++ b/src/components/tool/onlyoffice.vue
@@ -57,7 +57,6 @@
},
methods: {
async setEditor(option) {
- console.log(`output->option`,option)
if (this.docEditor !== null) {
this.docEditor.destroyEditor();
this.docEditor = null;
diff --git a/src/components/view/a6-personnel-overview.vue b/src/components/view/a6-personnel-overview.vue
index 48f969c..9b7c972 100644
--- a/src/components/view/a6-personnel-overview.vue
+++ b/src/components/view/a6-personnel-overview.vue
@@ -166,7 +166,7 @@
if(this.currentPage==1){
this.loading = true
}
- this.$axios.post(this.$api.user.selectUserList,{
+ this.$axios.post(this.$api.user.selectPersonnelOverview,{
page: {
current: this.currentPage,
size: this.pageSize
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index ffe8dc1..08a3107 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -355,7 +355,8 @@
title: row.entrustCode + ".docx",
lang: 'zh-CN',
isPrint: true,
- user: { id: 1, name: userName},
+ user_id: 1,
+ user_name: userName,
editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + row.entrustCode + ".docx"
}
})
--
Gitblit v1.9.3