Browse Source
Merge branch 'master' of http://175.178.51.79:3000/Augcl/clockin-api
Conflicts: admin-hanhai-vue/yarn.lockmaster
56 changed files with 4660 additions and 2180 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
-
+195 -0admin-hanhai-vue/src/views/xcx/ClockInConfList.vue
-
+11 -11admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue
-
+43 -21admin-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
-
+196 -0admin-hanhai-vue/src/views/xcx/ClockinTeamLogList.vue
-
+123 -0admin-hanhai-vue/src/views/xcx/modules/ClockInConfForm.vue
-
+84 -0admin-hanhai-vue/src/views/xcx/modules/ClockInConfModal.Style#Drawer.vue
-
+60 -0admin-hanhai-vue/src/views/xcx/modules/ClockInConfModal.vue
-
+28 -7admin-hanhai-vue/src/views/xcx/modules/ClockInProjectForm.vue
-
+5 -5admin-hanhai-vue/src/views/xcx/modules/ClockInProjectItemForm.vue
-
+5 -5admin-hanhai-vue/src/views/xcx/modules/ClockinAuthForm.vue
-
+5 -5admin-hanhai-vue/src/views/xcx/modules/ClockinLogForm.vue
-
+5 -5admin-hanhai-vue/src/views/xcx/modules/ClockinTeamForm.vue
-
+127 -0admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogForm.vue
-
+84 -0admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogModal.Style#Drawer.vue
-
+60 -0admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogModal.vue
-
+235 -0admin-hanhai-vue/src/views/xcx/modules/TencentMapPicker.vue
-
+2071 -2049admin-hanhai-vue/yarn.lock
-
+19 -7jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TencentUtils.java
-
+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
-
+171 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/controller/ClockInConfController.java
-
+67 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/entity/ClockInConf.java
-
+17 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/mapper/ClockInConfMapper.java
-
+5 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/mapper/xml/ClockInConfMapper.xml
-
+16 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/service/IClockInConfService.java
-
+27 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/service/impl/ClockInConfServiceImpl.java
-
+195 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/ClockInConfList.vue
-
+123 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfForm.vue
-
+84 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfModal.Style#Drawer.vue
-
+60 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfModal.vue
-
+61 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConf.api.ts
-
+61 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConf.data.ts
-
+162 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConfList.vue
-
+58 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/components/ClockInConfModal.vue
-
+49 -2jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/controller/ClockinLogController.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
-
+8 -8jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinteamlog/vue/ClockinTeamLogList.vue
-
+8 -13jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinteamlog/vue/modules/ClockinTeamLogForm.vue
-
+51 -2jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/auth/service/impl/AuthServiceImpl.java
-
+2 -0jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/req/ClockInReq.java
-
+20 -2jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/clockin/service/impl/ClockinServiceImpl.java
-
+1 -0jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/user/service/impl/UserServiceImpl.java
-
+2 -0jeecg-boot-module-system/src/main/resources/application-dev.yml
-
+1 -0jeecg-boot-module-system/src/main/resources/application-test.yml
+ 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
+ 195
- 0
admin-hanhai-vue/src/views/xcx/ClockInConfList.vue
View File
| @ -0,0 +1,195 @@ | |||
| <template> | |||
| <a-card :bordered="false"> | |||
| <!-- 查询区域 --> | |||
| <!-- <div class="table-page-search-wrapper">--> | |||
| <!-- <a-form layout="inline" @keyup.enter.native="searchQuery">--> | |||
| <!-- <a-row :gutter="24">--> | |||
| <!-- </a-row>--> | |||
| <!-- </a-form>--> | |||
| <!-- </div>--> | |||
| <!-- 查询区域-END --> | |||
| <!-- 操作按钮区域 --> | |||
| <div class="table-operator"> | |||
| <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> | |||
| <!-- <a-button type="primary" icon="download" @click="handleExportXls('clock_in_conf')">导出</a-button>--> | |||
| <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> | |||
| <!-- <a-button type="primary" icon="import">导入</a-button>--> | |||
| <!-- </a-upload>--> | |||
| <!-- 高级查询区域 --> | |||
| <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> | |||
| <a-dropdown v-if="selectedRowKeys.length > 0"> | |||
| <!-- <a-menu slot="overlay">--> | |||
| <!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>--> | |||
| <!-- </a-menu>--> | |||
| <!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>--> | |||
| </a-dropdown> | |||
| </div> | |||
| <!-- table区域-begin --> | |||
| <div> | |||
| <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> | |||
| <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 | |||
| <a style="margin-left: 24px" @click="onClearSelected">清空</a> | |||
| </div> | |||
| <a-table | |||
| ref="table" | |||
| size="middle" | |||
| :scroll="{x:true}" | |||
| bordered | |||
| rowKey="id" | |||
| :columns="columns" | |||
| :dataSource="dataSource" | |||
| :pagination="ipagination" | |||
| :loading="loading" | |||
| :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" | |||
| class="j-table-force-nowrap" | |||
| @change="handleTableChange"> | |||
| <template slot="textSlot" slot-scope="text"> | |||
| <j-ellipsis :value="text"></j-ellipsis> | |||
| </template> | |||
| <template slot="htmlSlot" slot-scope="text"> | |||
| <div v-html="text"></div> | |||
| </template> | |||
| <template slot="imgSlot" slot-scope="text,record"> | |||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> | |||
| <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> | |||
| </template> | |||
| <template slot="fileSlot" slot-scope="text"> | |||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> | |||
| <a-button | |||
| v-else | |||
| :ghost="true" | |||
| type="primary" | |||
| icon="download" | |||
| size="small" | |||
| @click="downloadFile(text)"> | |||
| 下载 | |||
| </a-button> | |||
| </template> | |||
| <span slot="action" slot-scope="text, record"> | |||
| <a @click="handleEdit(record)">编辑</a> | |||
| <a-divider type="vertical" /> | |||
| <a-dropdown> | |||
| <a class="ant-dropdown-link">更多 <a-icon type="down" /></a> | |||
| <a-menu slot="overlay"> | |||
| <a-menu-item> | |||
| <a @click="handleDetail(record)">详情</a> | |||
| </a-menu-item> | |||
| <!-- <a-menu-item>--> | |||
| <!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> | |||
| <!-- <a>删除</a>--> | |||
| <!-- </a-popconfirm>--> | |||
| <!-- </a-menu-item>--> | |||
| </a-menu> | |||
| </a-dropdown> | |||
| </span> | |||
| </a-table> | |||
| </div> | |||
| <clock-in-conf-modal ref="modalForm" @ok="modalFormOk"></clock-in-conf-modal> | |||
| </a-card> | |||
| </template> | |||
| <script> | |||
| import '@/assets/less/TableExpand.less' | |||
| import { mixinDevice } from '@/utils/mixin' | |||
| import { JeecgListMixin } from '@/mixins/JeecgListMixin' | |||
| import ClockInConfModal from './modules/ClockInConfModal' | |||
| import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' | |||
| export default { | |||
| name: 'ClockInConfList', | |||
| mixins:[JeecgListMixin, mixinDevice], | |||
| components: { | |||
| ClockInConfModal | |||
| }, | |||
| data () { | |||
| return { | |||
| description: 'clock_in_conf管理页面', | |||
| // 表头 | |||
| columns: [ | |||
| { | |||
| title: '#', | |||
| dataIndex: '', | |||
| key:'rowIndex', | |||
| width:60, | |||
| align:"center", | |||
| customRender:function (t,r,index) { | |||
| return parseInt(index)+1; | |||
| } | |||
| }, | |||
| { | |||
| title:'健名', | |||
| align:"center", | |||
| dataIndex: 'name' | |||
| }, | |||
| { | |||
| title:'值', | |||
| align:"center", | |||
| dataIndex: 'value', | |||
| scopedSlots: {customRender: 'textSlot'} | |||
| }, | |||
| { | |||
| title:'说明', | |||
| align:"center", | |||
| dataIndex: 'info', | |||
| scopedSlots: {customRender: 'textSlot'} | |||
| }, | |||
| { | |||
| title:'是否删除', | |||
| align:"center", | |||
| dataIndex: 'delFlag_dictText' | |||
| }, | |||
| { | |||
| title: '操作', | |||
| dataIndex: 'action', | |||
| align:"center", | |||
| fixed:"right", | |||
| width:147, | |||
| scopedSlots: { customRender: 'action' } | |||
| } | |||
| ], | |||
| url: { | |||
| list: "/clockinconf/clockInConf/list", | |||
| delete: "/clockinconf/clockInConf/delete", | |||
| deleteBatch: "/clockinconf/clockInConf/deleteBatch", | |||
| exportXlsUrl: "/clockinconf/clockInConf/exportXls", | |||
| importExcelUrl: "clockinconf/clockInConf/importExcel", | |||
| }, | |||
| dictOptions:{}, | |||
| superFieldList:[], | |||
| } | |||
| }, | |||
| created() { | |||
| this.getSuperFieldList(); | |||
| }, | |||
| computed: { | |||
| importExcelUrl: function(){ | |||
| return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; | |||
| }, | |||
| }, | |||
| methods: { | |||
| initDictConfig(){ | |||
| }, | |||
| getSuperFieldList(){ | |||
| let fieldList=[]; | |||
| fieldList.push({type:'string',value:'name',text:'健名',dictCode:''}) | |||
| fieldList.push({type:'string',value:'value',text:'值',dictCode:''}) | |||
| fieldList.push({type:'string',value:'info',text:'说明',dictCode:''}) | |||
| fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'}) | |||
| this.superFieldList = fieldList | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
| <style scoped> | |||
| @import '~@assets/less/common.less'; | |||
| </style> | |||
+ 11
- 11
admin-hanhai-vue/src/views/xcx/ClockInProjectItemList.vue
View File
+ 43
- 21
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
+ 196
- 0
admin-hanhai-vue/src/views/xcx/ClockinTeamLogList.vue
View File
| @ -0,0 +1,196 @@ | |||
| <template> | |||
| <a-card :bordered="false"> | |||
| <!-- 查询区域 --> | |||
| <div class="table-page-search-wrapper"> | |||
| <a-form layout="inline" @keyup.enter.native="searchQuery"> | |||
| <a-row :gutter="24"> | |||
| </a-row> | |||
| </a-form> | |||
| </div> | |||
| <!-- 查询区域-END --> | |||
| <!-- 操作按钮区域 --> | |||
| <div class="table-operator"> | |||
| <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> | |||
| <!-- <a-button type="primary" icon="download" @click="handleExportXls('clockin_team_log')">导出</a-button>--> | |||
| <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> | |||
| <!-- <a-button type="primary" icon="import">导入</a-button>--> | |||
| <!-- </a-upload>--> | |||
| <!-- 高级查询区域 --> | |||
| <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> | |||
| <a-dropdown v-if="selectedRowKeys.length > 0"> | |||
| <a-menu slot="overlay"> | |||
| <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> | |||
| </a-menu> | |||
| <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> | |||
| </a-dropdown> | |||
| </div> | |||
| <!-- table区域-begin --> | |||
| <div> | |||
| <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> | |||
| <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 | |||
| <a style="margin-left: 24px" @click="onClearSelected">清空</a> | |||
| </div> | |||
| <a-table | |||
| ref="table" | |||
| size="middle" | |||
| :scroll="{x:true}" | |||
| bordered | |||
| rowKey="id" | |||
| :columns="columns" | |||
| :dataSource="dataSource" | |||
| :pagination="ipagination" | |||
| :loading="loading" | |||
| :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" | |||
| class="j-table-force-nowrap" | |||
| @change="handleTableChange"> | |||
| <template slot="htmlSlot" slot-scope="text"> | |||
| <div v-html="text"></div> | |||
| </template> | |||
| <template slot="imgSlot" slot-scope="text,record"> | |||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> | |||
| <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> | |||
| </template> | |||
| <template slot="fileSlot" slot-scope="text"> | |||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> | |||
| <a-button | |||
| v-else | |||
| :ghost="true" | |||
| type="primary" | |||
| icon="download" | |||
| size="small" | |||
| @click="downloadFile(text)"> | |||
| 下载 | |||
| </a-button> | |||
| </template> | |||
| <span slot="action" slot-scope="text, record"> | |||
| <a @click="handleEdit(record)">编辑</a> | |||
| <a-divider type="vertical" /> | |||
| <a-dropdown> | |||
| <a class="ant-dropdown-link">更多 <a-icon type="down" /></a> | |||
| <a-menu slot="overlay"> | |||
| <a-menu-item> | |||
| <a @click="handleDetail(record)">详情</a> | |||
| </a-menu-item> | |||
| <a-menu-item> | |||
| <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> | |||
| <a>删除</a> | |||
| </a-popconfirm> | |||
| </a-menu-item> | |||
| </a-menu> | |||
| </a-dropdown> | |||
| </span> | |||
| </a-table> | |||
| </div> | |||
| <clockin-team-log-modal ref="modalForm" @ok="modalFormOk"></clockin-team-log-modal> | |||
| </a-card> | |||
| </template> | |||
| <script> | |||
| import '@/assets/less/TableExpand.less' | |||
| import { mixinDevice } from '@/utils/mixin' | |||
| import { JeecgListMixin } from '@/mixins/JeecgListMixin' | |||
| import ClockinTeamLogModal from './modules/ClockinTeamLogModal' | |||
| import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' | |||
| export default { | |||
| name: 'ClockinTeamLogList', | |||
| mixins:[JeecgListMixin, mixinDevice], | |||
| components: { | |||
| ClockinTeamLogModal | |||
| }, | |||
| data () { | |||
| return { | |||
| description: '团队绑定管理页面', | |||
| // 表头 | |||
| columns: [ | |||
| { | |||
| title: '#', | |||
| dataIndex: '', | |||
| key:'rowIndex', | |||
| width:60, | |||
| align:"center", | |||
| customRender:function (t,r,index) { | |||
| return parseInt(index)+1; | |||
| } | |||
| }, | |||
| { | |||
| title:'用户编号', | |||
| align:"center", | |||
| dataIndex: 'userId' | |||
| }, | |||
| { | |||
| title:'团队编号', | |||
| align:"center", | |||
| dataIndex: 'teamId_dictText' | |||
| }, | |||
| { | |||
| title:'姓名', | |||
| align:"center", | |||
| dataIndex: 'name' | |||
| }, | |||
| { | |||
| title:'审核状态', | |||
| align:"center", | |||
| dataIndex: 'status_dictText' | |||
| }, | |||
| { | |||
| title:'是否删除', | |||
| align:"center", | |||
| dataIndex: 'delFlag_dictText' | |||
| }, | |||
| { | |||
| title: '操作', | |||
| dataIndex: 'action', | |||
| align:"center", | |||
| fixed:"right", | |||
| width:147, | |||
| scopedSlots: { customRender: 'action' } | |||
| } | |||
| ], | |||
| url: { | |||
| list: "/clockinteamlog/clockinTeamLog/list", | |||
| delete: "/clockinteamlog/clockinTeamLog/delete", | |||
| deleteBatch: "/clockinteamlog/clockinTeamLog/deleteBatch", | |||
| exportXlsUrl: "/clockinteamlog/clockinTeamLog/exportXls", | |||
| importExcelUrl: "clockinteamlog/clockinTeamLog/importExcel", | |||
| }, | |||
| dictOptions:{}, | |||
| superFieldList:[], | |||
| } | |||
| }, | |||
| created() { | |||
| this.getSuperFieldList(); | |||
| }, | |||
| computed: { | |||
| importExcelUrl: function(){ | |||
| return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; | |||
| }, | |||
| }, | |||
| methods: { | |||
| initDictConfig(){ | |||
| }, | |||
| getSuperFieldList(){ | |||
| let fieldList=[]; | |||
| fieldList.push({type:'string',value:'userId',text:'用户编号',dictCode:''}) | |||
| fieldList.push({type:'string',value:'teamId',text:'团队编号',dictCode:"clockin_team,name,id"}) | |||
| fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) | |||
| fieldList.push({type:'int',value:'status',text:'审核状态 0待审核 1审核通过 2审核未通过',dictCode:'clockin_team_log_status'}) | |||
| fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'}) | |||
| this.superFieldList = fieldList | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
| <style scoped> | |||
| @import '~@assets/less/common.less'; | |||
| </style> | |||
+ 123
- 0
admin-hanhai-vue/src/views/xcx/modules/ClockInConfForm.vue
View File
| @ -0,0 +1,123 @@ | |||
| <template> | |||
| <a-spin :spinning="confirmLoading"> | |||
| <j-form-container :disabled="formDisabled"> | |||
| <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> | |||
| <a-row> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="健名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name"> | |||
| <a-input v-model="model.name" placeholder="请输入健名" ></a-input> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value"> | |||
| <a-textarea v-model="model.value" rows="4" placeholder="请输入值" /> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info"> | |||
| <a-textarea v-model="model.info" rows="4" placeholder="请输入说明" /> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <!-- <a-col :span="24">--> | |||
| <!-- <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">--> | |||
| <!-- <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />--> | |||
| <!-- </a-form-model-item>--> | |||
| <!-- </a-col>--> | |||
| </a-row> | |||
| </a-form-model> | |||
| </j-form-container> | |||
| </a-spin> | |||
| </template> | |||
| <script> | |||
| import { httpAction, getAction } from '@/api/manage' | |||
| import { validateDuplicateValue } from '@/utils/util' | |||
| export default { | |||
| name: 'ClockInConfForm', | |||
| components: { | |||
| }, | |||
| props: { | |||
| //表单禁用 | |||
| disabled: { | |||
| type: Boolean, | |||
| default: false, | |||
| required: false | |||
| } | |||
| }, | |||
| data () { | |||
| return { | |||
| model:{ | |||
| delFlag:0, | |||
| }, | |||
| labelCol: { | |||
| xs: { span: 24 }, | |||
| sm: { span: 5 }, | |||
| }, | |||
| wrapperCol: { | |||
| xs: { span: 24 }, | |||
| sm: { span: 16 }, | |||
| }, | |||
| confirmLoading: false, | |||
| validatorRules: { | |||
| delFlag: [ | |||
| { required: true, message: '请输入是否删除!'}, | |||
| ], | |||
| }, | |||
| url: { | |||
| add: "/clockinconf/clockInConf/add", | |||
| edit: "/clockinconf/clockInConf/edit", | |||
| queryById: "/clockinconf/clockInConf/queryById" | |||
| } | |||
| } | |||
| }, | |||
| computed: { | |||
| formDisabled(){ | |||
| return this.disabled | |||
| }, | |||
| }, | |||
| created () { | |||
| //备份model原始值 | |||
| this.modelDefault = JSON.parse(JSON.stringify(this.model)); | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.edit(this.modelDefault); | |||
| }, | |||
| edit (record) { | |||
| this.model = Object.assign({}, record); | |||
| this.visible = true; | |||
| }, | |||
| submitForm () { | |||
| const that = this; | |||
| // 触发表单验证 | |||
| this.$refs.form.validate(valid => { | |||
| if (valid) { | |||
| that.confirmLoading = true; | |||
| let httpurl = ''; | |||
| let method = ''; | |||
| if(!this.model.id){ | |||
| httpurl+=this.url.add; | |||
| method = 'post'; | |||
| }else{ | |||
| httpurl+=this.url.edit; | |||
| method = 'put'; | |||
| } | |||
| httpAction(httpurl,this.model,method).then((res)=>{ | |||
| if(res.success){ | |||
| that.$message.success(res.message); | |||
| that.$emit('ok'); | |||
| }else{ | |||
| that.$message.warning(res.message); | |||
| } | |||
| }).finally(() => { | |||
| that.confirmLoading = false; | |||
| }) | |||
| } | |||
| }) | |||
| }, | |||
| } | |||
| } | |||
| </script> | |||
+ 84
- 0
admin-hanhai-vue/src/views/xcx/modules/ClockInConfModal.Style#Drawer.vue
View File
| @ -0,0 +1,84 @@ | |||
| <template> | |||
| <a-drawer | |||
| :title="title" | |||
| :width="width" | |||
| placement="right" | |||
| :closable="false" | |||
| @close="close" | |||
| destroyOnClose | |||
| :visible="visible"> | |||
| <clock-in-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></clock-in-conf-form> | |||
| <div class="drawer-footer"> | |||
| <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> | |||
| <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> | |||
| </div> | |||
| </a-drawer> | |||
| </template> | |||
| <script> | |||
| import ClockInConfForm from './ClockInConfForm' | |||
| export default { | |||
| name: 'ClockInConfModal', | |||
| components: { | |||
| ClockInConfForm | |||
| }, | |||
| data () { | |||
| return { | |||
| title:"操作", | |||
| width:800, | |||
| visible: false, | |||
| disableSubmit: false | |||
| } | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.add(); | |||
| }) | |||
| }, | |||
| edit (record) { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.edit(record); | |||
| }); | |||
| }, | |||
| close () { | |||
| this.$emit('close'); | |||
| this.visible = false; | |||
| }, | |||
| submitCallback(){ | |||
| this.$emit('ok'); | |||
| this.visible = false; | |||
| }, | |||
| handleOk () { | |||
| this.$refs.realForm.submitForm(); | |||
| }, | |||
| handleCancel () { | |||
| this.close() | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
| <style lang="less" scoped> | |||
| /** Button按钮间距 */ | |||
| .ant-btn { | |||
| margin-left: 30px; | |||
| margin-bottom: 30px; | |||
| float: right; | |||
| } | |||
| .drawer-footer{ | |||
| position: absolute; | |||
| bottom: -8px; | |||
| width: 100%; | |||
| border-top: 1px solid #e8e8e8; | |||
| padding: 10px 16px; | |||
| text-align: right; | |||
| left: 0; | |||
| background: #fff; | |||
| border-radius: 0 0 2px 2px; | |||
| } | |||
| </style> | |||
+ 60
- 0
admin-hanhai-vue/src/views/xcx/modules/ClockInConfModal.vue
View File
| @ -0,0 +1,60 @@ | |||
| <template> | |||
| <j-modal | |||
| :title="title" | |||
| :width="width" | |||
| :visible="visible" | |||
| switchFullscreen | |||
| @ok="handleOk" | |||
| :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" | |||
| @cancel="handleCancel" | |||
| cancelText="关闭"> | |||
| <clock-in-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></clock-in-conf-form> | |||
| </j-modal> | |||
| </template> | |||
| <script> | |||
| import ClockInConfForm from './ClockInConfForm' | |||
| export default { | |||
| name: 'ClockInConfModal', | |||
| components: { | |||
| ClockInConfForm | |||
| }, | |||
| data () { | |||
| return { | |||
| title:'', | |||
| width:800, | |||
| visible: false, | |||
| disableSubmit: false | |||
| } | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.add(); | |||
| }) | |||
| }, | |||
| edit (record) { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.edit(record); | |||
| }) | |||
| }, | |||
| close () { | |||
| this.$emit('close'); | |||
| this.visible = false; | |||
| }, | |||
| handleOk () { | |||
| this.$refs.realForm.submitForm(); | |||
| }, | |||
| submitCallback(){ | |||
| this.$emit('ok'); | |||
| this.visible = false; | |||
| }, | |||
| handleCancel () { | |||
| this.close() | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
+ 28
- 7
admin-hanhai-vue/src/views/xcx/modules/ClockInProjectForm.vue
View File
+ 5
- 5
admin-hanhai-vue/src/views/xcx/modules/ClockInProjectItemForm.vue
View File
+ 5
- 5
admin-hanhai-vue/src/views/xcx/modules/ClockinAuthForm.vue
View File
+ 5
- 5
admin-hanhai-vue/src/views/xcx/modules/ClockinLogForm.vue
View File
+ 5
- 5
admin-hanhai-vue/src/views/xcx/modules/ClockinTeamForm.vue
View File
+ 127
- 0
admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogForm.vue
View File
| @ -0,0 +1,127 @@ | |||
| <template> | |||
| <a-spin :spinning="confirmLoading"> | |||
| <j-form-container :disabled="formDisabled"> | |||
| <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> | |||
| <a-row> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId"> | |||
| <a-input v-model="model.userId" placeholder="请输入用户编号" ></a-input> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="团队编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teamId"> | |||
| <j-dict-select-tag type="list" v-model="model.teamId" dictCode="clockin_team,name,id,del_flag=0" placeholder="请选择团队编号" /> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name"> | |||
| <a-input v-model="model.name" placeholder="请输入姓名" ></a-input> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status"> | |||
| <j-dict-select-tag type="list" v-model="model.status" dictCode="clockin_team_log_status" placeholder="请选择审核状态" /> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <!-- <a-col :span="24">--> | |||
| <!-- <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">--> | |||
| <!-- <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" />--> | |||
| <!-- </a-form-model-item>--> | |||
| <!-- </a-col>--> | |||
| </a-row> | |||
| </a-form-model> | |||
| </j-form-container> | |||
| </a-spin> | |||
| </template> | |||
| <script> | |||
| import { httpAction, getAction } from '@/api/manage' | |||
| import { validateDuplicateValue } from '@/utils/util' | |||
| export default { | |||
| name: 'ClockinTeamLogForm', | |||
| components: { | |||
| }, | |||
| props: { | |||
| //表单禁用 | |||
| disabled: { | |||
| type: Boolean, | |||
| default: false, | |||
| required: false | |||
| } | |||
| }, | |||
| data () { | |||
| return { | |||
| model:{ | |||
| status:0, | |||
| delFlag:0, | |||
| }, | |||
| labelCol: { | |||
| xs: { span: 24 }, | |||
| sm: { span: 5 }, | |||
| }, | |||
| wrapperCol: { | |||
| xs: { span: 24 }, | |||
| sm: { span: 16 }, | |||
| }, | |||
| confirmLoading: false, | |||
| validatorRules: { | |||
| }, | |||
| url: { | |||
| add: "/clockinteamlog/clockinTeamLog/add", | |||
| edit: "/clockinteamlog/clockinTeamLog/edit", | |||
| queryById: "/clockinteamlog/clockinTeamLog/queryById" | |||
| } | |||
| } | |||
| }, | |||
| computed: { | |||
| formDisabled(){ | |||
| return this.disabled | |||
| }, | |||
| }, | |||
| created () { | |||
| //备份model原始值 | |||
| this.modelDefault = JSON.parse(JSON.stringify(this.model)); | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.edit(this.modelDefault); | |||
| }, | |||
| edit (record) { | |||
| this.model = Object.assign({}, record); | |||
| this.visible = true; | |||
| }, | |||
| submitForm () { | |||
| const that = this; | |||
| // 触发表单验证 | |||
| this.$refs.form.validate(valid => { | |||
| if (valid) { | |||
| that.confirmLoading = true; | |||
| let httpurl = ''; | |||
| let method = ''; | |||
| if(!this.model.id){ | |||
| httpurl+=this.url.add; | |||
| method = 'post'; | |||
| }else{ | |||
| httpurl+=this.url.edit; | |||
| method = 'put'; | |||
| } | |||
| httpAction(httpurl,this.model,method).then((res)=>{ | |||
| if(res.success){ | |||
| that.$message.success(res.message); | |||
| that.$emit('ok'); | |||
| }else{ | |||
| that.$message.warning(res.message); | |||
| } | |||
| }).finally(() => { | |||
| that.confirmLoading = false; | |||
| }) | |||
| } | |||
| }) | |||
| }, | |||
| } | |||
| } | |||
| </script> | |||
+ 84
- 0
admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogModal.Style#Drawer.vue
View File
| @ -0,0 +1,84 @@ | |||
| <template> | |||
| <a-drawer | |||
| :title="title" | |||
| :width="width" | |||
| placement="right" | |||
| :closable="false" | |||
| @close="close" | |||
| destroyOnClose | |||
| :visible="visible"> | |||
| <clockin-team-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></clockin-team-log-form> | |||
| <div class="drawer-footer"> | |||
| <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> | |||
| <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> | |||
| </div> | |||
| </a-drawer> | |||
| </template> | |||
| <script> | |||
| import ClockinTeamLogForm from './ClockinTeamLogForm' | |||
| export default { | |||
| name: 'ClockinTeamLogModal', | |||
| components: { | |||
| ClockinTeamLogForm | |||
| }, | |||
| data () { | |||
| return { | |||
| title:"操作", | |||
| width:800, | |||
| visible: false, | |||
| disableSubmit: false | |||
| } | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.add(); | |||
| }) | |||
| }, | |||
| edit (record) { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.edit(record); | |||
| }); | |||
| }, | |||
| close () { | |||
| this.$emit('close'); | |||
| this.visible = false; | |||
| }, | |||
| submitCallback(){ | |||
| this.$emit('ok'); | |||
| this.visible = false; | |||
| }, | |||
| handleOk () { | |||
| this.$refs.realForm.submitForm(); | |||
| }, | |||
| handleCancel () { | |||
| this.close() | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
| <style lang="less" scoped> | |||
| /** Button按钮间距 */ | |||
| .ant-btn { | |||
| margin-left: 30px; | |||
| margin-bottom: 30px; | |||
| float: right; | |||
| } | |||
| .drawer-footer{ | |||
| position: absolute; | |||
| bottom: -8px; | |||
| width: 100%; | |||
| border-top: 1px solid #e8e8e8; | |||
| padding: 10px 16px; | |||
| text-align: right; | |||
| left: 0; | |||
| background: #fff; | |||
| border-radius: 0 0 2px 2px; | |||
| } | |||
| </style> | |||
+ 60
- 0
admin-hanhai-vue/src/views/xcx/modules/ClockinTeamLogModal.vue
View File
| @ -0,0 +1,60 @@ | |||
| <template> | |||
| <j-modal | |||
| :title="title" | |||
| :width="width" | |||
| :visible="visible" | |||
| switchFullscreen | |||
| @ok="handleOk" | |||
| :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" | |||
| @cancel="handleCancel" | |||
| cancelText="关闭"> | |||
| <clockin-team-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></clockin-team-log-form> | |||
| </j-modal> | |||
| </template> | |||
| <script> | |||
| import ClockinTeamLogForm from './ClockinTeamLogForm' | |||
| export default { | |||
| name: 'ClockinTeamLogModal', | |||
| components: { | |||
| ClockinTeamLogForm | |||
| }, | |||
| data () { | |||
| return { | |||
| title:'', | |||
| width:800, | |||
| visible: false, | |||
| disableSubmit: false | |||
| } | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.add(); | |||
| }) | |||
| }, | |||
| edit (record) { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.edit(record); | |||
| }) | |||
| }, | |||
| close () { | |||
| this.$emit('close'); | |||
| this.visible = false; | |||
| }, | |||
| handleOk () { | |||
| this.$refs.realForm.submitForm(); | |||
| }, | |||
| submitCallback(){ | |||
| this.$emit('ok'); | |||
| this.visible = false; | |||
| }, | |||
| handleCancel () { | |||
| this.close() | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
+ 235
- 0
admin-hanhai-vue/src/views/xcx/modules/TencentMapPicker.vue
View File
| @ -0,0 +1,235 @@ | |||
| <template> | |||
| <div> | |||
| <div class="map-box2"> | |||
| <div class="map" ref="map" style="height: 400px" ></div> | |||
| <div class="map-search2"> | |||
| <div> | |||
| <a-input-search id="place" v-model="searchValue" placeholder="请输入详细地址" enter-button @search="searchAddress(searchValue)" /> | |||
| </div> | |||
| <div> | |||
| <ul v-if="kwData.length" class="ul2"> | |||
| <li class="li2" 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-box2 { | |||
| position: relative; | |||
| } | |||
| .map-search2 { | |||
| z-index: 1000; | |||
| display: flex; | |||
| flex-direction: column; | |||
| position: absolute; | |||
| top: 20px; | |||
| left: 20px; | |||
| width: 300px; | |||
| } | |||
| button2 { | |||
| 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%; | |||
| } | |||
| .ul2{ | |||
| background: white; | |||
| list-style-type: none; | |||
| padding-left: 0px; | |||
| height: 280px; | |||
| overflow: scroll; | |||
| } | |||
| .li2{ | |||
| padding-left: 6px; | |||
| font-size: 10px; | |||
| text-align: left; | |||
| height: 40px; | |||
| line-height: 15px; | |||
| display: flex; | |||
| align-items: center; | |||
| } | |||
| .li2:hover{ | |||
| cursor: pointer; | |||
| background: #f5f5f5; | |||
| } | |||
| </style> | |||
+ 2071
- 2049
admin-hanhai-vue/yarn.lock
File diff suppressed because it is too large
View File
+ 19
- 7
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TencentUtils.java
View File
+ 2
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockInproject/entity/ClockInProject.java
View File
+ 2
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockInprojectitem/entity/ClockInProjectItem.java
View File
+ 2
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinauth/entity/ClockinAuth.java
View File
+ 171
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/controller/ClockInConfController.java
View File
| @ -0,0 +1,171 @@ | |||
| package org.jeecg.modules.clockinconf.controller; | |||
| import java.util.Arrays; | |||
| import java.util.List; | |||
| import java.util.Map; | |||
| import java.util.stream.Collectors; | |||
| import java.io.IOException; | |||
| import java.io.UnsupportedEncodingException; | |||
| import java.net.URLDecoder; | |||
| import javax.servlet.http.HttpServletRequest; | |||
| import javax.servlet.http.HttpServletResponse; | |||
| import org.jeecg.common.api.vo.Result; | |||
| import org.jeecg.common.system.query.QueryGenerator; | |||
| import org.jeecg.common.util.oConvertUtils; | |||
| import org.jeecg.modules.clockinconf.entity.ClockInConf; | |||
| import org.jeecg.modules.clockinconf.service.IClockInConfService; | |||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||
| import com.baomidou.mybatisplus.core.metadata.IPage; | |||
| import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| import org.jeecgframework.poi.excel.ExcelImportUtil; | |||
| import org.jeecgframework.poi.excel.def.NormalExcelConstants; | |||
| import org.jeecgframework.poi.excel.entity.ExportParams; | |||
| import org.jeecgframework.poi.excel.entity.ImportParams; | |||
| import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; | |||
| import org.jeecg.common.system.base.controller.JeecgController; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.web.bind.annotation.*; | |||
| import org.springframework.web.multipart.MultipartFile; | |||
| import org.springframework.web.multipart.MultipartHttpServletRequest; | |||
| import org.springframework.web.servlet.ModelAndView; | |||
| import com.alibaba.fastjson.JSON; | |||
| import io.swagger.annotations.Api; | |||
| import io.swagger.annotations.ApiOperation; | |||
| import org.jeecg.common.aspect.annotation.AutoLog; | |||
| /** | |||
| * @Description: clock_in_conf | |||
| * @Author: jeecg-boot | |||
| * @Date: 2024-11-18 | |||
| * @Version: V1.0 | |||
| */ | |||
| @Api(tags="clock_in_conf") | |||
| @RestController | |||
| @RequestMapping("/clockinconf/clockInConf") | |||
| @Slf4j | |||
| public class ClockInConfController extends JeecgController<ClockInConf, IClockInConfService> { | |||
| @Autowired | |||
| private IClockInConfService clockInConfService; | |||
| /** | |||
| * 分页列表查询 | |||
| * | |||
| * @param clockInConf | |||
| * @param pageNo | |||
| * @param pageSize | |||
| * @param req | |||
| * @return | |||
| */ | |||
| //@AutoLog(value = "clock_in_conf-分页列表查询") | |||
| @ApiOperation(value="clock_in_conf-分页列表查询", notes="clock_in_conf-分页列表查询") | |||
| @GetMapping(value = "/list") | |||
| public Result<IPage<ClockInConf>> queryPageList(ClockInConf clockInConf, | |||
| @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, | |||
| @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, | |||
| HttpServletRequest req) { | |||
| QueryWrapper<ClockInConf> queryWrapper = QueryGenerator.initQueryWrapper(clockInConf, req.getParameterMap()); | |||
| Page<ClockInConf> page = new Page<ClockInConf>(pageNo, pageSize); | |||
| IPage<ClockInConf> pageList = clockInConfService.page(page, queryWrapper); | |||
| return Result.OK(pageList); | |||
| } | |||
| /** | |||
| * 添加 | |||
| * | |||
| * @param clockInConf | |||
| * @return | |||
| */ | |||
| @AutoLog(value = "clock_in_conf-添加") | |||
| @ApiOperation(value="clock_in_conf-添加", notes="clock_in_conf-添加") | |||
| @PostMapping(value = "/add") | |||
| public Result<String> add(@RequestBody ClockInConf clockInConf) { | |||
| clockInConfService.save(clockInConf); | |||
| return Result.OK("添加成功！"); | |||
| } | |||
| /** | |||
| * 编辑 | |||
| * | |||
| * @param clockInConf | |||
| * @return | |||
| */ | |||
| @AutoLog(value = "clock_in_conf-编辑") | |||
| @ApiOperation(value="clock_in_conf-编辑", notes="clock_in_conf-编辑") | |||
| @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) | |||
| public Result<String> edit(@RequestBody ClockInConf clockInConf) { | |||
| clockInConfService.updateById(clockInConf); | |||
| return Result.OK("编辑成功!"); | |||
| } | |||
| /** | |||
| * 通过id删除 | |||
| * | |||
| * @param id | |||
| * @return | |||
| */ | |||
| @AutoLog(value = "clock_in_conf-通过id删除") | |||
| @ApiOperation(value="clock_in_conf-通过id删除", notes="clock_in_conf-通过id删除") | |||
| @DeleteMapping(value = "/delete") | |||
| public Result<String> delete(@RequestParam(name="id",required=true) String id) { | |||
| clockInConfService.removeById(id); | |||
| return Result.OK("删除成功!"); | |||
| } | |||
| /** | |||
| * 批量删除 | |||
| * | |||
| * @param ids | |||
| * @return | |||
| */ | |||
| @AutoLog(value = "clock_in_conf-批量删除") | |||
| @ApiOperation(value="clock_in_conf-批量删除", notes="clock_in_conf-批量删除") | |||
| @DeleteMapping(value = "/deleteBatch") | |||
| public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { | |||
| this.clockInConfService.removeByIds(Arrays.asList(ids.split(","))); | |||
| return Result.OK("批量删除成功!"); | |||
| } | |||
| /** | |||
| * 通过id查询 | |||
| * | |||
| * @param id | |||
| * @return | |||
| */ | |||
| //@AutoLog(value = "clock_in_conf-通过id查询") | |||
| @ApiOperation(value="clock_in_conf-通过id查询", notes="clock_in_conf-通过id查询") | |||
| @GetMapping(value = "/queryById") | |||
| public Result<ClockInConf> queryById(@RequestParam(name="id",required=true) String id) { | |||
| ClockInConf clockInConf = clockInConfService.getById(id); | |||
| if(clockInConf==null) { | |||
| return Result.error("未找到对应数据"); | |||
| } | |||
| return Result.OK(clockInConf); | |||
| } | |||
| /** | |||
| * 导出excel | |||
| * | |||
| * @param request | |||
| * @param clockInConf | |||
| */ | |||
| @RequestMapping(value = "/exportXls") | |||
| public ModelAndView exportXls(HttpServletRequest request, ClockInConf clockInConf) { | |||
| return super.exportXls(request, clockInConf, ClockInConf.class, "clock_in_conf"); | |||
| } | |||
| /** | |||
| * 通过excel导入数据 | |||
| * | |||
| * @param request | |||
| * @param response | |||
| * @return | |||
| */ | |||
| @RequestMapping(value = "/importExcel", method = RequestMethod.POST) | |||
| public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { | |||
| return super.importExcel(request, response, ClockInConf.class); | |||
| } | |||
| } | |||
+ 67
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/entity/ClockInConf.java
View File
| @ -0,0 +1,67 @@ | |||
| package org.jeecg.modules.clockinconf.entity; | |||
| import java.io.Serializable; | |||
| import java.io.UnsupportedEncodingException; | |||
| import java.util.Date; | |||
| import java.math.BigDecimal; | |||
| import com.baomidou.mybatisplus.annotation.IdType; | |||
| import com.baomidou.mybatisplus.annotation.TableId; | |||
| import com.baomidou.mybatisplus.annotation.TableLogic; | |||
| import com.baomidou.mybatisplus.annotation.TableName; | |||
| import lombok.Data; | |||
| import com.fasterxml.jackson.annotation.JsonFormat; | |||
| import org.springframework.format.annotation.DateTimeFormat; | |||
| import org.jeecgframework.poi.excel.annotation.Excel; | |||
| import org.jeecg.common.aspect.annotation.Dict; | |||
| import io.swagger.annotations.ApiModel; | |||
| import io.swagger.annotations.ApiModelProperty; | |||
| import lombok.EqualsAndHashCode; | |||
| import lombok.experimental.Accessors; | |||
| /** | |||
| * @Description: clock_in_conf | |||
| * @Author: jeecg-boot | |||
| * @Date: 2024-11-18 | |||
| * @Version: V1.0 | |||
| */ | |||
| @Data | |||
| @TableName("clock_in_conf") | |||
| @Accessors(chain = true) | |||
| @EqualsAndHashCode(callSuper = false) | |||
| @ApiModel(value="clock_in_conf对象", description="clock_in_conf") | |||
| public class ClockInConf implements Serializable { | |||
| private static final long serialVersionUID = 1L; | |||
| /**id*/ | |||
| @TableId(type = IdType.ASSIGN_ID) | |||
| @ApiModelProperty(value = "id") | |||
| private java.lang.Integer id; | |||
| /**健名*/ | |||
| @Excel(name = "健名", width = 15) | |||
| @ApiModelProperty(value = "健名") | |||
| private java.lang.String name; | |||
| /**值*/ | |||
| @Excel(name = "值", width = 15) | |||
| @ApiModelProperty(value = "值") | |||
| private java.lang.String value; | |||
| /**说明*/ | |||
| @Excel(name = "说明", width = 15) | |||
| @ApiModelProperty(value = "说明") | |||
| private java.lang.String info; | |||
| /**是否删除*/ | |||
| @TableLogic | |||
| @Excel(name = "是否删除", width = 15, dicCode = "is_delete") | |||
| @Dict(dicCode = "is_delete") | |||
| @ApiModelProperty(value = "是否删除") | |||
| private java.lang.Integer delFlag; | |||
| /**创建时间*/ | |||
| @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") | |||
| @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") | |||
| @ApiModelProperty(value = "创建时间") | |||
| private java.util.Date createTime; | |||
| /**修改时间*/ | |||
| @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") | |||
| @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") | |||
| @ApiModelProperty(value = "修改时间") | |||
| private java.util.Date updateTime; | |||
| } | |||
+ 17
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/mapper/ClockInConfMapper.java
View File
| @ -0,0 +1,17 @@ | |||
| package org.jeecg.modules.clockinconf.mapper; | |||
| import java.util.List; | |||
| import org.apache.ibatis.annotations.Param; | |||
| import org.jeecg.modules.clockinconf.entity.ClockInConf; | |||
| import com.baomidou.mybatisplus.core.mapper.BaseMapper; | |||
| /** | |||
| * @Description: clock_in_conf | |||
| * @Author: jeecg-boot | |||
| * @Date: 2024-11-18 | |||
| * @Version: V1.0 | |||
| */ | |||
| public interface ClockInConfMapper extends BaseMapper<ClockInConf> { | |||
| } | |||
+ 5
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/mapper/xml/ClockInConfMapper.xml
View File
| @ -0,0 +1,5 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |||
| <mapper namespace="org.jeecg.modules.clockinconf.mapper.ClockInConfMapper"> | |||
| </mapper> | |||
+ 16
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/service/IClockInConfService.java
View File
| @ -0,0 +1,16 @@ | |||
| package org.jeecg.modules.clockinconf.service; | |||
| import org.jeecg.modules.clockinconf.entity.ClockInConf; | |||
| import com.baomidou.mybatisplus.extension.service.IService; | |||
| /** | |||
| * @Description: clock_in_conf | |||
| * @Author: jeecg-boot | |||
| * @Date: 2024-11-18 | |||
| * @Version: V1.0 | |||
| */ | |||
| public interface IClockInConfService extends IService<ClockInConf> { | |||
| String getConf(String name); | |||
| } | |||
+ 27
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/service/impl/ClockInConfServiceImpl.java
View File
| @ -0,0 +1,27 @@ | |||
| package org.jeecg.modules.clockinconf.service.impl; | |||
| import org.jeecg.modules.clockinconf.entity.ClockInConf; | |||
| import org.jeecg.modules.clockinconf.mapper.ClockInConfMapper; | |||
| import org.jeecg.modules.clockinconf.service.IClockInConfService; | |||
| import org.springframework.stereotype.Service; | |||
| import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||
| /** | |||
| * @Description: clock_in_conf | |||
| * @Author: jeecg-boot | |||
| * @Date: 2024-11-18 | |||
| * @Version: V1.0 | |||
| */ | |||
| @Service | |||
| public class ClockInConfServiceImpl extends ServiceImpl<ClockInConfMapper, ClockInConf> implements IClockInConfService { | |||
| @Override | |||
| public String getConf(String name) { | |||
| ClockInConf clockInConf = this.lambdaQuery() | |||
| .eq(ClockInConf::getDelFlag, 0) | |||
| .eq(ClockInConf::getName, name) | |||
| .one(); | |||
| return clockInConf.getValue(); | |||
| } | |||
| } | |||
+ 195
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/ClockInConfList.vue
View File
| @ -0,0 +1,195 @@ | |||
| <template> | |||
| <a-card :bordered="false"> | |||
| <!-- 查询区域 --> | |||
| <!-- <div class="table-page-search-wrapper">--> | |||
| <!-- <a-form layout="inline" @keyup.enter.native="searchQuery">--> | |||
| <!-- <a-row :gutter="24">--> | |||
| <!-- </a-row>--> | |||
| <!-- </a-form>--> | |||
| <!-- </div>--> | |||
| <!-- 查询区域-END --> | |||
| <!-- 操作按钮区域 --> | |||
| <div class="table-operator"> | |||
| <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> | |||
| <!-- <a-button type="primary" icon="download" @click="handleExportXls('clock_in_conf')">导出</a-button>--> | |||
| <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> | |||
| <!-- <a-button type="primary" icon="import">导入</a-button>--> | |||
| <!-- </a-upload>--> | |||
| <!-- 高级查询区域 --> | |||
| <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> | |||
| <a-dropdown v-if="selectedRowKeys.length > 0"> | |||
| <!-- <a-menu slot="overlay">--> | |||
| <!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>--> | |||
| <!-- </a-menu>--> | |||
| <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> | |||
| </a-dropdown> | |||
| </div> | |||
| <!-- table区域-begin --> | |||
| <div> | |||
| <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> | |||
| <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 | |||
| <a style="margin-left: 24px" @click="onClearSelected">清空</a> | |||
| </div> | |||
| <a-table | |||
| ref="table" | |||
| size="middle" | |||
| :scroll="{x:true}" | |||
| bordered | |||
| rowKey="id" | |||
| :columns="columns" | |||
| :dataSource="dataSource" | |||
| :pagination="ipagination" | |||
| :loading="loading" | |||
| :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" | |||
| class="j-table-force-nowrap" | |||
| @change="handleTableChange"> | |||
| <template slot="textSlot" slot-scope="text"> | |||
| <j-ellipsis :value="text"></j-ellipsis> | |||
| </template> | |||
| <template slot="htmlSlot" slot-scope="text"> | |||
| <div v-html="text"></div> | |||
| </template> | |||
| <template slot="imgSlot" slot-scope="text,record"> | |||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> | |||
| <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> | |||
| </template> | |||
| <template slot="fileSlot" slot-scope="text"> | |||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> | |||
| <a-button | |||
| v-else | |||
| :ghost="true" | |||
| type="primary" | |||
| icon="download" | |||
| size="small" | |||
| @click="downloadFile(text)"> | |||
| 下载 | |||
| </a-button> | |||
| </template> | |||
| <span slot="action" slot-scope="text, record"> | |||
| <a @click="handleEdit(record)">编辑</a> | |||
| <a-divider type="vertical" /> | |||
| <a-dropdown> | |||
| <a class="ant-dropdown-link">更多 <a-icon type="down" /></a> | |||
| <a-menu slot="overlay"> | |||
| <a-menu-item> | |||
| <a @click="handleDetail(record)">详情</a> | |||
| </a-menu-item> | |||
| <!-- <a-menu-item>--> | |||
| <!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> | |||
| <!-- <a>删除</a>--> | |||
| <!-- </a-popconfirm>--> | |||
| <!-- </a-menu-item>--> | |||
| </a-menu> | |||
| </a-dropdown> | |||
| </span> | |||
| </a-table> | |||
| </div> | |||
| <clock-in-conf-modal ref="modalForm" @ok="modalFormOk"></clock-in-conf-modal> | |||
| </a-card> | |||
| </template> | |||
| <script> | |||
| import '@/assets/less/TableExpand.less' | |||
| import { mixinDevice } from '@/utils/mixin' | |||
| import { JeecgListMixin } from '@/mixins/JeecgListMixin' | |||
| import ClockInConfModal from './modules/ClockInConfModal' | |||
| import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' | |||
| export default { | |||
| name: 'ClockInConfList', | |||
| mixins:[JeecgListMixin, mixinDevice], | |||
| components: { | |||
| ClockInConfModal | |||
| }, | |||
| data () { | |||
| return { | |||
| description: 'clock_in_conf管理页面', | |||
| // 表头 | |||
| columns: [ | |||
| { | |||
| title: '#', | |||
| dataIndex: '', | |||
| key:'rowIndex', | |||
| width:60, | |||
| align:"center", | |||
| customRender:function (t,r,index) { | |||
| return parseInt(index)+1; | |||
| } | |||
| }, | |||
| { | |||
| title:'健名', | |||
| align:"center", | |||
| dataIndex: 'name' | |||
| }, | |||
| { | |||
| title:'值', | |||
| align:"center", | |||
| dataIndex: 'value', | |||
| scopedSlots: {customRender: 'textSlot'} | |||
| }, | |||
| { | |||
| title:'说明', | |||
| align:"center", | |||
| dataIndex: 'info', | |||
| scopedSlots: {customRender: 'textSlot'} | |||
| }, | |||
| { | |||
| title:'是否删除', | |||
| align:"center", | |||
| dataIndex: 'delFlag_dictText' | |||
| }, | |||
| { | |||
| title: '操作', | |||
| dataIndex: 'action', | |||
| align:"center", | |||
| fixed:"right", | |||
| width:147, | |||
| scopedSlots: { customRender: 'action' } | |||
| } | |||
| ], | |||
| url: { | |||
| list: "/clockinconf/clockInConf/list", | |||
| delete: "/clockinconf/clockInConf/delete", | |||
| deleteBatch: "/clockinconf/clockInConf/deleteBatch", | |||
| exportXlsUrl: "/clockinconf/clockInConf/exportXls", | |||
| importExcelUrl: "clockinconf/clockInConf/importExcel", | |||
| }, | |||
| dictOptions:{}, | |||
| superFieldList:[], | |||
| } | |||
| }, | |||
| created() { | |||
| this.getSuperFieldList(); | |||
| }, | |||
| computed: { | |||
| importExcelUrl: function(){ | |||
| return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; | |||
| }, | |||
| }, | |||
| methods: { | |||
| initDictConfig(){ | |||
| }, | |||
| getSuperFieldList(){ | |||
| let fieldList=[]; | |||
| fieldList.push({type:'string',value:'name',text:'健名',dictCode:''}) | |||
| fieldList.push({type:'string',value:'value',text:'值',dictCode:''}) | |||
| fieldList.push({type:'string',value:'info',text:'说明',dictCode:''}) | |||
| fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'}) | |||
| this.superFieldList = fieldList | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
| <style scoped> | |||
| @import '~@assets/less/common.less'; | |||
| </style> | |||
+ 123
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfForm.vue
View File
| @ -0,0 +1,123 @@ | |||
| <template> | |||
| <a-spin :spinning="confirmLoading"> | |||
| <j-form-container :disabled="formDisabled"> | |||
| <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> | |||
| <a-row> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="健名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name"> | |||
| <a-input v-model="model.name" placeholder="请输入健名" ></a-input> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value"> | |||
| <a-textarea v-model="model.value" rows="4" placeholder="请输入值" /> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info"> | |||
| <a-textarea v-model="model.info" rows="4" placeholder="请输入说明" /> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| <a-col :span="24"> | |||
| <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag"> | |||
| <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除" /> | |||
| </a-form-model-item> | |||
| </a-col> | |||
| </a-row> | |||
| </a-form-model> | |||
| </j-form-container> | |||
| </a-spin> | |||
| </template> | |||
| <script> | |||
| import { httpAction, getAction } from '@/api/manage' | |||
| import { validateDuplicateValue } from '@/utils/util' | |||
| export default { | |||
| name: 'ClockInConfForm', | |||
| components: { | |||
| }, | |||
| props: { | |||
| //表单禁用 | |||
| disabled: { | |||
| type: Boolean, | |||
| default: false, | |||
| required: false | |||
| } | |||
| }, | |||
| data () { | |||
| return { | |||
| model:{ | |||
| delFlag:0, | |||
| }, | |||
| labelCol: { | |||
| xs: { span: 24 }, | |||
| sm: { span: 5 }, | |||
| }, | |||
| wrapperCol: { | |||
| xs: { span: 24 }, | |||
| sm: { span: 16 }, | |||
| }, | |||
| confirmLoading: false, | |||
| validatorRules: { | |||
| delFlag: [ | |||
| { required: true, message: '请输入是否删除!'}, | |||
| ], | |||
| }, | |||
| url: { | |||
| add: "/clockinconf/clockInConf/add", | |||
| edit: "/clockinconf/clockInConf/edit", | |||
| queryById: "/clockinconf/clockInConf/queryById" | |||
| } | |||
| } | |||
| }, | |||
| computed: { | |||
| formDisabled(){ | |||
| return this.disabled | |||
| }, | |||
| }, | |||
| created () { | |||
| //备份model原始值 | |||
| this.modelDefault = JSON.parse(JSON.stringify(this.model)); | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.edit(this.modelDefault); | |||
| }, | |||
| edit (record) { | |||
| this.model = Object.assign({}, record); | |||
| this.visible = true; | |||
| }, | |||
| submitForm () { | |||
| const that = this; | |||
| // 触发表单验证 | |||
| this.$refs.form.validate(valid => { | |||
| if (valid) { | |||
| that.confirmLoading = true; | |||
| let httpurl = ''; | |||
| let method = ''; | |||
| if(!this.model.id){ | |||
| httpurl+=this.url.add; | |||
| method = 'post'; | |||
| }else{ | |||
| httpurl+=this.url.edit; | |||
| method = 'put'; | |||
| } | |||
| httpAction(httpurl,this.model,method).then((res)=>{ | |||
| if(res.success){ | |||
| that.$message.success(res.message); | |||
| that.$emit('ok'); | |||
| }else{ | |||
| that.$message.warning(res.message); | |||
| } | |||
| }).finally(() => { | |||
| that.confirmLoading = false; | |||
| }) | |||
| } | |||
| }) | |||
| }, | |||
| } | |||
| } | |||
| </script> | |||
+ 84
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfModal.Style#Drawer.vue
View File
| @ -0,0 +1,84 @@ | |||
| <template> | |||
| <a-drawer | |||
| :title="title" | |||
| :width="width" | |||
| placement="right" | |||
| :closable="false" | |||
| @close="close" | |||
| destroyOnClose | |||
| :visible="visible"> | |||
| <clock-in-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></clock-in-conf-form> | |||
| <div class="drawer-footer"> | |||
| <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> | |||
| <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> | |||
| </div> | |||
| </a-drawer> | |||
| </template> | |||
| <script> | |||
| import ClockInConfForm from './ClockInConfForm' | |||
| export default { | |||
| name: 'ClockInConfModal', | |||
| components: { | |||
| ClockInConfForm | |||
| }, | |||
| data () { | |||
| return { | |||
| title:"操作", | |||
| width:800, | |||
| visible: false, | |||
| disableSubmit: false | |||
| } | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.add(); | |||
| }) | |||
| }, | |||
| edit (record) { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.edit(record); | |||
| }); | |||
| }, | |||
| close () { | |||
| this.$emit('close'); | |||
| this.visible = false; | |||
| }, | |||
| submitCallback(){ | |||
| this.$emit('ok'); | |||
| this.visible = false; | |||
| }, | |||
| handleOk () { | |||
| this.$refs.realForm.submitForm(); | |||
| }, | |||
| handleCancel () { | |||
| this.close() | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
| <style lang="less" scoped> | |||
| /** Button按钮间距 */ | |||
| .ant-btn { | |||
| margin-left: 30px; | |||
| margin-bottom: 30px; | |||
| float: right; | |||
| } | |||
| .drawer-footer{ | |||
| position: absolute; | |||
| bottom: -8px; | |||
| width: 100%; | |||
| border-top: 1px solid #e8e8e8; | |||
| padding: 10px 16px; | |||
| text-align: right; | |||
| left: 0; | |||
| background: #fff; | |||
| border-radius: 0 0 2px 2px; | |||
| } | |||
| </style> | |||
+ 60
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue/modules/ClockInConfModal.vue
View File
| @ -0,0 +1,60 @@ | |||
| <template> | |||
| <j-modal | |||
| :title="title" | |||
| :width="width" | |||
| :visible="visible" | |||
| switchFullscreen | |||
| @ok="handleOk" | |||
| :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" | |||
| @cancel="handleCancel" | |||
| cancelText="关闭"> | |||
| <clock-in-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></clock-in-conf-form> | |||
| </j-modal> | |||
| </template> | |||
| <script> | |||
| import ClockInConfForm from './ClockInConfForm' | |||
| export default { | |||
| name: 'ClockInConfModal', | |||
| components: { | |||
| ClockInConfForm | |||
| }, | |||
| data () { | |||
| return { | |||
| title:'', | |||
| width:800, | |||
| visible: false, | |||
| disableSubmit: false | |||
| } | |||
| }, | |||
| methods: { | |||
| add () { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.add(); | |||
| }) | |||
| }, | |||
| edit (record) { | |||
| this.visible=true | |||
| this.$nextTick(()=>{ | |||
| this.$refs.realForm.edit(record); | |||
| }) | |||
| }, | |||
| close () { | |||
| this.$emit('close'); | |||
| this.visible = false; | |||
| }, | |||
| handleOk () { | |||
| this.$refs.realForm.submitForm(); | |||
| }, | |||
| submitCallback(){ | |||
| this.$emit('ok'); | |||
| this.visible = false; | |||
| }, | |||
| handleCancel () { | |||
| this.close() | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
+ 61
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConf.api.ts
View File
| @ -0,0 +1,61 @@ | |||
| import {defHttp} from '/@/utils/http/axios'; | |||
| import {Modal} from 'ant-design-vue'; | |||
| enum Api { | |||
| list = '/clockinconf/clockInConf/list', | |||
| save='/clockinconf/clockInConf/add', | |||
| edit='/clockinconf/clockInConf/edit', | |||
| deleteOne = '/clockinconf/clockInConf/delete', | |||
| deleteBatch = '/clockinconf/clockInConf/deleteBatch', | |||
| importExcel = '/clockinconf/clockInConf/importExcel', | |||
| exportXls = '/clockinconf/clockInConf/exportXls', | |||
| } | |||
| /** | |||
| * 导出api | |||
| * @param params | |||
| */ | |||
| export const getExportUrl = Api.exportXls; | |||
| /** | |||
| * 导入api | |||
| */ | |||
| export const getImportUrl = Api.importExcel; | |||
| /** | |||
| * 列表接口 | |||
| * @param params | |||
| */ | |||
| export const list = (params) => | |||
| defHttp.get({url: Api.list, params}); | |||
| /** | |||
| * 删除单个 | |||
| */ | |||
| export const deleteOne = (params,handleSuccess) => { | |||
| return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { | |||
| handleSuccess(); | |||
| }); | |||
| } | |||
| /** | |||
| * 批量删除 | |||
| * @param params | |||
| */ | |||
| export const batchDelete = (params, handleSuccess) => { | |||
| Modal.confirm({ | |||
| title: '确认删除', | |||
| content: '是否删除选中数据', | |||
| okText: '确认', | |||
| cancelText: '取消', | |||
| onOk: () => { | |||
| return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { | |||
| handleSuccess(); | |||
| }); | |||
| } | |||
| }); | |||
| } | |||
| /** | |||
| * 保存或者更新 | |||
| * @param params | |||
| */ | |||
| export const saveOrUpdate = (params, isUpdate) => { | |||
| let url = isUpdate ? Api.edit : Api.save; | |||
| return defHttp.post({url: url, params}); | |||
| } | |||
+ 61
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConf.data.ts
View File
| @ -0,0 +1,61 @@ | |||
| import {BasicColumn} from '/@/components/Table'; | |||
| import {FormSchema} from '/@/components/Table'; | |||
| import { rules} from '/@/utils/helper/validator'; | |||
| import { render } from '/@/utils/common/renderUtils'; | |||
| //列表数据 | |||
| export const columns: BasicColumn[] = [ | |||
| { | |||
| title: '健名', | |||
| align:"center", | |||
| dataIndex: 'name' | |||
| }, | |||
| { | |||
| title: '值', | |||
| align:"center", | |||
| dataIndex: 'value' | |||
| }, | |||
| { | |||
| title: '说明', | |||
| align:"center", | |||
| dataIndex: 'info' | |||
| }, | |||
| { | |||
| title: '是否删除', | |||
| align:"center", | |||
| dataIndex: 'delFlag_dictText' | |||
| }, | |||
| ]; | |||
| //查询数据 | |||
| export const searchFormSchema: FormSchema[] = [ | |||
| ]; | |||
| //表单数据 | |||
| export const formSchema: FormSchema[] = [ | |||
| { | |||
| label: '健名', | |||
| field: 'name', | |||
| component: 'Input', | |||
| }, | |||
| { | |||
| label: '值', | |||
| field: 'value', | |||
| component: 'InputTextArea',//TODO 注意string转换问题 | |||
| }, | |||
| { | |||
| label: '说明', | |||
| field: 'info', | |||
| component: 'InputTextArea',//TODO 注意string转换问题 | |||
| }, | |||
| { | |||
| label: '是否删除', | |||
| field: 'delFlag', | |||
| component: 'JDictSelectTag', | |||
| componentProps:{ | |||
| dictCode:"is_delete" | |||
| }, | |||
| dynamicRules: ({model,schema}) => { | |||
| return [ | |||
| { required: true, message: '请输入是否删除!'}, | |||
| ]; | |||
| }, | |||
| }, | |||
| ]; | |||
+ 162
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/ClockInConfList.vue
View File
| @ -0,0 +1,162 @@ | |||
| <template> | |||
| <div> | |||
| <!--引用表格--> | |||
| <BasicTable @register="registerTable" :rowSelection="rowSelection"> | |||
| <!--插槽:table标题--> | |||
| <template #tableTitle> | |||
| <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> | |||
| <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> | |||
| <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> | |||
| <a-dropdown v-if="checkedKeys.length > 0"> | |||
| <template #overlay> | |||
| <a-menu> | |||
| <a-menu-item key="1" @click="batchHandleDelete"> | |||
| <Icon icon="ant-design:delete-outlined"></Icon> | |||
| 删除 | |||
| </a-menu-item> | |||
| </a-menu> | |||
| </template> | |||
| <a-button>批量操作 | |||
| <Icon icon="mdi:chevron-down"></Icon> | |||
| </a-button> | |||
| </a-dropdown> | |||
| </template> | |||
| <!--操作栏--> | |||
| <template #action="{ record }"> | |||
| <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/> | |||
| </template> | |||
| <!--字段回显插槽--> | |||
| <template #htmlSlot="{text}"> | |||
| <div v-html="text"></div> | |||
| </template> | |||
| <template #fileSlot="{text}"> | |||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> | |||
| <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button> | |||
| </template> | |||
| </BasicTable> | |||
| <!-- 表单区域 --> | |||
| <ClockInConfModal @register="registerModal" @success="handleSuccess"></ClockInConfModal> | |||
| </div> | |||
| </template> | |||
| <script lang="ts" name="clockinconf-clockInConf" setup> | |||
| import {ref, computed, unref} from 'vue'; | |||
| import {BasicTable, useTable, TableAction} from '/@/components/Table'; | |||
| import {useModal} from '/@/components/Modal'; | |||
| import { useListPage } from '/@/hooks/system/useListPage' | |||
| import ClockInConfModal from './components/ClockInConfModal.vue' | |||
| import {columns, searchFormSchema} from './clockInConf.data'; | |||
| import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './clockInConf.api'; | |||
| const checkedKeys = ref<Array<string | number>>([]); | |||
| //注册model | |||
| const [registerModal, {openModal}] = useModal(); | |||
| //注册table数据 | |||
| const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ | |||
| tableProps:{ | |||
| title: 'clock_in_conf', | |||
| api: list, | |||
| columns, | |||
| canResize:false, | |||
| formConfig: { | |||
| labelWidth: 120, | |||
| schemas: searchFormSchema, | |||
| autoSubmitOnEnter:true, | |||
| showAdvancedButton:true, | |||
| fieldMapToTime: [ | |||
| ], | |||
| }, | |||
| actionColumn: { | |||
| width: 120, | |||
| }, | |||
| }, | |||
| exportConfig: { | |||
| name:"clock_in_conf", | |||
| url: getExportUrl, | |||
| }, | |||
| importConfig: { | |||
| url: getImportUrl | |||
| }, | |||
| }) | |||
| const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext | |||
| /** | |||
| * 新增事件 | |||
| */ | |||
| function handleAdd() { | |||
| openModal(true, { | |||
| isUpdate: false, | |||
| showFooter: true, | |||
| }); | |||
| } | |||
| /** | |||
| * 编辑事件 | |||
| */ | |||
| function handleEdit(record: Recordable) { | |||
| openModal(true, { | |||
| record, | |||
| isUpdate: true, | |||
| showFooter: true, | |||
| }); | |||
| } | |||
| /** | |||
| * 详情 | |||
| */ | |||
| function handleDetail(record: Recordable) { | |||
| openModal(true, { | |||
| record, | |||
| isUpdate: true, | |||
| showFooter: false, | |||
| }); | |||
| } | |||
| /** | |||
| * 删除事件 | |||
| */ | |||
| async function handleDelete(record) { | |||
| await deleteOne({id: record.id}, reload); | |||
| } | |||
| /** | |||
| * 批量删除事件 | |||
| */ | |||
| async function batchHandleDelete() { | |||
| await batchDelete({ids: checkedKeys.value}, reload); | |||
| } | |||
| /** | |||
| * 成功回调 | |||
| */ | |||
| function handleSuccess() { | |||
| reload(); | |||
| } | |||
| /** | |||
| * 操作栏 | |||
| */ | |||
| function getTableAction(record){ | |||
| return [ | |||
| { | |||
| label: '编辑', | |||
| onClick: handleEdit.bind(null, record), | |||
| } | |||
| ] | |||
| } | |||
| /** | |||
| * 下拉操作栏 | |||
| */ | |||
| function getDropDownAction(record){ | |||
| return [ | |||
| { | |||
| label: '详情', | |||
| onClick: handleDetail.bind(null, record), | |||
| }, { | |||
| label: '删除', | |||
| popConfirm: { | |||
| title: '是否确认删除', | |||
| confirm: handleDelete.bind(null, record), | |||
| } | |||
| } | |||
| ] | |||
| } | |||
| </script> | |||
| <style scoped> | |||
| </style> | |||
+ 58
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinconf/vue3/components/ClockInConfModal.vue
View File
| @ -0,0 +1,58 @@ | |||
| <template> | |||
| <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit"> | |||
| <BasicForm @register="registerForm"/> | |||
| </BasicModal> | |||
| </template> | |||
| <script lang="ts" setup> | |||
| import {ref, computed, unref} from 'vue'; | |||
| import {BasicModal, useModalInner} from '/@/components/Modal'; | |||
| import {BasicForm, useForm} from '/@/components/Form/index'; | |||
| import {formSchema} from '../clockInConf.data'; | |||
| import {saveOrUpdate} from '../clockInConf.api'; | |||
| // Emits声明 | |||
| const emit = defineEmits(['register','success']); | |||
| const isUpdate = ref(true); | |||
| //表单配置 | |||
| const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({ | |||
| labelWidth: 150, | |||
| schemas: formSchema, | |||
| showActionButtonGroup: false, | |||
| }); | |||
| //表单赋值 | |||
| const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => { | |||
| //重置表单 | |||
| await resetFields(); | |||
| setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter}); | |||
| isUpdate.value = !!data?.isUpdate; | |||
| if (unref(isUpdate)) { | |||
| //表单赋值 | |||
| await setFieldsValue({ | |||
| ...data.record, | |||
| }); | |||
| } | |||
| // 隐藏底部时禁用整个表单 | |||
| setProps({ disabled: !data?.showFooter }) | |||
| }); | |||
| //设置标题 | |||
| const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑')); | |||
| //表单提交事件 | |||
| async function handleSubmit(v) { | |||
| try { | |||
| let values = await validate(); | |||
| setModalProps({confirmLoading: true}); | |||
| //提交表单 | |||
| await saveOrUpdate(values, isUpdate.value); | |||
| //关闭弹窗 | |||
| closeModal(); | |||
| //刷新列表 | |||
| emit('success'); | |||
| } finally { | |||
| setModalProps({confirmLoading: false}); | |||
| } | |||
| } | |||
| </script> | |||
| <style lang="less" scoped> | |||
| </style> | |||