From ba0214ed52c33d9a50795cb17816f37e3569b594 Mon Sep 17 00:00:00 2001 From: ieaii <1069385070@qq.com> Date: Thu, 21 Nov 2024 19:42:58 +0800 Subject: [PATCH] =?UTF-8?q?h=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-hanhai-vue/.env.development | 4 +- admin-hanhai-vue/.env.production | 2 +- admin-hanhai-vue/.env.test | 2 +- admin-hanhai-vue/package.json | 2 + admin-hanhai-vue/src/config/index.js | 3 +- admin-hanhai-vue/src/main.js | 2 + admin-hanhai-vue/src/views/xcx/ClockInConfList.vue | 2 +- .../src/views/xcx/ClockInProjectItemList.vue | 12 +- .../src/views/xcx/ClockInProjectList.vue | 18 +- admin-hanhai-vue/src/views/xcx/ClockinAuthList.vue | 18 +- admin-hanhai-vue/src/views/xcx/ClockinLogList.vue | 36 +- admin-hanhai-vue/src/views/xcx/ClockinTeamList.vue | 12 +- .../src/views/xcx/modules/ClockInProjectForm.vue | 25 +- .../src/views/xcx/modules/TencentMapPicker.vue | 235 + admin-hanhai-vue/yarn.lock | 12766 +++++++++++++++++++ .../clockInproject/entity/ClockInProject.java | 2 + .../entity/ClockInProjectItem.java | 2 + .../modules/clockinauth/entity/ClockinAuth.java | 2 + .../modules/clockinconf/entity/ClockInConf.java | 2 + .../modules/clockinlog/entity/ClockinLog.java | 2 + .../modules/clockinteam/entity/ClockinTeam.java | 2 + .../clockinteamlog/entity/ClockinTeamLog.java | 2 + .../clockin/service/impl/ClockinServiceImpl.java | 6 + 23 files changed, 13104 insertions(+), 55 deletions(-) create mode 100644 admin-hanhai-vue/src/views/xcx/modules/TencentMapPicker.vue create mode 100644 admin-hanhai-vue/yarn.lock diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index fbb3926..7a05bb2 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,7 +1,7 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://127.0.0.1:8081/clockin-api/ +VUE_APP_API_BASE_URL=https://clockin.java996.icu/clockin-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview - +VUE_APP_MAP_KEY=WPKBZ-OKICI-ZAIGE-U6TQ4-RPQIV-OXBJO # 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VUE_APP_SUB_jeecg-app-1 = '//localhost:8092' \ No newline at end of file diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 39dc15e..928549d 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -2,6 +2,6 @@ NODE_ENV=production VUE_APP_API_BASE_URL=https://clockin.java996.icu/clockin-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview - +VUE_APP_MAP_KEY=WPKBZ-OKICI-ZAIGE-U6TQ4-RPQIV-OXBJO # 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VUE_APP_SUB_jeecg-app-1 = '//localhost:8092' \ No newline at end of file diff --git a/admin-hanhai-vue/.env.test b/admin-hanhai-vue/.env.test index 3e68637..8aaf2c7 100644 --- a/admin-hanhai-vue/.env.test +++ b/admin-hanhai-vue/.env.test @@ -2,6 +2,6 @@ NODE_ENV=test VUE_APP_API_BASE_URL=https://clockin.java996.icu/clockin-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview - +VUE_APP_MAP_KEY=WPKBZ-OKICI-ZAIGE-U6TQ4-RPQIV-OXBJO # 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VUE_APP_SUB_jeecg-app-1 = '//localhost:8092' \ No newline at end of file diff --git a/admin-hanhai-vue/package.json b/admin-hanhai-vue/package.json index c8a446b..8da72f7 100644 --- a/admin-hanhai-vue/package.json +++ b/admin-hanhai-vue/package.json @@ -10,6 +10,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@antv/data-set": "^0.11.4", "@jeecg/antd-online-mini": "3.1.0-beta", "@tinymce/tinymce-vue": "2.1.0", @@ -35,6 +36,7 @@ "vue-area-linkage": "^5.1.0", "vue-cropper": "^0.5.4", "vue-i18n": "^8.7.0", + "vue-jsonp": "^2.0.0", "vue-loader": "^15.7.0", "vue-ls": "^3.2.0", "vue-photo-preview": "^1.1.3", diff --git a/admin-hanhai-vue/src/config/index.js b/admin-hanhai-vue/src/config/index.js index 1843b2a..c8380fd 100644 --- a/admin-hanhai-vue/src/config/index.js +++ b/admin-hanhai-vue/src/config/index.js @@ -7,4 +7,5 @@ window._CONFIG['domianURL'] = Vue.prototype.API_BASE_URL window._CONFIG['casPrefixUrl'] = window._CONFIG.VUE_APP_CAS_BASE_URL?window._CONFIG.VUE_APP_CAS_BASE_URL:process.env.VUE_APP_CAS_BASE_URL window._CONFIG['onlinePreviewDomainURL'] = window._CONFIG.VUE_APP_ONLINE_BASE_URL?window._CONFIG.VUE_APP_ONLINE_BASE_URL:process.env.VUE_APP_ONLINE_BASE_URL window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static' -window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe' \ No newline at end of file +window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe' +window._CONFIG['qqMapKey'] = process.env.VUE_APP_MAP_KEY \ No newline at end of file diff --git a/admin-hanhai-vue/src/main.js b/admin-hanhai-vue/src/main.js index 0809df2..d4417c7 100644 --- a/admin-hanhai-vue/src/main.js +++ b/admin-hanhai-vue/src/main.js @@ -49,6 +49,8 @@ import '@/components/jeecg/JVxeTable/install' import '@/components/JVxeCells/install' //表单验证 import { rules } from '@/utils/rules' +import { VueJsonp } from 'vue-jsonp' +Vue.use(VueJsonp) Vue.prototype.rules = rules Vue.config.productionTip = false Vue.use(Storage, config.storageOptions) diff --git a/admin-hanhai-vue/src/views/xcx/ClockInConfList.vue b/admin-hanhai-vue/src/views/xcx/ClockInConfList.vue index cb75939..fc18e24 100644 --- a/admin-hanhai-vue/src/views/xcx/ClockInConfList.vue +++ b/admin-hanhai-vue/src/views/xcx/ClockInConfList.vue @@ -22,7 +22,7 @@ - 批量操作 + diff --git a/admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue b/admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue index 805e4da..c5d3b08 100644 --- a/admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue +++ b/admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue @@ -1,12 +1,12 @@