diff --git a/src/api/renwuApi/index.js b/src/api/renwuApi/index.js index c969cc1..1884ab3 100644 --- a/src/api/renwuApi/index.js +++ b/src/api/renwuApi/index.js @@ -78,4 +78,38 @@ export function addassetTaskadd(data) { method: "get", params, }) - } \ No newline at end of file + } +//小程序详情 + export function assetTaskminitaskSh(params) { + return request({ + url: `/unit/assetTask/minitaskSh`, + method: "get", + params, + }) + } + + //公众号资产任务审核详情信息 + export function assetTaskofficetaskSh(params) { + return request({ + url: `/unit/assetTask/officetaskSh`, + method: "get", + params, + }) + } + //电子邮件资产任务审核详情信息 + export function assetTaskapptaskSh(params) { + return request({ + url: `/unit/assetTask/apptaskSh`, + method: "get", + params, + }) + } + + //移动应用程序资产 + export function assetTaskemailtaskSh(params) { + return request({ + url: `/unit/assetTask/emailtaskSh`, + method: "get", + params, + }) + } \ No newline at end of file diff --git a/src/views/auditPages/taskManagement/audit.vue b/src/views/auditPages/taskManagement/audit.vue index 0265a48..5ef953a 100644 --- a/src/views/auditPages/taskManagement/audit.vue +++ b/src/views/auditPages/taskManagement/audit.vue @@ -1,15 +1,31 @@ \ No newline at end of file diff --git a/src/views/components/renwuType/index_v2.vue b/src/views/components/renwuType/index_v2.vue new file mode 100644 index 0000000..0600390 --- /dev/null +++ b/src/views/components/renwuType/index_v2.vue @@ -0,0 +1,406 @@ + + + \ No newline at end of file diff --git a/src/views/components/renwuType/index_v3.vue b/src/views/components/renwuType/index_v3.vue new file mode 100644 index 0000000..bb67452 --- /dev/null +++ b/src/views/components/renwuType/index_v3.vue @@ -0,0 +1,349 @@ + + + \ No newline at end of file diff --git a/src/views/components/renwuType/index_v4.vue b/src/views/components/renwuType/index_v4.vue new file mode 100644 index 0000000..cdefa25 --- /dev/null +++ b/src/views/components/renwuType/index_v4.vue @@ -0,0 +1,311 @@ + + + \ No newline at end of file diff --git a/src/views/auditPages/components/webType1.vue b/src/views/components/renwuType/webType1.vue similarity index 100% rename from src/views/auditPages/components/webType1.vue rename to src/views/components/renwuType/webType1.vue diff --git a/src/views/components/renwuType/webType2DW.vue b/src/views/components/renwuType/webType2DW.vue new file mode 100644 index 0000000..8bfbe23 --- /dev/null +++ b/src/views/components/renwuType/webType2DW.vue @@ -0,0 +1,3298 @@ + + diff --git a/src/views/system/user/danweiList.vue b/src/views/system/user/danweiList.vue index 932b111..136ffd3 100644 --- a/src/views/system/user/danweiList.vue +++ b/src/views/system/user/danweiList.vue @@ -235,8 +235,14 @@ export default { } return ''; }, + getType(type){ + this.queryParams.type = type.join(",") + }, /** 查询用户列表 */ - getList() { + getList(type) { + if(this.queryParams.type){ + this.queryParams.type = this.queryParams.type + } this.loading = true; this.queryParams.isSearch = 1 listUnitdw(this.queryParams).then(response => { @@ -261,6 +267,9 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + if(this.queryParams.type){ + this.queryParams.type = this.queryParams.type + } this.resetForm("queryForm"); this.toggleSelection() this.handleQuery(); diff --git a/src/views/unitPages/myTask/audit copy.vue b/src/views/unitPages/myTask/audit copy.vue new file mode 100644 index 0000000..110049f --- /dev/null +++ b/src/views/unitPages/myTask/audit copy.vue @@ -0,0 +1,3298 @@ + + diff --git a/src/views/unitPages/myTask/audit.vue b/src/views/unitPages/myTask/audit.vue index 110049f..abf7d80 100644 --- a/src/views/unitPages/myTask/audit.vue +++ b/src/views/unitPages/myTask/audit.vue @@ -1,3298 +1,45 @@ - + + + + \ No newline at end of file diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue index fa8f734..a844fbc 100644 --- a/src/views/unitPages/myTask/info.vue +++ b/src/views/unitPages/myTask/info.vue @@ -22,7 +22,9 @@ 任务期限:{{ titleInfoObj.taskDeadline }} - + + 核查资产类型:{{ listTow.join(",") }} + @@ -39,7 +41,7 @@ - + @@ -97,7 +99,7 @@
- + - + @@ -202,7 +204,7 @@ export default { return { index: 1, formInline: { - + type:0, }, formInlineTwo: { unitName: "", @@ -224,37 +226,46 @@ export default { titleInfoObj: {}, chakanyuanyin:"", activeName:"0", + xtmcName:"系统名称", chanckList:[ { lable:"0", - conent:"web资产" + conent:"web资产", + xtmcName:"系统名称", }, { lable:"1", - conent:"小程序资产" + conent:"小程序资产", + xtmcName:"小程序名称", }, { lable:"2", - conent:"公众号资产" + conent:"公众号资产", + xtmcName:"公众号名称", }, { lable:"3", - conent:"电子邮件资产" + conent:"电子邮件资产", + xtmcName:"电子邮箱后缀", }, { lable:"4", - conent:"移动应用程序资产" + conent:"移动应用程序资产", + xtmcName:"移动应用程序名称", }, - ] + ], + chanckListTow:[], + listTow:[], } }, mounted() { - this.getList(); this.cancalDebounce(); window.addEventListener('resize', this.cancalDebounce); this.titleInfo() this.assetLcpageList() + this.handleQuery(); + }, destroyed() { @@ -266,6 +277,8 @@ export default { console.log(tab.name); this.formInline.type = tab.name this.activeName = tab.name + this.xtmcName=tab.$attrs.xtmcName, + this.handleQuery() }, @@ -321,7 +334,9 @@ export default { name: 'mytaskAuditInfo', query: { pageType: "look", taskId: row.taskId, - assetId:row.id + assetId:row.id, + type:this.formInline.type, + } }) @@ -332,7 +347,9 @@ export default { name: 'mytaskAuditInfo', query: { pageType: "change", taskId: row.taskId, - assetId:row.id + assetId:row.id, + type:this.formInline.type, + } }) } @@ -355,11 +372,31 @@ export default { } else { return "-" } + }, + titleInfoObjtype(type = "0,1"){ + console.log(type); + let list = type.split(",") + this.listTow = [] + this.chanckListTow = [] + this.chanckList.forEach(res=>{ + list.forEach(element => { + if(element == res.lable){ + this.listTow.push(res.conent) + this.chanckListTow.push(res) + } + }); + }) + console.log(777,this.listTow); + + + }, titleInfo() { getassetTaskid(this.$route.query.id || this.$route.meta.id).then(res => { if (res.code == 200) { this.titleInfoObj = res.data + this.$set(this.titleInfoObj,'type',"0,1") + this.titleInfoObjtype(this.titleInfoObj.type) } }) @@ -371,6 +408,8 @@ export default { this.pagination = { current: 1, size: 10, + type:0, + } if (this.index == 1) { this.formInline = { @@ -457,7 +496,7 @@ export default { const headerHeight = header.offsetHeight; const paginationtHeight = pagination.offsetHeight; const tabHeight = tab.offsetHeight; - this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 120; + this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 160; } }, beforeRouteEnter(to,from,next){