单位考评评级页面二级页面增加导入导出功能且进行服务联调（导出：POST http://localhost:28800/organization-rating/exportExcel(HttpServletResponse response,@RequestParam(value = "binSection", required = false) String binSection,@RequestParam(value = "year", required = false) String year)

导入：POST http://localhost:28800/organization-rating/importExcel(@RequestParam("file") MultipartFile file) ）；

src/components/assessment/evaluationUnitRatingDialog.vue

@@ -16,14 +16,16 @@
                         </el-select>
                     </div> -->
                     <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
-                    <el-button size="mini" color="#3B7AD1" icon="Operation" @click="dataGenerator"
+                    <!-- <el-button size="mini" color="#3B7AD1" icon="Operation" @click="dataGenerator"
                         style="margin-left: 10px">
                         <span>数据生成</span>
-                    </el-button>
+                    </el-button> -->
                     <el-button size="mini" color="#3B7AD1" icon="CopyDocument" @click="unitRuleFn"
                         style="margin-left: 10px">
                         <span>计算评级</span>
                     </el-button>
+                    <el-button type="success" icon="Upload" size="mini" @click="handleImport">导入</el-button>
+                    <el-button type="warning" icon="Download" size="mini" @click="handleExport">导出</el-button>
                 </div>
                 <!-- <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
                     <btns
@@ -60,56 +62,62 @@
                             </el-table-column>
                             <el-table-column label="业务板块" prop="binSectionName" />
                             <el-table-column label="考评年度" prop="year" />
-                            <el-table-column label="生产经营评级" prop="scjyRate" width="180" />
-                            <el-table-column label="（年度安全环保评级" width="150">
-                                <template #default="scope">
-                                    <el-input-number v-model="scope.row.safetyEnvProtection" :min="0" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="否决事项" width="150">
-                                <template #default="scope">
-                                    <el-select v-model="scope.row.veto" placeholder="请选择" size="large"
-                                        style="width: 100px">
-                                        <el-option v-for="item in isPgoptions" :key="item.value" :label="item.label"
-                                            :value="item.value" />
-                                    </el-select>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="净利润" width="150">
-                                <template #default="scope">
-                                    <el-input-number v-model="scope.row.netProfit" />
-                                </template>
+                            <el-table-column label="生产经营评级" align="center">
+                                <el-table-column label="年度安全环保评级" width="150">
+                                    <template #default="scope">
+                                        <el-input-number v-model="scope.row.safetyEnvProtection" :min="0" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="否决事项" width="140">
+                                    <template #default="scope">
+                                        <el-select v-model="scope.row.veto" placeholder="请选择" size="large"
+                                            style="width: 100px">
+                                            <el-option v-for="item in isPgoptions" :key="item.value" :label="item.label"
+                                                :value="item.value" />
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="净利润" width="150">
+                                    <template #default="scope">
+                                        <el-input-number v-model="scope.row.netProfit" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="经营业绩考核综合得分%" width="180" align="center">
+                                    <template #default="scope">
+                                        <el-input-number v-model="scope.row.compositeScore" :min="0" :max="100" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="生产经营评级" prop="scjyRate" width="120" />
                             </el-table-column>
-                            <el-table-column label="经营业绩考核综合得分%）" width="150">
-                                <template #default="scope">
-                                    <el-input-number v-model="scope.row.compositeScore" :min="0" :max="100" />
-                                </template>
+                            <el-table-column label="前期评级" align="center">
+                                <el-table-column label="年度项目进度目标" width="150">
+                                    <template #default="scope">
+                                        <el-input-number v-model="scope.row.annualTarget" :min="0" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="先进性指标考核得分有无加分" width="150">
+                                    <template #default="scope">
+                                        <el-select v-model="scope.row.bonusPoint" placeholder="请选择" size="large"
+                                            style="width: 100px">
+                                            <el-option v-for="item in isPgoptions" :key="item.value" :label="item.label"
+                                                :value="item.value" />
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="前期评级" prop="qqRate" width="100" />
                             </el-table-column>
