From e3b1d2c9c815ae59d2cbb049c840368e0b27280b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Wed, 10 Jul 2024 17:04:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=8F=8A=E8=8F=9C=E5=8D=95=E7=BC=BA=E5=B0=91=E7=9A=84?= =?UTF-8?q?icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/system.js | 4 +- src/assets/icons/Cost.vue | 13 ++ src/assets/icons/index.js | 1 + src/components/scUpload/uploadListImg.vue | 29 ++-- src/style/app.scss | 2 +- src/views/docsManager/document.vue | 1 + src/views/earlyManager/index.vue | 4 +- src/views/setting/advanced/index.vue | 125 +++++++++++++++++ .../setting/advanced/setup/computerRoom.vue | 24 ++++ src/views/setting/client/index.vue | 1 + src/views/setting/company/index.vue | 13 +- src/views/setting/company/save.vue | 128 +++++++++-------- src/views/setting/deptMag/index.vue | 2 +- src/views/setting/log/index.vue | 130 +++--------------- src/views/setting/partsMag/index.vue | 4 +- src/views/setting/role/index.vue | 2 +- src/views/setting/user/index.vue | 2 +- src/views/setting/warehouse/index.vue | 6 +- src/views/userCenter/index.vue | 2 +- 19 files changed, 292 insertions(+), 201 deletions(-) create mode 100644 src/assets/icons/Cost.vue create mode 100644 src/views/setting/advanced/index.vue create mode 100644 src/views/setting/advanced/setup/computerRoom.vue diff --git a/src/api/model/system.js b/src/api/model/system.js index 85b9d69..9e2170d 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -371,10 +371,10 @@ export default { }, log: { list: { - url: `${config.API_URL}/system/log/list`, + url: `${config.API_URL}/sys.log.list`, name: "日志列表", get: async function (params) { - return await http.get(this.url, params); + return await http.post(this.url, params); }, }, }, diff --git a/src/assets/icons/Cost.vue b/src/assets/icons/Cost.vue new file mode 100644 index 0000000..4b7f7df --- /dev/null +++ b/src/assets/icons/Cost.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 05beda9..5d26759 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -20,6 +20,7 @@ export { default as Password } from './Password.vue' export { default as Secure } from './Secure.vue' export { default as UserLog } from './Log.vue' export { default as WechartRound } from './WechartRound.vue' +export { default as Cost } from './Cost.vue' // 列表按钮 export { default as Delete } from './Delete.vue' diff --git a/src/components/scUpload/uploadListImg.vue b/src/components/scUpload/uploadListImg.vue index e60b8e1..8f68d6c 100644 --- a/src/components/scUpload/uploadListImg.vue +++ b/src/components/scUpload/uploadListImg.vue @@ -8,19 +8,21 @@ :on-error="handleAvatarError" :before-upload="beforeAvatarUpload" > -
-
- -
-
- + +
+
+ +
+
+ +
-
-
-
-
+
+
+
+ @@ -133,6 +135,13 @@ export default { overflow: hidden; height: 80px; transition: var(--el-transition-duration-fast); + + } + .uploadScrollbar :deep(.el-scrollbar__view){ + display: flex; + } + :deep(.el-upload){ + width: 100%; } .avatar-img{ border: none; diff --git a/src/style/app.scss b/src/style/app.scss index 4ac5b0f..e0f1376 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -90,7 +90,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-tags li.active a {color: #409EFF;} .adminui-tags li.sortable-ghost {opacity: 0;} -.adminui-main {background-color: #f6f8f9;height: 100%; flex: 1;padding: 10px;box-sizing: border-box;} +.adminui-main {background-color: #f6f8f9;height: 100%; flex: 1;overflow: hidden;padding: 10px;box-sizing: border-box;} .adminui-main .mainBox{height: calc(100%);overflow: auto;background-color: #FFFFFF;padding: 0 10px;border-radius: 6px;} /*页面最大化*/ diff --git a/src/views/docsManager/document.vue b/src/views/docsManager/document.vue index 4db8cca..a57088a 100644 --- a/src/views/docsManager/document.vue +++ b/src/views/docsManager/document.vue @@ -12,6 +12,7 @@ + diff --git a/src/views/earlyManager/index.vue b/src/views/earlyManager/index.vue index 230810f..11450ab 100644 --- a/src/views/earlyManager/index.vue +++ b/src/views/earlyManager/index.vue @@ -4,7 +4,7 @@
- +
@@ -28,7 +28,7 @@
- + diff --git a/src/views/setting/advanced/index.vue b/src/views/setting/advanced/index.vue new file mode 100644 index 0000000..a7de31c --- /dev/null +++ b/src/views/setting/advanced/index.vue @@ -0,0 +1,125 @@ + + + + diff --git a/src/views/setting/advanced/setup/computerRoom.vue b/src/views/setting/advanced/setup/computerRoom.vue new file mode 100644 index 0000000..844ac3f --- /dev/null +++ b/src/views/setting/advanced/setup/computerRoom.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/views/setting/client/index.vue b/src/views/setting/client/index.vue index d8def39..99238f8 100644 --- a/src/views/setting/client/index.vue +++ b/src/views/setting/client/index.vue @@ -9,6 +9,7 @@ + diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue index 759e274..1dab17c 100644 --- a/src/views/setting/company/index.vue +++ b/src/views/setting/company/index.vue @@ -13,11 +13,11 @@
- +
- +
@@ -34,7 +34,7 @@
- + @@ -96,7 +96,7 @@ export default { selection: [], params: { activation_date: '', - full_name:'', + id:'', active_status:'', } } @@ -197,6 +197,11 @@ export default { this.$refs.table.upData(this.params); }, reset(){ + this.params = { + activation_date: '', + id:'', + active_status:'', + }; this.$refs.table.reload(); }, diff --git a/src/views/setting/company/save.vue b/src/views/setting/company/save.vue index b3ffae5..eb9118d 100644 --- a/src/views/setting/company/save.vue +++ b/src/views/setting/company/save.vue @@ -1,67 +1,73 @@