From 22176cac7435d40daed4227f59e3ec4e52eb20b3 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Fri, 25 Nov 2022 11:58:12 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/abilityStatistics/index.vue | 51 +- .../modules/activiti/my-work-dynamics.vue | 72 +- .../src/views/modules/canassigncase/index.vue | 12 +- back/src/views/modules/sys/user.vue | 49 +- front/src/views/home/DetailsPageconetent.vue | 6 +- .../home/components/searchResultList.vue | 79 +- front/src/views/home/detailBack.vue | 123 +- .../instructionManual/components/menuBook.vue | 2 +- .../views/newHome/components/WorkDynamics.vue | 2 +- .../personalCenter/components/MyPublish.vue | 1215 +++++++++-------- 10 files changed, 886 insertions(+), 725 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index 5978155a..4e9ed28a 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -10,8 +10,8 @@ end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> - - + + 上架部门： 申请部门： @@ -36,9 +36,9 @@ 导出全部 - + -
+
@@ -47,7 +47,7 @@ end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> - + 审核状态： @@ -68,9 +68,9 @@ v-bind="item"> - + - + 提供部门： @@ -80,9 +80,7 @@ - - - + @@ -121,13 +119,11 @@ 导出全部 - +
-
-
返回 + 统计
@@ -267,7 +263,7 @@ export default { data () { return { checked: false, - provideSelects:[], + provideSelects: [], departmentSelects: [], exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export', exportExcelCondition: '', @@ -374,7 +370,7 @@ export default { status: '', value1: [], // 起始时间 abilityDepartment: '', // 上架部门或申请部门 - provideDepartment:'',//提供部门 + provideDepartment: '', // 提供部门 abilityType: '', // 能力 beginTime: '', // 开始时间 endTime: '', // 结束时间 @@ -718,7 +714,7 @@ export default { }) }) }, - // 能力使用明细 + // 能力使用明细 getTwoDetail (page) { var passAndReview = '' // 转变"通过"字段为通过 if (this.examineStatus == '-1') { @@ -744,7 +740,7 @@ export default { startDate: this.startDate, endDate: this.endDate, resourceName: this.resourceName, - provideDept:this.provideDepartment + provideDept: this.provideDepartment } }) @@ -758,7 +754,7 @@ export default { startDate: this.startDate, endDate: this.endDate, resourceName: this.resourceName, - provideDept:this.provideDepartment + provideDept: this.provideDepartment }) }) }, @@ -873,7 +869,7 @@ export default { this.exportExcelType = 'SelectApplyDeptDetailTypeCountList' this.getSecondTree() } else { - + } } else if (index === 3) { this.detailFlag = false @@ -881,7 +877,7 @@ export default { this.exportExcelType = 'SelectCensusResourceTable' this.getOneDetail() } else { - + } } else if (index === 4) { this.detailFlag = false @@ -986,10 +982,10 @@ export default { this.endDate = '' this.examineStatus = '' this.abilityDepartment = '' - this.provideDepartment='' + this.provideDepartment = '' this.abilityType = '' this.approveStatus = '' - this.resourceName='' + this.resourceName = '' this.exportExcelCondition = qs.stringify({ approveStatus: this.status, deptId: this.abilityDepartment, @@ -997,14 +993,13 @@ export default { endDate: this.endDate, resourceName: this.resourceName }) - if (this.departmentId === 1) {//能力上架统计 + if (this.departmentId === 1) { // 能力上架统计 this.handleChose(1) - } else if (this.departmentId === 2) {//能力使用统计 + } else if (this.departmentId === 2) { // 能力使用统计 this.handleChose(2) - - } else if (this.departmentId === 3) {//能力上架明细 + } else if (this.departmentId === 3) { // 能力上架明细 this.handleChose(3) - } else {//能力使用明细 + } else { // 能力使用明细 this.handleChose(4) } }, diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue index 6dfd5410..a9450071 100644 --- a/back/src/views/modules/activiti/my-work-dynamics.vue +++ b/back/src/views/modules/activiti/my-work-dynamics.vue @@ -508,45 +508,47 @@ export default { }, // 删除数据 deleteData (row) { + this.deleteDataArr.push(row.id) if (this.deleteDataArr.length < 1) { this.$message({ - type: 'info', - message: '请选择要删除的数据' - }) - }else{ - this.$confirm('此操作将删除当前数据, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(async () => { - let ids = [] - if(row.id && this.deleteDataArr.length==0){ - ids = [row.id] - }else{ - ids = this.deleteDataArr - } - this.$http - .delete('/workdynamics/delete', { - data: ids - }) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } - this.$message({ - type: 'success', - message: '删除成功!' - }) - this.getTableData() - }) + type: 'info', + message: '请选择要删除的数据' }) - .catch(() => { - this.$message({ - type: 'info', - message: '已取消删除' + } else { + this.$confirm('此操作将删除当前数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + .then(async () => { + let ids = [] + if (row.id && this.deleteDataArr.length == 0) { + ids = [row.id] + } else { + ids = this.deleteDataArr + } + this.$http + .delete('/workdynamics/delete', { + data: ids + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + type: 'success', + message: '删除成功!' + }) + this.getTableData() + }) }) - })} + .catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }) + }) + } }, // 预览工作动态信息 async openPreviewData (row) { diff --git a/back/src/views/modules/canassigncase/index.vue b/back/src/views/modules/canassigncase/index.vue index 06efb4f1..b4c8aa5e 100644 --- a/back/src/views/modules/canassigncase/index.vue +++ b/back/src/views/modules/canassigncase/index.vue @@ -65,7 +65,8 @@ header-align="center" align="center" > - + + { - this.$refs.singleTable.doLayout(); // 解决表格错位 - //:height="qp ? '810px' : '650px'" - }); + this.$refs.singleTable.doLayout() // 解决表格错位 + // :height="qp ? '810px' : '650px'" + }) }, methods: { reset () { diff --git a/back/src/views/modules/sys/user.vue b/back/src/views/modules/sys/user.vue index a50edcd5..9aa1ffc8 100644 --- a/back/src/views/modules/sys/user.vue +++ b/back/src/views/modules/sys/user.vue @@ -2,25 +2,25 @@
- + - + - - - + + + {{ data.name }} - --> - + + {{ $t('query') @@ -97,7 +97,7 @@ import AddOrUpdate from './user-add-or-update' import qs from 'qs' export default { mixins: [mixinViewModule], - data() { + data () { return { mixinViewModuleOptions: { getDataListURL: '/sys/user/page', @@ -106,7 +106,7 @@ export default { deleteIsBatch: true, exportURL: '/sys/user/export' }, - postList: [], + deptList: [], dataForm: { username: '', deptId: '', @@ -118,18 +118,18 @@ export default { components: { AddOrUpdate }, - created() { - this.getPostList() + created () { + this.getDeptList() }, methods: { - reset() { + reset () { this.dataForm.username = '' this.dataForm.real_name = '' this.dataForm.deptId = '' this.dataForm.postId = '' this.dataForm.gender = '' if (this.$refs.renDeptTree) { - this.$refs.renDeptTree.showDeptName = ''; + this.$refs.renDeptTree.showDeptName = '' } this.$http .get( @@ -165,16 +165,13 @@ export default { this.dataListLoading = false }) }, - getPostList() { - this.$http - .get('/sys/post/list') - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } - this.postList = res.data - }) - .catch(() => { }) + getDeptList () { + this.$http.get('/sys/dept/list').then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.deptList = res.data + }).catch(() => { }) } } } diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index ddad0389..d709f2c1 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -88,7 +88,7 @@
-
-
+
-->
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 83624849..9c1d4ea9 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -62,6 +62,42 @@ item.infoList.filter((val) => val.attrType == '应用图片')[0] .attrValue " + :fallback="imgSrcYyzy" + /> + +
+ +
+
+ + {{ + item.infoList.filter((val) => val.attrType == '组件类型')[0] + .attrValue + }} + +
#search-result-list-container { - // width: 1088px; + // width: 1088px; padding: 0 18px; background: #f3f5f9; @@ -1043,7 +1098,7 @@ .header-right:last-child { div { - // margin-right: 10px; + // margin-right: 10px; } } @@ -1225,7 +1280,7 @@ .description { max-width: 990px; - // height: 52px; + // height: 52px; font-size: 14px; line-height: 18px; display: -webkit-box; diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue index 518cb5e0..7554262f 100644 --- a/front/src/views/home/detailBack.vue +++ b/front/src/views/home/detailBack.vue @@ -1,77 +1,82 @@ + \ No newline at end of file + } + diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue index 679e466b..7e06199b 100644 --- a/front/src/views/instructionManual/components/menuBook.vue +++ b/front/src/views/instructionManual/components/menuBook.vue @@ -257,7 +257,7 @@ path: '/DetailsPageconetent', query: { // select: '组件服务', - select: DETAIL_PAGE_CONTENT_DEFAULT_TAB + select: DETAIL_PAGE_CONTENT_DEFAULT_TAB, }, }) window.location.href = newpage.href diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue index eb5c33f2..e3d435b9 100644 --- a/front/src/views/newHome/components/WorkDynamics.vue +++ b/front/src/views/newHome/components/WorkDynamics.vue @@ -125,7 +125,7 @@ if (abilityToTypeFunctionData.value == '组件服务') { if (!componentTypeValue.value || componentTypeValue.value == '') { message.error('请选择组件类型！') - componentTypeValueOld.value='' + componentTypeValueOld.value = '' return } else if ( componentTypeValue.value === '智能算法' || diff --git a/front/src/views/personalCenter/components/MyPublish.vue b/front/src/views/personalCenter/components/MyPublish.vue index b6c8b406..3cd2abe3 100644 --- a/front/src/views/personalCenter/components/MyPublish.vue +++ b/front/src/views/personalCenter/components/MyPublish.vue @@ -2,32 +2,58 @@
我的发布
- - + + 能力上架 - + 重置
能力类型 -
+
{{ item }}
能力状态 -
+
{{ item }}
-
+
@@ -45,27 +71,57 @@
-
+
能力下架
-
+
查看详情
- + + fill="#515151" + opacity=".5" + p-id="5971" + > + fill="#515151" + opacity=".5" + p-id="5972" + > + fill="#515151" + opacity=".5" + p-id="5973" + > + fill="#515151" + opacity=".5" + p-id="5974" + > @@ -76,604 +132,653 @@
- +
- - + + - + - + - + +
-
+ 能力上架申请
能力类型选择
-
-
+
+
{{ item }}
-
+ +
组件类型选择
-
- - - - {{ item }} - - +
+
+ {{ item }} +
+
- - + +