-                            <el-table-column label="前期评级" prop="qqRate" width="180" />
-                            <el-table-column label="（年度项目进度目标" width="150">
-                                <template #default="scope">
-                                    <el-input-number v-model="scope.row.annualTarget" :min="0" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="先进性指标考核得分有无加分）" width="150">
-                                <template #default="scope">
-                                    <el-select v-model="scope.row.bonusPoint" placeholder="请选择" size="large"
-                                        style="width: 100px">
-                                        <el-option v-for="item in isPgoptions" :key="item.value" :label="item.label"
-                                            :value="item.value" />
-                                    </el-select>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="基建评级" prop="jjRate" />
-                            <el-table-column label="（基建工程综合得分排名" width="150">
-                                <template #default="scope">
-                                    <el-input-number v-model="scope.row.compositeScoreRaking" :min="0" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="基建工程项目等级）" width="150">
-                                <template #default="scope">
-                                    <el-input-number v-model="scope.row.projectLevel" :min="0" />
-                                </template>
+                            <el-table-column label="基建评级" align="center">
+                                <el-table-column label="基建工程综合得分排名" width="160">
+                                    <template #default="scope">
+                                        <el-input-number v-model="scope.row.compositeScoreRaking" :min="0" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="基建工程项目等级" width="150">
+                                    <template #default="scope">
+                                        <el-input-number v-model="scope.row.projectLevel" :min="0" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="基建评级" prop="jjRate" width="100" />
                             </el-table-column>
                             <el-table-column label="年度评级" prop="yearRate" />
                             <!-- fixed="right" align="center" -->
@@ -212,11 +220,13 @@
     import importDailog from '../importPage/importDailog.vue'
     import btns from '../elbuttonS.vue'
     import seachs from '../seachGroup.vue'
