diff --git a/package-lock.json b/package-lock.json
index 073d3ea10..b6a850b01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
"jquery": "^3.5.1",
"js-base64": "^2.6.2",
"moment": "^2.29.1",
+ "qs": "latest",
"sortablejs": "^1.14.0",
"v-charts": "^1.19.0",
"vant": "^2.12.36",
@@ -27,6 +28,7 @@
"vue": "^2.6.11",
"vue-clipboard2": "^0.3.1",
"vue-contextmenujs": "^1.3.13",
+ "vue-custom-scrollbar": "^1.4.4",
"vue-i18n": "^8.22.4",
"vue-router": "^3.2.0",
"vuex": "^3.4.0"
@@ -12870,6 +12872,11 @@
"node": ">=0.12"
}
},
+ "node_modules/perfect-scrollbar": {
+ "version": "1.5.5",
+ "resolved": "https://registry.npmmirror.com/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
+ "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
+ },
"node_modules/performance-now": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -13528,7 +13535,6 @@
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
- "dev": true,
"engines": {
"node": ">=0.6"
}
@@ -15896,6 +15902,15 @@
"resolved": "https://registry.npm.taobao.org/vue-contextmenujs/download/vue-contextmenujs-1.3.13.tgz",
"integrity": "sha1-O9rgI8e9QgleeNpCWAACUNUKuO8="
},
+ "node_modules/vue-custom-scrollbar": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmmirror.com/vue-custom-scrollbar/-/vue-custom-scrollbar-1.4.4.tgz",
+ "integrity": "sha512-GKXEmLgUpH0Z+l4Y1TChgLpcKWXqdOOelfssuQakhPy/vvA4b5tqbWdvitCu1+zJlv+5vHa8BrUhlz1gJuZHgQ==",
+ "dependencies": {
+ "perfect-scrollbar": "^1.5.3",
+ "vue": "^2.6.11"
+ }
+ },
"node_modules/vue-hot-reload-api": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
@@ -27628,6 +27643,11 @@
"sha.js": "^2.4.8"
}
},
+ "perfect-scrollbar": {
+ "version": "1.5.5",
+ "resolved": "https://registry.npmmirror.com/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
+ "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
+ },
"performance-now": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -28179,8 +28199,7 @@
"qs": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
- "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
- "dev": true
+ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
},
"query-string": {
"version": "4.3.4",
@@ -30191,6 +30210,15 @@
"resolved": "https://registry.npm.taobao.org/vue-contextmenujs/download/vue-contextmenujs-1.3.13.tgz",
"integrity": "sha1-O9rgI8e9QgleeNpCWAACUNUKuO8="
},
+ "vue-custom-scrollbar": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmmirror.com/vue-custom-scrollbar/-/vue-custom-scrollbar-1.4.4.tgz",
+ "integrity": "sha512-GKXEmLgUpH0Z+l4Y1TChgLpcKWXqdOOelfssuQakhPy/vvA4b5tqbWdvitCu1+zJlv+5vHa8BrUhlz1gJuZHgQ==",
+ "requires": {
+ "perfect-scrollbar": "^1.5.3",
+ "vue": "^2.6.11"
+ }
+ },
"vue-hot-reload-api": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
diff --git a/package.json b/package.json
index b06a0849d..49df7c2c9 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
- "build": "vue-cli-service build"
+ "build": "vue-cli-service build",
+ "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
},
"dependencies": {
"@antv/g6": "^4.3.6",
@@ -19,6 +20,7 @@
"jquery": "^3.5.1",
"js-base64": "^2.6.2",
"moment": "^2.29.1",
+ "qs": "latest",
"sortablejs": "^1.14.0",
"v-charts": "^1.19.0",
"vant": "^2.12.36",
@@ -26,10 +28,12 @@
"vue": "^2.6.11",
"vue-clipboard2": "^0.3.1",
"vue-contextmenujs": "^1.3.13",
+ "vue-custom-scrollbar": "^1.4.4",
"vue-i18n": "^8.22.4",
"vue-router": "^3.2.0",
"vuex": "^3.4.0",
- "qs": "latest"
+ "increase-memory-limit": "^1.0.3",
+ "cross-env": "^5.0.5"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/src/assets/images/shangqi/img/none-file-new.png b/src/assets/images/shangqi/img/none-file-new.png
new file mode 100644
index 000000000..a9bb2f1ca
Binary files /dev/null and b/src/assets/images/shangqi/img/none-file-new.png differ
diff --git a/src/assets/styles/drawer.less b/src/assets/styles/drawer.less
index 49276d4e8..efd0a0a7f 100644
--- a/src/assets/styles/drawer.less
+++ b/src/assets/styles/drawer.less
@@ -14,13 +14,14 @@
}
.el-drawer__body{
height: 100%;
- overflow-y: auto;
+ //overflow-y: auto;
display: flex;
flex-direction: column;
// 底部带 提交、取消按钮
.demo-drawer-content{
padding: 0 19px;
//height: calc(~'100% - 50px');
+ height: 85%;
overflow-y: auto;
flex: auto;
display: flex;
@@ -98,7 +99,7 @@
//bottom: 0;
//left: 0;
padding: 0 20px;
- height: 50px;
+ height: 13%;
line-height: 50px;
border-top: 1px solid #e8e8e8;
text-align: right;
diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js
index e37b74634..3ba12d3d4 100644
--- a/src/common/axiosV2/index.js
+++ b/src/common/axiosV2/index.js
@@ -63,7 +63,7 @@ service.interceptors.response.use(
// ignored
}
}
- if(res.data && res.data.respCode != undefined && res.data.respCode === 'LE505'){
+ if(res.data && res.data.respCode !== undefined && res.data.respCode === 'LE505'){
if (isMobile()) {
localStorage.removeItem('token')
return router.push('/phoneIndex')
diff --git a/src/main.js b/src/main.js
index 1f4539da8..bbfabb5ec 100644
--- a/src/main.js
+++ b/src/main.js
@@ -179,7 +179,13 @@ router.beforeEach(function (to, from, next) {
}
}
}else {
- next()
+ // 区分手机端首页 单独逻辑处理 token 为空 跳回验证页面重新验证
+ if(fromName === 'databaseSearch' || fromName === 'standDynamics' ||
+ fromName === 'domesticStand' || fromName === 'domesticDetails'){
+ next('/loginVerifyPhone')
+ }else {
+ next()
+ }
}
} else {
if (toName.slice(0,5) !== 'phone') {
diff --git a/src/pages/config/pages/operationLog/index.vue b/src/pages/config/pages/operationLog/index.vue
index 4427212de..882b2d19a 100644
--- a/src/pages/config/pages/operationLog/index.vue
+++ b/src/pages/config/pages/operationLog/index.vue
@@ -72,6 +72,14 @@
v-btn-permission="'c8605037fd040fd480b052d6e9dd8d13'"
>清空
+
+ 导出
+
+
@@ -118,14 +126,32 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
>
+
+
+
+
+
+
+
+
+