From d65e1fa6f4964ebdeadf2d48ed86fe29b59b50a9 Mon Sep 17 00:00:00 2001 From: Apcallover <1503963513@qq.com> Date: Mon, 1 Apr 2024 17:07:27 +0800 Subject: [PATCH] =?UTF-8?q?flat:=20=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/auditInfo.vue | 5 +- src/views/report/main/innovation.vue | 141 +++++++++++++++++++ src/views/report/main/unemployment.vue | 161 ++++++++++++++++++++++ src/views/report/{main => }/policy.vue | 5 +- src/views/report/postInfo.vue | 5 +- src/views/report/talentPool/confirmed.vue | 161 ++++++++++++++++++++++ src/views/report/talentPool/potential.vue | 11 +- src/views/report/taskInfo.vue | 5 +- 8 files changed, 481 insertions(+), 13 deletions(-) create mode 100644 src/views/report/main/innovation.vue create mode 100644 src/views/report/main/unemployment.vue rename src/views/report/{main => }/policy.vue (95%) create mode 100644 src/views/report/talentPool/confirmed.vue diff --git a/src/views/report/auditInfo.vue b/src/views/report/auditInfo.vue index f43f3ff..d2098cb 100644 --- a/src/views/report/auditInfo.vue +++ b/src/views/report/auditInfo.vue @@ -3,6 +3,7 @@ - @@ -116,7 +116,8 @@ export default { const { records, current, total, size } = resData.data.data this.infoData = records this.infoPages = { ...this.infoPages, currentPage: current, total, size} - this.$api.sleep(1000).then(() => {this.visible = false; resolve(true)}) + this.visible = false; + resolve(true) } else { reject() } diff --git a/src/views/report/main/innovation.vue b/src/views/report/main/innovation.vue new file mode 100644 index 0000000..106ec9e --- /dev/null +++ b/src/views/report/main/innovation.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/report/main/unemployment.vue b/src/views/report/main/unemployment.vue new file mode 100644 index 0000000..6c9af04 --- /dev/null +++ b/src/views/report/main/unemployment.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/views/report/main/policy.vue b/src/views/report/policy.vue similarity index 95% rename from src/views/report/main/policy.vue rename to src/views/report/policy.vue index 5890220..2a03eee 100644 --- a/src/views/report/main/policy.vue +++ b/src/views/report/policy.vue @@ -4,6 +4,7 @@ :data="infoData" :option="options" :search.sync="search" + :table-loading="visible" :page.sync="infoPages" @search-change="searchChange" @search-reset="resetChange" @@ -11,7 +12,6 @@ @current-change="currentChange" > - @@ -121,7 +121,8 @@ export default { const { records, current, total, size } = resData.data.data this.infoData = records this.infoPages = { ...this.infoPages, currentPage: current, total, size} - this.$api.sleep(1000).then(() => {this.visible = false; resolve(true)}) + this.visible = false; + resolve(true) } else { reject() } diff --git a/src/views/report/postInfo.vue b/src/views/report/postInfo.vue index bb96691..90ea5f3 100644 --- a/src/views/report/postInfo.vue +++ b/src/views/report/postInfo.vue @@ -4,6 +4,7 @@ :data="infoData" :option="options" :search.sync="search" + :table-loading="visible" :page.sync="infoPages" @search-change="searchChange" @search-reset="resetChange" @@ -11,7 +12,6 @@ @current-change="currentChange" > - @@ -119,7 +119,8 @@ export default { const { records, current, total, size } = resData.data.data this.infoData = records this.infoPages = { ...this.infoPages, currentPage: current, total, size} - this.$api.sleep(1000).then(() => {this.visible = false; resolve(true)}) + this.visible = false; + resolve(true) } else { reject() } diff --git a/src/views/report/talentPool/confirmed.vue b/src/views/report/talentPool/confirmed.vue new file mode 100644 index 0000000..9544f4e --- /dev/null +++ b/src/views/report/talentPool/confirmed.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/views/report/talentPool/potential.vue b/src/views/report/talentPool/potential.vue index 0ed3618..3da5817 100644 --- a/src/views/report/talentPool/potential.vue +++ b/src/views/report/talentPool/potential.vue @@ -4,6 +4,7 @@ :data="infoData" :option="options" :search.sync="search" + :table-loading="visible" :page.sync="infoPages" @search-change="searchChange" @search-reset="resetChange" @@ -11,7 +12,6 @@ @current-change="currentChange" > - @@ -62,12 +62,12 @@ export default { display:false, children: Object.keys(columnEnum).map((key) => ({ label: columnEnum[key], - prop: `${index}_${key}`, + prop: `${index}_${item.id}_${key}`, display:false, width: 120, })) })) - + console.log('tableHead',tableHead) return { ...baseOptions, height: 200, @@ -135,7 +135,8 @@ export default { console.log('infoData',this.infoData) this.headColum = columnInfo this.infoPages = { ...this.infoPages, currentPage: current, total, size} - this.$api.sleep(1000).then(() => {this.visible = false; resolve(true)}) + this.visible = false; + resolve(true) } else { reject() } @@ -146,7 +147,7 @@ export default { for (let i = 0; i < list.length; i++) { const item = list[i] Object.keys(item).forEach((vitem) => { - obj[`${i}_${vitem}`] = item[vitem] + obj[`${i}_${item.id}_${vitem}`] = item[vitem] }) } return obj diff --git a/src/views/report/taskInfo.vue b/src/views/report/taskInfo.vue index ebb450b..ac30b8a 100644 --- a/src/views/report/taskInfo.vue +++ b/src/views/report/taskInfo.vue @@ -3,6 +3,7 @@ - @@ -119,7 +119,8 @@ export default { const { records, current, total, size } = resData.data.data this.infoData = records this.infoPages = { ...this.infoPages, currentPage: current, total, size} - this.$api.sleep(1000).then(() => {this.visible = false; resolve(true)}) + this.visible = false; + resolve(true) } else { reject() }