-    import ExcelJS from 'exceljs'
-    import fileSave from 'file-saver'
+    import {
+        saveAs
+    } from 'file-saver'
     import sectionDef from '../../assets/benchmarkImg/sectionDef.png'
     import sectionCha from '../../assets/benchmarkImg/sectionCha.png'
     import {
+        apiGetExportMsg,
         apiGetorganizationratinglist,
         apiorganizationratinggrade,
         apiGetorganizationratingsave,
@@ -558,88 +568,27 @@
                 })
             },
             handleImport() {
-                this.$refs.importPage.upload.title = "单位考评评级"
+                this.$refs.importPage.upload.title = "单位考评评级详情导入"
                 this.$refs.importPage.upload.open = true
-                this.$refs.importPage.upload.url = '/organization-rating/import'
-            },
-            successImport(val) {
-                this.getevaluRatingDiaList(this.rowObj)
+                this.$refs.importPage.upload.url = `/organization-rating/importExcel`
             },
             handleExport() {
-                let data = this.evaluationRatingDiaData //接口返回数据
-                const workbook = new ExcelJS.Workbook()
-                const worksheet = workbook.addWorksheet('Sheet1')
-                //根据数据自己调整
-                let colums = []
-                colums = [{
-                        header: 'ID',
-                        key: 'id',
-                        width: 26,
-                        hidden: true
-                    },
-                    {
-                        header: '考评单位',
-                        key: 'organizationShortName',
-                        width: 26
-                    },
-                    {
-                        header: '考评单位ID',
-                        key: 'organizationId',
-                        width: 26,
-                        hidden: true
-                    },
-                    {
-                        header: '业务板块ID',
-                        key: 'binSection',
-                        width: 26,
-                        hidden: true
-                    },
-                    {
-                        header: '考评年度',
-                        key: 'year',
-                        width: 26
-                    },
-                    {
-                        header: '生成经营评级',
-                        key: 'scjyRate',
-                        width: 26
-                    },
-                    {
-                        header: '前期评级',
-                        key: 'qqRate',
-                        width: 26
-                    },
-                    {
-                        header: '基建评级',
-                        key: 'jjRate',
-                        width: 26
-                    },
-                    {
-                        header: '年度评级',
-                        key: 'yearRate',
-                        width: 26
-                    },
-                    {
-                        header: '备注',
-                        key: 'remake',
-                        width: 26
-                    },
-                ]
-                worksheet.columns = colums
-                worksheet.getRow(1).font = {
-                    size: 12,
-                    bold: true
+                let that = this
+                let url = 'organization-rating/exportExcel'
+                let params = {
+                    binSection: that.businessStr,
+                    year: that.rowObj.year
                 }
-                worksheet.addRows(data)
-
-                workbook.xlsx.writeBuffer().then(buffer => {
-                    //这里为type
-                    const blob = new Blob([buffer], {
-                        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'
-                    })
-                    fileSave(blob, `单位考评评级数据导出.xlsx`)
+                apiGetExportMsg(url, params).then(datas => {
+                    let blob = new Blob([datas])
+                    saveAs(blob, '单位考评评级详情导出.xlsx')
+                }).catch((r) => {
+                    console.error(r)
                 })
             },
+            successImport(val) {
+                this.getevaluRatingDiaList(this.rowObj)
+            },
             unitRatingTableSty() {
                 if (this.winPix === 1.25 || this.innerWidth < 1800) {
                     return 'unitRating125Table'

src/components/assessment/evaluationUnitRatingPage.vue

@@ -10,10 +10,10 @@
                     <span class="exceedSpan">评级描述：</span>
                     <el-input v-model="ratingDes" placeholder="请输入评级描述"></el-input>
                 </div>
-                <div class="exceed">
+                <!-- <div class="exceed">
                     <span class="exceedSpan" style="width: 80px">考评年度：</span>
                     <el-date-picker v-model="resAnnual" type="year" value-format="YYYY" placeholder="选择年份" />
-                </div>
+                </div> -->
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
             <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
@@ -32,8 +32,8 @@
                     @select="rowClick" @select-all="rowClick" @row-dblclick="rowClickToggle">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
                     <el-table-column type="index" label="序号" align="center"></el-table-column>
-                    <el-table-column label="编码" prop="yearRatingCode" />
-                    <el-table-column label="描述" prop="des" />
+                    <el-table-column label="编码" prop="organizationEvaluationCode" />
+                    <el-table-column label="描述" prop="des" width="300" />
                     <el-table-column label="年份" prop="year" />
                     <el-table-column label="状态" prop="stage" width="200">
                         <template #default="scope">
@@ -119,6 +119,7 @@
     import seachs from '../seachGroup.vue'
     import {
         apiGetorganizationyearratinglist,
+        apiGetOrgEvaluationList,
         apiGetorganizationyearratingsave,
         apiGetworkflowgetOpinion,
         apiGetdoAction,
@@ -196,12 +197,12 @@
                 let params = {
                     pageNum: that.page.currentPage,
                     pageSize: that.page.pagesize,
-                    des: that.ratingDes,
-                    yearRatingCode: that.ratingCode,
-                    year: that.resAnnual
+                    checkCycle: 'DWPJ',
+                    organizationEvaluationCode: that.ratingCode,
+                    des: that.resDes
                 }
-                apiGetorganizationyearratinglist(params).then(datas => {
-                    if (datas && datas.data.records) {
+                apiGetOrgEvaluationList(params).then(datas => {
+                    if (datas && datas.data) {
                         that.evaluationUnitRatingData = datas.data.records
                         that.page.total = datas.data.total
                     }

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -58,7 +58,11 @@
                     <el-table-column label="业务阶段" prop="binStageName" />
                     <el-table-column label="指标类型" prop="indicatorTypeName" width="200" />
                     <el-table-column label="指标名称" prop="indicatorName" width="300" />
-                    <el-table-column label="考评周期" prop="evaluationCycle" />
+                    <el-table-column label="考评周期" prop="evaluationCycle">
+                        <template #default="scope">
+                            <span>{{scope.row.evaluationCycle === 'YDKP'?'月度考评':scope.row.evaluationCycle === 'JDKP'? '季度考评': '年度考评'}}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="指标单位" prop="unit" />
                     <!-- <el-table-column label="公司" prop="company" /> -->
                     <!-- <el-table-column label="部门" prop="deptName" width="150" /> -->

src/components/taskCenter/taskUnitRatingFrom.vue

@@ -117,69 +117,62 @@
                                 </el-table-column>
                                 <el-table-column label="业务板块" prop="binSectionName" />
                                 <el-table-column label="考评年度" prop="year" />
-                                <el-table-column label="生产经营评级" prop="scjyRate" width="180" />
-                                <el-table-column label="（年度安全环保评级" width="150">
-                                    <template #default="scope">
-                                        <span
-                                            v-if="userMes.deptId !== '23031009'">{{scope.row.safetyEnvProtection}}</span>
-                                        <el-input-number v-else v-model="scope.row.safetyEnvProtection" :min="0" />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="否决事项" width="150">
-                                    <template #default="scope">
-                                        <span
-                                            v-if="userMes.deptId !== '23031009'">{{scope.row.veto === 1 ? '是' : '否'}}</span>
-                                        <el-select v-else v-model="scope.row.veto" placeholder="请选择" size="large"
-                                            style="width: 100px">
-                                            <el-option v-for="item in isPgoptions" :key="item.value" :label="item.label"
-                                                :value="item.value" />
-                                        </el-select>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="净利润" width="150">
-                                    <template #default="scope">
-                                        <span v-if="userMes.deptId !== '23031009'">{{scope.row.netProfit}}</span>
-                                        <el-input-number v-else v-model="scope.row.netProfit" :min="0" />
-                                    </template>
+                                <el-table-column label="生产经营评级" align="center">
+                                    <el-table-column label="年度安全环保评级" width="150">
+                                        <template #default="scope">
+                                            <el-input-number v-model="scope.row.safetyEnvProtection" :min="0" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="否决事项" width="140">
+                                        <template #default="scope">
+                                            <el-select v-model="scope.row.veto" placeholder="请选择" size="large"
+                                                style="width: 100px">
+                                                <el-option v-for="item in isPgoptions" :key="item.value"
+                                                    :label="item.label" :value="item.value" />
+                                            </el-select>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="净利润" width="150">
+                                        <template #default="scope">
+                                            <el-input-number v-model="scope.row.netProfit" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="经营业绩考核综合得分%" width="180" align="center">
+                                        <template #default="scope">
+                                            <el-input-number v-model="scope.row.compositeScore" :min="0" :max="100" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="生产经营评级" prop="scjyRate" width="120" />
                                 </el-table-column>
-                                <el-table-column label="经营业绩考核综合得分%）" width="150">
-                                    <template #default="scope">
-                                        <span v-if="userMes.deptId !== '23031009'">{{scope.row.compositeScore}}</span>
-                                        <el-input-number v-else v-model="scope.row.compositeScore" :min="0"
-                                            :max="100" />
-                                    </template>
+                                <el-table-column label="前期评级" align="center">
+                                    <el-table-column label="年度项目进度目标" width="150">
+                                        <template #default="scope">
+                                            <el-input-number v-model="scope.row.annualTarget" :min="0" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="先进性指标考核得分有无加分" width="150">
+                                        <template #default="scope">
+                                            <el-select v-model="scope.row.bonusPoint" placeholder="请选择" size="large"
+                                                style="width: 100px">
+                                                <el-option v-for="item in isPgoptions" :key="item.value"
+                                                    :label="item.label" :value="item.value" />
+                                            </el-select>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="前期评级" prop="qqRate" width="100" />
                                 </el-table-column>
-                                <el-table-column label="前期评级" prop="qqRate" width="180" />
-                                <el-table-column label="（年度项目进度目标" width="150">
-                                    <template #default="scope">
-                                        <span v-if="userMes.deptId !== '23031009'">{{scope.row.annualTarget}}</span>
-                                        <el-input-number v-else v-model="scope.row.annualTarget" :min="0" />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="先进性指标考核得分有无加分）" width="150">
-                                    <template #default="scope">
-                                        <span
-                                            v-if="userMes.deptId !== '23031009'">{{scope.row.bonusPoint === 1 ? '是' : '否'}}</span>
-                                        <el-select v-model="scope.row.bonusPoint" placeholder="请选择" size="large"
-                                            style="width: 100px">
-                                            <el-option v-for="item in isPgoptions" :key="item.value" :label="item.label"
-                                                :value="item.value" />
-                                        </el-select>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="基建评级" prop="jjRate" />
-                                <el-table-column label="（基建工程综合得分排名" width="150">
-                                    <template #default="scope">
-                                        <span
-                                            v-if="userMes.deptId !== '23031009'">{{scope.row.compositeScoreRaking}}</span>
-                                        <el-input-number v-else v-model="scope.row.compositeScoreRaking" :min="0" />
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="基建工程项目等级）" width="150">
-                                    <template #default="scope">
-                                        <span v-if="userMes.deptId !== '23031009'">{{scope.row.projectLevel}}</span>
-                                        <el-input-number v-else v-model="scope.row.projectLevel" :min="0" />
-                                    </template>
+                                <el-table-column label="基建评级" align="center">
+                                    <el-table-column label="基建工程综合得分排名" width="160">
+                                        <template #default="scope">
+                                            <el-input-number v-model="scope.row.compositeScoreRaking" :min="0" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="基建工程项目等级" width="150">
+                                        <template #default="scope">
+                                            <el-input-number v-model="scope.row.projectLevel" :min="0" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="基建评级" prop="jjRate" width="100" />
                                 </el-table-column>
                                 <el-table-column label="年度评级" prop="yearRate" />
                                 <!-- fixed="right" align="center" -->
@@ -288,14 +281,16 @@
     import importDailog from '../importPage/importDailog.vue'
     import btns from '../elbuttonS.vue'
     import seachs from '../seachGroup.vue'
-    import ExcelJS from 'exceljs'
-    import fileSave from 'file-saver'
+    import {
+        saveAs
+    } from 'file-saver'
     import addIcon from '../../assets/btnIcon/add.png'
     import saveIcon from '../../assets/btnIcon/save.png'
     import deleteIcon from '../../assets/btnIcon/delete.png'
     import exportIcon from '../../assets/btnIcon/export.png'
     import importIcon from '../../assets/btnIcon/import.png'
     import {
+        apiGetExportMsg,
         apiGetorganizationratinglist,
         apiorganizationratinggrade,
         apiGetorganizationratingsave,
@@ -716,86 +711,25 @@
                 })
             },
             handleImport() {
-                this.$refs.importPage.upload.title = "单位考评评级"
+                this.$refs.importPage.upload.title = "单位考评评级详情导入"
                 this.$refs.importPage.upload.open = true
-                this.$refs.importPage.upload.url = '/organization-rating/import'
+                this.$refs.importPage.upload.url = `/organization-rating/importExcel`
             },
             successImport(val) {
                 this.getevaluRatingDiaList(that.rowObj, that.rowkeyId)
             },
             handleExport() {
-                let data = this.evaluationRatingDiaData //接口返回数据
-                const workbook = new ExcelJS.Workbook()
-                const worksheet = workbook.addWorksheet('Sheet1')
-                //根据数据自己调整
-                let colums = []
-                colums = [{
-                        header: 'ID',
-                        key: 'id',
-                        width: 26,
-                        hidden: true
-                    },
-                    {
-                        header: '考评单位',
-                        key: 'organizationShortName',
-                        width: 26
-                    },
-                    {
-                        header: '考评单位ID',
-                        key: 'organizationId',
-                        width: 26,
-                        hidden: true
-                    },
-                    {
-                        header: '业务板块ID',
-                        key: 'binSection',
-                        width: 26,
-                        hidden: true
-                    },
-                    {
-                        header: '考评年度',
-                        key: 'year',
-                        width: 26
-                    },
-                    {
-                        header: '生成经营评级',
-                        key: 'scjyRate',
-                        width: 26
-                    },
-                    {
-                        header: '前期评级',
-                        key: 'qqRate',
-                        width: 26
-                    },
-                    {
-                        header: '基建评级',
-                        key: 'jjRate',
-                        width: 26
-                    },
-                    {
-                        header: '年度评级',
-                        key: 'yearRate',
-                        width: 26
-                    },
-                    {
-                        header: '备注',
-                        key: 'remake',
-                        width: 26
-                    },
-                ]
-                worksheet.columns = colums
-                worksheet.getRow(1).font = {
-                    size: 12,
-                    bold: true
+                let that = this
+                let url = 'organization-rating/exportExcel'
+                let params = {
+                    binSection: that.businessStr,
+                    year: that.rowObj.year
                 }
-                worksheet.addRows(data)
-
-                workbook.xlsx.writeBuffer().then(buffer => {
-                    //这里为type
-                    const blob = new Blob([buffer], {
-                        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'
-                    })
-                    fileSave(blob, `单位考评评级数据导出.xlsx`)
+                apiGetExportMsg(url, params).then(datas => {
+                    let blob = new Blob([datas])
+                    saveAs(blob, '单位考评评级详情导出.xlsx')
+                }).catch((r) => {
+                    console.error(r)
                 })
             },
         }