修改bug

src/components/assessment/evaluationStartPage.vue

@@ -51,7 +51,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="年度" prop="year" />
-                    <el-table-column label="月度/季度" prop="month" />
+                    <!-- <el-table-column label="月度/季度" prop="month" /> -->
                     <el-table-column label="流程状态" prop="stage">
                         <template #default="scope">
                             <p class="indicitem" @click="seeStates(scope.row)">{{scope.row.stage}}</p>

src/components/assessment/monthQuarterFrom.vue

@@ -465,7 +465,7 @@ export default {
         handleImport() {
             this.$refs.importPage.upload.title = "月/季度单位信息导入"
             this.$refs.importPage.upload.open = true
-            this.$refs.importPage.upload.url = '/predict/api/smpmc/standardPointManagementImport'
+            this.$refs.importPage.upload.url = '/organization-evaluation-info/import'
             this.$refs.importPage.upload.urlName = 'standardPointManagementImport'
             this.$refs.importPage.upload.proName = '月/季度单位信息模板.xlsx'
         },
@@ -482,6 +482,7 @@ export default {
             //根据数据自己调整
             let colums = []
             colums = [
+                { header: 'ID', key: 'id', width: 26 },
                 { header: '单位名称', key: 'organizationName', width: 26 },
                 { header: '指标分类', key: 'typeName', width: 18 },
                 { header: '业务阶段', key: 'stageName', width: 18 },

src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -43,7 +43,11 @@
                         </template>
                     </el-table-column>
                     <!-- <el-table-column label="考评类别" prop="organizationType" /> -->
-                    <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="binSectionName" />
                     <el-table-column label="考评规则" prop="evaluateRuleName" width="300">
                         <template #default="scope">
@@ -65,17 +69,17 @@
                     </el-table-column>
                     <el-table-column label="生产经营权重" prop="scjyWeight">
                         <template #default="scope">
-                            <span>{{scope.row.scjyWeight*100}}%</span>
+                            <span>{{(scope.row.scjyWeight.toFixed(2))*100}}%</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="前期权重" prop="qqWeight">
                         <template #default="scope">
-                            <span>{{scope.row.qqWeight*100}}%</span>
+                            <span>{{(scope.row.qqWeight.toFixed(2))*100}}%</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="基建权重" prop="jjWeight">
                         <template #default="scope">
-                            <span>{{scope.row.jjWeight*100}}%</span>
+                            <span>{{(scope.row.jjWeight.toFixed(2))*100}}%</span>
                         </template>
                     </el-table-column>
                     <!-- <el-table-column label="年" prop="year" />
@@ -95,7 +99,7 @@
                     <div class="periodFrom">
                         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" :validate-on-rule-change="false">
                             <el-form-item label="单位名称" prop="organizationName">
-                                <el-select v-model="ruleForm.organizationName" placeholder="请选择单位名称">
+                                <el-select v-model="ruleForm.organizationName" filterable placeholder="请选择单位名称">
                                     <el-option
                                     v-for="item in companyDatas"
                                     :key="item.id"

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -41,9 +41,9 @@
             <div class="evaluationIndexTableData">
                 <el-table :data="evaluationIndexData" style="width: 100%" @select="rowClick" @select-all="rowClick" @row-dblclick="editEvaluaIndex">
                     <el-table-column type="selection" label="操作" align="center"></el-table-column>
-                    <el-table-column label="指标编码" prop="indicatorCode" />
-                    <el-table-column label="指标名称" prop="indicatorName" />
-                    <el-table-column label="指标类型" prop="indicatorTypeName" />
+                    <el-table-column label="指标编码" prop="indicatorCode" width="200" />
+                    <el-table-column label="指标名称" prop="indicatorName" width="300" />
+                    <el-table-column label="指标类型" prop="indicatorTypeName" width="250" />
                     <el-table-column label="指标单位" prop="unit" />
                     <el-table-column label="业务阶段" prop="binStageName" />
                     <el-table-column label="业务属性" prop="binSectionName" />
@@ -523,12 +523,19 @@ export default {
         //新增/修改指标数据
         saveAndEditIndicatorData() {
             let that = this
+            let deptName = ''
+            that.departData.forEach(item =>{
+                if (item.dataKey === that.ruleForm.department) {
+                    deptName = item.keyName
+                }
+            })
             let params = {
                 indicatorName: that.ruleForm.indicatorName,
                 indicatorCode: that.ruleForm.indicatorCode,
                 indicatorTypeId: that.ruleForm.indicatorType,
                 unit: that.ruleForm.indicatorUnit,
                 dept: that.ruleForm.department,
+                deptName: deptName,
                 binSection: that.ruleForm.binSection,
                 binStage: that.ruleForm.binStage,
                 isQuantified: that.ruleForm.isQuantified,

src/components/evaluationSystem/evaluationRulesPage.vue

@@ -40,14 +40,14 @@
                     <el-table-column label="规则名称" prop="ruleName" />
                     <el-table-column label="业务阶段" prop="binStageName" />
                     <el-table-column label="业务属性" prop="binSectionName" />
-                    <el-table-column label="创建者" prop="createBy" />
+                    <el-table-column label="创建者" prop="createBy" width="120" />
                     <el-table-column label="创建时间" prop="createTime" />
                     <el-table-column label="描述">
                         <template #default="scope">
                             <span>{{scope.row.des}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" width="80">
                         <template #default="scope">
                             <p class="indicitem" @click="editRuleDetail(scope.row)">详情</p>
                         </template>

src/components/importPage/importDailog.vue

@@ -19,7 +19,7 @@
             <template #tip>
                 <div class="el-upload__tip text-center">
                     <span style="display:inline-block;margin-top:10px">仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" v-if="upload.showModel" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+                    <!-- <el-link type="primary" v-if="upload.showModel" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link> -->
                 </div>
             </template>
         </el-upload>
@@ -33,6 +33,7 @@
 </template>
 
 <script>
+import baseUrl from '../../utils/baseUrl.js'
 import { getToken } from '@/api/auth'
 export default {
     data() {
@@ -55,7 +56,8 @@ export default {
                     token: getToken() 
                 },
                 // 上传的地址
-                processurl: (process.env.NODE_ENV === 'production') ? process.env.PRO_BASE_API : process.env.BASE_API,
+                // processurl: (process.env.NODE_ENV === 'production') ? process.env.PRO_BASE_API : process.env.BASE_API,
+                processurl: process.env.NODE_ENV === "production" ? baseUrl.ROOT : baseUrl.ROOT,
                 url: '',
                 // 上传模板名称
                 urlName: '',