23 changed files with 13104 additions and 55 deletions
Split View
Diff Options
-
+2 -2admin-hanhai-vue/.env.development
-
+1 -1admin-hanhai-vue/.env.production
-
+1 -1admin-hanhai-vue/.env.test
-
+2 -0admin-hanhai-vue/package.json
-
+2 -1admin-hanhai-vue/src/config/index.js
-
+2 -0admin-hanhai-vue/src/main.js
-
+1 -1admin-hanhai-vue/src/views/xcx/ClockInConfList.vue
-
+6 -6admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue
-
+10 -8admin-hanhai-vue/src/views/xcx/ClockInProjectList.vue
-
+9 -9admin-hanhai-vue/src/views/xcx/ClockinAuthList.vue
-
+18 -18admin-hanhai-vue/src/views/xcx/ClockinLogList.vue
-
+6 -6admin-hanhai-vue/src/views/xcx/ClockinTeamList.vue
-
+23 -2admin-hanhai-vue/src/views/xcx/modules/ClockInProjectForm.vue
-
+235 -0admin-hanhai-vue/src/views/xcx/modules/TencentMapPicker.vue
-
+12766 -0admin-hanhai-vue/yarn.lock
-
+2 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockInproject/entity/ClockInProject.java
-
+2 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockInprojectitem/entity/ClockInProjectItem.java
-
+2 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinauth/entity/ClockinAuth.java
-
+2 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/entity/ClockInConf.java
-
+2 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/entity/ClockinLog.java
-
+2 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinteam/entity/ClockinTeam.java
-
+2 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinteamlog/entity/ClockinTeamLog.java
-
+6 -0jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/service/impl/ClockinServiceImpl.java
+ 2
- 2
admin-hanhai-vue/.env.development
View File
| @ -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' | |||
+ 1
- 1
admin-hanhai-vue/.env.production
View File
+ 1
- 1
admin-hanhai-vue/.env.test
View File
+ 2
- 0
admin-hanhai-vue/package.json
View File
+ 2
- 1
admin-hanhai-vue/src/config/index.js
View File
+ 2
- 0
admin-hanhai-vue/src/main.js
View File
+ 1
- 1
admin-hanhai-vue/src/views/xcx/ClockInConfList.vue
View File
+ 6
- 6
admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue
View File
+ 10
- 8
admin-hanhai-vue/src/views/xcx/ClockInProjectList.vue
View File
+ 9
- 9
admin-hanhai-vue/src/views/xcx/ClockinAuthList.vue
View File
+ 18
- 18
admin-hanhai-vue/src/views/xcx/ClockinLogList.vue
View File
+ 6
- 6
admin-hanhai-vue/src/views/xcx/ClockinTeamList.vue
View File
+ 23
- 2
admin-hanhai-vue/src/views/xcx/modules/ClockInProjectForm.vue
View File
+ 235
- 0
admin-hanhai-vue/src/views/xcx/modules/TencentMapPicker.vue
View File
| @ -0,0 +1,235 @@ | |||
| <template> | |||
| <div> | |||
| <div class="map-box"> | |||
| <div class="map" ref="map" style="height: 400px" ></div> | |||
| <div class="map-search"> | |||
| <div> | |||
| <a-input-search id="place" v-model="searchValue" placeholder="请输入详细地址" enter-button @search="searchAddress(searchValue)" /> | |||
| </div> | |||
| <div> | |||
| <ul v-if="kwData.length"> | |||
| <li v-for="(item, index) in kwData" :key="index" @click="selectKeyword(item)">{{ item.address }}</li> | |||
| </ul> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| </template> | |||
| <script> | |||
| export default { | |||
| name: 'TencentMapPicker', | |||
| props: { | |||
| latitude: { | |||
| type: Number|String, | |||
| default: 0 | |||
| }, | |||
| longitude: { | |||
| type: Number|String, | |||
| default: 0 | |||
| } | |||
| }, | |||
| watch: { | |||
| latitude(newVal, oldVal) { | |||
| console.info(`newVal`,newVal,`oldVal`,oldVal) | |||
| if (newVal) { | |||
| this.form.latitude = newVal | |||
| // this.$nextTick(()=>{ | |||
| // this.map.setCenter(new window.TMap.LatLng(this.form.latitude, this.form.longitude)); | |||
| // }) | |||
| } | |||
| }, | |||
| longitude(newVal, oldVal) { | |||
| console.info(`newVal`,newVal,`oldVal`,oldVal) | |||
| if (newVal) { | |||
| this.form.longitude = newVal | |||
| // this.$nextTick(()=>{ | |||
| // this.map.setCenter(new window.TMap.LatLng(this.form.latitude, this.form.longitude)); | |||
| // }) | |||
| } | |||
| } | |||
| }, | |||
| data() { | |||
| return { | |||
| searchValue: '', //地图搜索 | |||
| form: { | |||
| longitude: 116.397128, | |||
| latitude: 39.916527 | |||
| }, | |||
| kwData:[] | |||
| } | |||
| }, | |||
| mounted() { | |||
| let that = this | |||
| if (that.script) return; | |||
| that.script = document.createElement('script'); | |||
| that.script.type = 'text/javascript'; | |||
| that.script.src = `//map.qq.com/api/gljs?v=1.exp&libraries=service&key=WPKBZ-OKICI-ZAIGE-U6TQ4-RPQIV-OXBJO`; | |||
| document.head.appendChild(that.script); | |||
| that.script.onload = () => { | |||
| window.initMap = that.initMap; | |||
| that.$nextTick(() => { | |||
| that.initMap(); | |||
| }); | |||
| }; | |||
| }, | |||
| methods: { | |||
| // 地图 | |||
| initMap() { | |||
| // 搜索类 | |||
| this.searchEr = new window.TMap.service.Search({ pageSize: 15 }); | |||
| // 地图主类 | |||
| this.map = new window.TMap.Map(this.$refs.map, { | |||
| backgroundColor: '#f7f7f7', | |||
| mapStyleId: 'style1', | |||
| zoom: 14, | |||
| mapTypeControlOptions: { | |||
| mapTypeIds: [], | |||
| }, | |||
| draggableCursor: 'crosshair', | |||
| center: new window.TMap.LatLng(this.form.latitude, this.form.longitude), | |||
| }); | |||
| // 图层类 | |||
| this.markerLayer = new window.TMap.MultiMarker({ | |||
| map: this.map, | |||
| geometries: [], | |||
| }); | |||
| // 地址逆解析 | |||
| this.geocoder = new window.TMap.service.Geocoder(); | |||
| const setMarker = () => { | |||
| const latlng = new window.TMap.LatLng(this.form.latitude, this.form.longitude); | |||
| this.markerLayer.setGeometries([]); | |||
| let geometries = this.markerLayer.getGeometries(); | |||
| geometries.push({ | |||
| id: '-1', | |||
| position: latlng, | |||
| }); | |||
| this.markerLayer.updateGeometries(geometries); | |||
| }; | |||
| this.map.on('click', (e) => { | |||
| this.form.longitude = e.latLng.getLng(); // 经度 | |||
| this.form.latitude = e.latLng.getLat(); // 纬度 | |||
| setMarker(); | |||
| this.getAddressFormat(); | |||
| }); | |||
| if (this.form.longitude) { | |||
| this.map.setCenter(new window.TMap.LatLng(this.form.latitude, this.form.longitude)); | |||
| setMarker(); | |||
| } | |||
| }, | |||
| selectKeyword(event){ | |||
| this.map.setCenter(new window.TMap.LatLng(event.location.lat, event.location.lng)); | |||
| this.kwData = [] | |||
| }, | |||
| // 地图搜索 | |||
| searchAddress(keyword = '') { | |||
| if (!keyword) return; | |||
| this.$jsonp('https://apis.map.qq.com/ws/place/v1/suggestion', { | |||
| key: 'WPKBZ-OKICI-ZAIGE-U6TQ4-RPQIV-OXBJO', | |||
| output: 'jsonp', | |||
| keyword: keyword, | |||
| }).then((res) => { | |||
| console.log(`res`,res) | |||
| if (res.status === 0) { | |||
| this.kwData = res.data | |||
| } else { | |||
| this.kwData = [] | |||
| } | |||
| }).catch((e) => { | |||
| console.log(e) | |||
| }) | |||
| this.markerLayer.setGeometries([]); | |||
| this.searchEr.searchRectangle({ | |||
| keyword, | |||
| bounds: this.map.getBounds(), | |||
| }) | |||
| .then((result) => { | |||
| console.info(`result`,result) | |||
| const { location = {} } = result.data[0] || {}; | |||
| const { lat = 39.916527, lng = 116.397128 } = location; | |||
| this.map.setCenter(new window.TMap.LatLng(lat, lng)); | |||
| result.data.forEach((item, index) => { | |||
| let geometries = this.markerLayer.getGeometries(); | |||
| // 点标注数据数组 | |||
| geometries.push({ | |||
| id: String(index), | |||
| position: item.location, | |||
| }); | |||
| // 绘制地点标注 | |||
| this.markerLayer.updateGeometries(geometries); | |||
| }); | |||
| }); | |||
| }, | |||
| getAddressFormat() { | |||
| const { longitude, latitude } = this.form; | |||
| this.geocoder | |||
| .getAddress({ | |||
| location: new window.TMap.LatLng(latitude, longitude), | |||
| }) | |||
| .then((res) => { | |||
| const { | |||
| formatted_addresses: { recommend = '' }, | |||
| } = res.result || {}; | |||
| this.searchValue = recommend | |||
| this.form.hotelDetailAddress = recommend; | |||
| this.$emit('onLocationSelected', this.form); | |||
| console.log(this.form); | |||
| }); | |||
| }, | |||
| } | |||
| } | |||
| </script> | |||
| <style> | |||
| .map-box { | |||
| position: relative; | |||
| } | |||
| .map-search { | |||
| z-index: 1000; | |||
| display: flex; | |||
| flex-direction: column; | |||
| position: absolute; | |||
| top: 20px; | |||
| left: 20px; | |||
| width: 300px; | |||
| } | |||
| button { | |||
| border-radius: 0; | |||
| } | |||
| .icons { | |||
| display: flex; | |||
| align-items: center; | |||
| justify-content: space-between; | |||
| } | |||
| .time { | |||
| margin-top: 15px; | |||
| width: 100%; | |||
| font-size: 12px; | |||
| flex-wrap: wrap; | |||
| height: 70%; | |||
| } | |||
| ul{ | |||
| background: white; | |||
| list-style-type: none; | |||
| padding-left: 0px; | |||
| height: 280px; | |||
| overflow: scroll; | |||
| } | |||
| li{ | |||
| padding-left: 6px; | |||
| font-size: 10px; | |||
| text-align: left; | |||
| height: 40px; | |||
| line-height: 15px; | |||
| display: flex; | |||
| align-items: center; | |||
| } | |||
| li:hover{ | |||
| cursor: pointer; | |||
| background: #f5f5f5; | |||
| } | |||
| </style> | |||