项目软件中所有一级页面兼容1440；移动端新增单位考评预警功能；考评指标配置页面与考评规则配置页面根据后端需求增加功能；

src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -482,6 +482,7 @@
                 let params = {
                     organizationName: orgName,
                     evaluationCycle: that.ruleForm.evaluationCycle,
+                    organizationId: that.ruleForm.organizationName,
                     organizationType: 'DWKP',
                     organizationShortName: referred,
                     evaluateRuleId: that.ruleForm.evaluateRule.join(','),
@@ -497,10 +498,7 @@
                     // month: that.ruleForm.month
                 }
                 if (that.isSave) {
-                    params.id = this.evalradio.id
-                    params.organizationId = that.evalradio.organizationId
-                } else {
-                    params.organizationId = that.ruleForm.organizationName
+                    params.id = that.evalradio.id
                 }
                 apiGetorganizationSaveList(params).then(datas => {
                     if (!datas.success) {

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -17,14 +17,27 @@
                         </el-option>
                     </el-select>
                 </div>
+                <div class="exceed">
+                    <span class="exceedSpan" style="width: 80px">考评周期：</span>
+                    <el-select v-model="evaluationCycleStr" placeholder="请选择考评周期">
+                        <el-option
+                        v-for="item in periodData"
+                        :key="item.keyValue"
+                        :label="item.keyName"
+                        :value="item.keyValue"
+                        :disabled="item.keyValue === 'YDKP'">
+                        </el-option>
+                    </el-select>
+                </div>
                 <seachs @handleSeach="getSeachData" @handleRest="resetSeach"></seachs>
             </div>
             <div class="PeriodBtn" :style="$utils.PeriodBtnSty()">
+                <!-- $utils.havePurview('evalIndex:oneLevel:save') -->
                 <btns
                 :showImport="false"
                 :showExport="false"
                 :showAdd="$utils.havePurview('evalIndex:oneLevel:add')"
-                :showSave="$utils.havePurview('evalIndex:oneLevel:save')"
+                :showSave="true"
                 :showDelete="$utils.havePurview('evalIndex:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
@@ -46,6 +59,7 @@
                     <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="unit" />
                     <!-- <el-table-column label="公司" prop="company" /> -->
                     <!-- <el-table-column label="部门" prop="deptName" width="150" /> -->
@@ -100,6 +114,17 @@
                                 <el-form-item label="指标单位" prop="indicatorUnit">
                                     <el-input v-model="ruleForm.indicatorUnit" placeholder="请输入指标单位"></el-input>
                                 </el-form-item>
+                                <el-form-item label="考评周期" prop="evaluationCycle">
+                                    <el-select v-model="ruleForm.evaluationCycle" placeholder="请选择考评周期">
+                                        <el-option
+                                        v-for="item in periodData"
+                                        :key="item.keyValue"
+                                        :label="item.keyName"
+                                        :value="item.keyValue"
+                                        :disabled="item.keyValue === 'YDKP'">
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
                                 <el-form-item label="所属部门" prop="department">
                                     <el-select v-model="ruleForm.department" placeholder="请选择所属部门">
                                         <el-option
@@ -298,16 +323,19 @@ export default {
             changeDateSelect: [],
             indicatorIdS: '',
             binSectionIds: '',
+            evaluationCycleStr: '',
             evaluationIndexData:[],
             moduleData: [],
             stageData: [],
             departData: [],
             indicatorTypeData: [],
+            periodData: [],
             ruleForm: {
                 indicatorName: '',
                 indicatorCode: '',
                 indicatorType: '',
                 indicatorUnit: '',
+                evaluationCycle: '',
                 department: '',
                 binSection: '',
                 binStage: '',
@@ -330,6 +358,9 @@ export default {
                 indicatorUnit: [
                     { required: true, message: '请输入指标单位', trigger: 'blur' }
                 ],
+                evaluationCycle: [
+                    { required: true, message: '请选择考评周期', trigger: 'change' }
+                ],
                 department: [
                     { required: true, message: '请选择所属部门', trigger: 'change' }
                 ],
@@ -378,6 +409,7 @@ export default {
         this.getDataDictionary('BM0001') //部门//模块//阶段
         this.getindicatorTypeData()
         this.getindicItemData()
+        this.getPeriodData()
     },
     methods:{
         // 查询指标数据
@@ -387,7 +419,8 @@ export default {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
                 indicatorName: that.indicatorIdS,
-                binSection: that.binSectionIds
+                binSection: that.binSectionIds,
+                evaluationCycle: that.evaluationCycleStr
             }
             // if (type) {
             //     params.indicatorName = that.indicatorIdS
@@ -428,6 +461,18 @@ export default {
                 }
             })
         },
+        //考评周期
+        getPeriodData() {
+            let that = this
+            let params = {
+                superKey: 'KPZQ0001'
+            }
+            apiGetdatadictionaryList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.periodData = datas.data
+                }
+            })
+        },
         // 查询部门
         // 查询规则模块和阶段数据
         getDataDictionary(val) {
@@ -502,6 +547,7 @@ export default {
                     indicatorCode: '',
                     indicatorType: '',
                     indicatorUnit: '',
+                    evaluationCycle: '',
                     department: '',
                     binSection: '',
                     binStage: '',
@@ -524,6 +570,7 @@ export default {
                 indicatorCode: this.evalradio.indicatorCode,
                 indicatorType: this.evalradio.indicatorTypeId,
                 indicatorUnit: this.evalradio.unit,
+                evaluationCycle: this.evalradio.evaluationCycle,
                 department: this.evalradio.deptId,
                 binSection: this.evalradio.binSection,
                 binStage: this.evalradio.binStage,
@@ -587,6 +634,7 @@ export default {
                 indicatorCode: that.ruleForm.indicatorCode,
                 indicatorTypeId: that.ruleForm.indicatorType,
                 unit: that.ruleForm.indicatorUnit,
+                evaluationCycle: that.ruleForm.evaluationCycle,
                 deptId: that.ruleForm.department,
                 deptName: deptName,
                 binSection: that.ruleForm.binSection,
@@ -686,6 +734,7 @@ export default {
             this.page.currentPage = 1
             this.indicatorIdS = ''
             this.binSectionIds = ''
+            this.evaluationCycleStr = ''
             this.getEvaluationData()
         },
         successImport(val) {
@@ -719,6 +768,7 @@ export default {
                 indicatorCode: row.indicatorCode,
                 indicatorType: row.indicatorTypeId,
                 indicatorUnit: row.unit,
+                evaluationCycle: row.evaluationCycle,
                 department: row.deptId,
                 binSection: row.binSection,
                 binStage: row.binStage,
@@ -859,7 +909,6 @@ export default {
                                             display: flex;
                                             justify-content: end;
                                             margin-right: 30px;
-                                            width: 13%;
                                             img{
                                                 margin-right: 5px;
                                                 margin-top: 1px;

src/components/evaluationSystem/ruleDetailPage.vue

@@ -186,7 +186,8 @@ export default {
             let that = this
             let params = {
                 binSection: row.binSection,
-                binStage: row.binStage
+                binStage: row.binStage,
+                evaluationCycle: that.rowevalradio.checkCycle
             }
             apiGetindicatorListAll(params).then(datas =>{
                 if (datas && datas.data) {

src/components/gateWay/gatewayNewSeasonFrom.vue

@@ -229,6 +229,7 @@ export default {
             botImg: botImg,
             cenImg: cenImg,
             winPix: window.devicePixelRatio,
+            innerWidth: window.innerWidth
         }
     },
     created() {
@@ -266,17 +267,25 @@ export default {
             this.getYearData(name, year, season)
         },
         seasonWidth() {
-            if (this.winPix === 1.25) {
+            if (this.innerWidth === 1440) {
                 if (this.evaluationSeasonDataRight.length>0) {
                     return '90vw'
                 } else {
                     return '50vw'
                 }
             } else {
-                if (this.evaluationSeasonDataRight.length>0) {
-                    return '80vw'
+                if (this.winPix === 1.25) {
+                    if (this.evaluationSeasonDataRight.length>0) {
+                        return '90vw'
+                    } else {
+                        return '50vw'
+                    }
                 } else {
-                    return '40vw'
+                    if (this.evaluationSeasonDataRight.length>0) {
+                        return '80vw'
+                    } else {
+                        return '40vw'
+                    }
                 }
             }
         },

src/components/gateWay/gatewayNewYearFrom.vue

@@ -81,6 +81,7 @@ export default {
             yearData: '',
             seasonData: '',
             winPix: window.devicePixelRatio,
+            innerWidth: window.innerWidth
         }
     },
     created() {
@@ -114,17 +115,25 @@ export default {
             this.getYearData(name, year, season)
         },
         yearWidth() {
-            if (this.winPix === 1.25) {
+            if (this.innerWidth === 1440) {
                 if (this.evaluationYearDataRight.length>0) {
-                    return '50vw'
+                    return '60vw'
                 } else {
-                    return '28vw'
+                    return '33vw'
                 }
             } else {
-                if (this.evaluationYearDataRight.length>0) {
-                    return '50vw'
+                if (this.winPix === 1.25) {
+                    if (this.evaluationYearDataRight.length>0) {
+                        return '60vw'
+                    } else {
+                        return '33vw'
+                    }
                 } else {
-                    return '28vw'
+                    if (this.evaluationYearDataRight.length>0) {
+                        return '50vw'
+                    } else {
+                        return '28vw'
+                    }
                 }
             }
         },

src/components/gatewaynNewPage.vue

@@ -153,7 +153,8 @@
                 </div>
                 <div class="tableFooter">
                     <div class="footerOne">
-                        <span :style="getFooterOneSty()">煤电一体化</span>
+                         <!-- :style="getFooterOneSty()" -->
+                        <span>煤电一体化</span>
                     </div>
                     <div class="footerTwo">
                         <div style="display: flex" v-for="(item, index) in cupDataYearArr.integration" :key="index">
@@ -807,6 +808,12 @@
                     border-right: 1px solid #E1E3EA;
                     position: relative;
 
+                    @media screen and (width: 1440px) {
+                        .mainTwoMsg{
+                            top: -15%;
+                        }
+                    }
+
                     .mainTwoMsg {
                         position: relative;
 
@@ -997,6 +1004,22 @@
                 display: flex;
                 // height: 100px;
                 height: 10vh;
+                @media screen and (max-width: 1540px) and (min-width: 1440px) {
+                    .footerOne{
+                        span{
+                            font-size: 12px;
+                            line-height: 12px;
+                        }
+                    }
+                }
+                @media screen and (width: 1920px) {
+                    .footerOne{
+                        span{
+                            font-size: 16px;
+                            line-height: 16px;
+                        }
+                    }
+                }
 
                 .footerOne {
                     // width: 35px;
@@ -1009,8 +1032,8 @@
                         // width: 20px;
                         width: 3%;
                         margin: 0 auto;
-                        line-height: 16px;
-                        font-size: 16px;
+                        // line-height: 16px;
+                        // font-size: 16px;
                         font-weight: bold;
                         color: #fff;
                         position: relative;

src/mobeilComponent/earlyWarningPage.vue

@@ -32,7 +32,7 @@
                                 label="预警内容"
                                 placeholder="预警内容"
                                 />
-                                <van-cell title="选择日期区间" :value="form.time" @click="showDatePicker = true" />
+                                <van-cell title="选择日期区间" class="calenderSty" :value="form.time" @click="showDatePicker = true" />
                                 <van-calendar v-model:show="showDatePicker" type="range" :min-date="minDate" :max-date="maxDate" @confirm="confirmFn" />
 
                                 <div style="margin: 16px;display: flex;justify-content: space-between;">
@@ -146,7 +146,7 @@ export default {
         },
         confirmFn(val) {
             const [start, end] = val;
-            this.form.time = `${this.$utils.getNYRTime(start)} - ${this.$utils.getNYRTime(end)}`;
+            this.form.time = `${this.$utils.getNYRTime(start)} / ${this.$utils.getNYRTime(end)}`;
             this.showDatePicker = false
         },
     }
@@ -239,6 +239,12 @@ export default {
                 }
                 .vanForm{
                     margin-top: 60px;
+                    .calenderSty{
+                        .van-cell__title{
+                            flex: none;
+                            width: 40%;
+                        }
+                    }
                     .seachBtnFrom{
                         width: 65%;
                         height: 40px;

src/mobeilComponent/menuMobeilPage.vue

@@ -9,11 +9,10 @@
                 <p>全业务域考评系统</p>
             </div>
             <div class="menuMainBot">
-                <!-- <p @click="enterPage('earlyWarning')">单位考评预警</p> -->
                 <p @click="enterPage('mobeil')">年度单位评级</p>
                 <p @click="enterPage('quarterConpany')">季度单位评级</p>
                 <p @click="enterPage('report')">单位考评报告</p>
-                <p>单位考评预警</p>
+                <p @click="enterPage('earlyWarning')">单位考评预警</p>
                 <p @click="enterPage('notificationMobeil')">对标考评公告</p>
                 <img :src="closeMenu" alt="" @click="goBack">
             </div>

src/mobeilComponent/notificationPage.vue

@@ -32,7 +32,7 @@
                                 label="公告名称"
                                 placeholder="公告名称"
                                 />
-                                <van-cell title="选择日期区间" :value="form.time" @click="showDatePicker = true" />
+                                <van-cell title="选择日期区间" class="calenderSty" :value="form.time" @click="showDatePicker = true" />
                                 <van-calendar v-model:show="showDatePicker" type="range" :min-date="minDate" :max-date="maxDate" @confirm="confirmFn" />
 
                                 <div style="margin: 16px;display: flex;justify-content: space-between;">
@@ -235,6 +235,12 @@ export default {
                 }
                 .vanForm{
                     margin-top: 60px;
+                    .calenderSty{
+                        .van-cell__title{
+                            flex: none;
+                            width: 40%;
+                        }
+                    }
                     .seachBtnFrom{
                         width: 65%;
                         height: 40px;

src/utils/index.js

@@ -9,14 +9,16 @@ const until = {
     //搜索栏兼容125%
     collectSeachSty() {
         let winPix = window.devicePixelRatio
-        if (winPix === 1.25) {
+        let innerWidth = window.innerWidth
+        if (winPix === 1.25 || innerWidth === 1440) {
             return 'padding: 15px 20px 15px 0;'
         }
     },
     //按钮栏兼容125%
     PeriodBtnSty() {
         let winPix = window.devicePixelRatio
-        if (winPix === 1.25) {
+        let innerWidth = window.innerWidth
+        if (winPix === 1.25 || innerWidth === 1440) {
             return 'padding: 10px 0;'
         }
     },