From 8e728528dee37e116d7e843ef383438e03cef43f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Mon, 19 Sep 2022 14:47:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 21 +++++++++++++++ package.json | 1 + public/js/config.js | 2 +- src/assets/js/http.js | 4 +-- src/pages/index/index.js | 2 ++ src/store/index.js | 8 +++--- src/views/home/login_v1.vue | 26 +++++++++++++++++-- .../projectAdmin/zjsj/security/centerTop.vue | 2 +- yarn.lock | 9 ++++++- 9 files changed, 64 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b804c47..14ab19d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,6 +37,7 @@ "vue-count-to": "^1.0.13", "vue-cropper": "^0.5.5", "vue-matomo": "^4.1.0", + "vue-monoplasty-slide-verify": "^1.3.1", "vue-photo-preview": "^1.1.3", "vue-router": "^3.2.0", "vue-seamless-scroll": "^1.1.23", @@ -16928,6 +16929,18 @@ "npm": ">= 3.0.0" } }, + "node_modules/vue-monoplasty-slide-verify": { + "version": "1.3.1", + "resolved": "https://registry.npmmirror.com/vue-monoplasty-slide-verify/-/vue-monoplasty-slide-verify-1.3.1.tgz", + "integrity": "sha512-oMP9RdBo/2M2D8CcEE1IJCXKWOGPUyFNKFgMwj8+BMEA5Je4wF3jUbCnQe/hNNmV1cUBdeTNp0w/TdlP1A96SQ==", + "dependencies": { + "vue": "^2.5.11" + }, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, "node_modules/vue-photo-preview": { "version": "1.1.3", "resolved": "https://registry.npmmirror.com/vue-photo-preview/-/vue-photo-preview-1.1.3.tgz", @@ -33678,6 +33691,14 @@ "resolved": "https://registry.npmmirror.com/vue-matomo/-/vue-matomo-4.1.0.tgz", "integrity": "sha512-y+tdmhY835Ip3EAGfIAgA33+aBYrvRT7fNnBnA7bSM459XpoWXgqJKdbopVpEUrxCPIq8IkuF7g4KqSLc0Fa3w==" }, + "vue-monoplasty-slide-verify": { + "version": "1.3.1", + "resolved": "https://registry.npmmirror.com/vue-monoplasty-slide-verify/-/vue-monoplasty-slide-verify-1.3.1.tgz", + "integrity": "sha512-oMP9RdBo/2M2D8CcEE1IJCXKWOGPUyFNKFgMwj8+BMEA5Je4wF3jUbCnQe/hNNmV1cUBdeTNp0w/TdlP1A96SQ==", + "requires": { + "vue": "^2.5.11" + } + }, "vue-photo-preview": { "version": "1.1.3", "resolved": "https://registry.npmmirror.com/vue-photo-preview/-/vue-photo-preview-1.1.3.tgz", diff --git a/package.json b/package.json index 56906cd0..4842dd4b 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "vue-count-to": "^1.0.13", "vue-cropper": "^0.5.5", "vue-matomo": "^4.1.0", + "vue-monoplasty-slide-verify": "^1.3.1", "vue-photo-preview": "^1.1.3", "vue-router": "^3.2.0", "vue-seamless-scroll": "^1.1.23", diff --git a/public/js/config.js b/public/js/config.js index 7f7c6f90..89de7e21 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,7 +18,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.online_zjsj +var PROJECT_TYPE = PROJECT.local_test var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 696c502b..33741fa7 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') { // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 - axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 diff --git a/src/pages/index/index.js b/src/pages/index/index.js index cac83173..b39c64f1 100644 --- a/src/pages/index/index.js +++ b/src/pages/index/index.js @@ -23,6 +23,8 @@ import { resetForm } from '@/util' import { autoLogin } from '@/assets/js/api/autoLogin-xingXuan' import { decode, encode } from 'js-base64' import { loginApi, companyLoginApi, projectLoginApi } from '@/assets/js/api/loginSign' +import SlideVerify from 'vue-monoplasty-slide-verify'; //滑动验证 +Vue.use(SlideVerify); // 全局组件挂载 Vue.component('Pagination', Pagination) diff --git a/src/store/index.js b/src/store/index.js index f03d839a..ec69a772 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,8 +45,8 @@ export default new Vuex.Store({ // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 + // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时，需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', @@ -56,8 +56,8 @@ export default new Vuex.Store({ // UPLOADURL: 'http://182.90.224.237:7000/upload/image', // FILEURL: 'http://182.90.224.237:7000/image/', // 邱平毅的 - // UPLOADURL: 'http://192.168.34.216:6023/upload/image', - // FILEURL: 'http://192.168.34.216:6023/image/', + UPLOADURL: 'http://192.168.34.216:6023/upload/image', + FILEURL: 'http://192.168.34.216:6023/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue index 69a29e54..0cd9f959 100644 --- a/src/views/home/login_v1.vue +++ b/src/views/home/login_v1.vue @@ -2,6 +2,17 @@
+ + +
- {{ $t("message.login.login") }}
@@ -231,7 +242,9 @@ export default { components: { getcode, LoginInfo }, data() { return { + msg: '', show: false, + pass:true, input: "", radio: "", projectType: "", @@ -336,7 +349,16 @@ export default { } }, methods: { - //判断平台是否授权 + onSuccess(){ + this.msg = 'login success' + this.pass = false + }, + onFail(){ + this.msg = '' + }, + onRefresh(){ + this.msg = '' + }, getData() { getOneComputerAuthApi().then((res) => { if (res.result) { diff --git a/src/views/projectAdmin/zjsj/security/centerTop.vue b/src/views/projectAdmin/zjsj/security/centerTop.vue index 822f3a30..0dd72bb5 100644 --- a/src/views/projectAdmin/zjsj/security/centerTop.vue +++ b/src/views/projectAdmin/zjsj/security/centerTop.vue @@ -187,7 +187,7 @@ export default { data.startDate = this.time2[0]; data.endDate = this.time2[1]; getWorkerGrowthApi(data).then((res) => { - console.log('---趋势--',res) + // console.log('---趋势--',res) if (res.reult != null) { this.xdata2 = result.map((item) => { return item.date; diff --git a/yarn.lock b/yarn.lock index aa34879a..818d45b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11032,6 +11032,13 @@ "resolved" "https://registry.npmmirror.com/vue-matomo/-/vue-matomo-4.1.0.tgz" "version" "4.1.0" +"vue-monoplasty-slide-verify@^1.3.1": + "integrity" "sha512-oMP9RdBo/2M2D8CcEE1IJCXKWOGPUyFNKFgMwj8+BMEA5Je4wF3jUbCnQe/hNNmV1cUBdeTNp0w/TdlP1A96SQ==" + "resolved" "https://registry.npmmirror.com/vue-monoplasty-slide-verify/-/vue-monoplasty-slide-verify-1.3.1.tgz" + "version" "1.3.1" + dependencies: + "vue" "^2.5.11" + "vue-photo-preview@^1.1.3": "integrity" "sha512-L9JTQh62rYqLHNCdpy7zQdqVisks9dvkmUpM8+7kIKG7l+KkbRLzKWK7lCjCKc6OQT42o6/ngK6B13niXunS9Q==" "resolved" "https://registry.npmmirror.com/vue-photo-preview/-/vue-photo-preview-1.1.3.tgz" @@ -11099,7 +11106,7 @@ "resolved" "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz" "version" "1.9.1" -"vue@^2.0.0", "vue@^2.4.4", "vue@^2.5.17", "vue@^2.6.10", "vue@^2.6.11", "vue@>=2.2": +"vue@^2.0.0", "vue@^2.4.4", "vue@^2.5.11", "vue@^2.5.17", "vue@^2.6.10", "vue@^2.6.11", "vue@>=2.2": "integrity" "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" "version" "2.6.11"