Selaa lähdekoodia

任务中心关于本部部门计划与考核根据甲方需求配合后端进行功能修改;月季年详情包含任务的根据后端需求进行修改;移动端增加登陆页面;

SunZehao 1 vuosi sitten
vanhempi
commit
82c243ae67

+ 9 - 1
src/App.vue

@@ -1,5 +1,5 @@
 <template>
-   <div id="app" v-loading="loading">
+   <div id="app" :class="pcOrMobeil === 'PC' ? 'appClass' : '' " v-loading="loading">
     <!-- <img src="./assets/logo.png"> -->
     <router-view v-if="isRouterAlive"/>
   </div>
@@ -20,6 +20,7 @@ export default {
     data() {
         return {
             showHeader:false,
+            pcOrMobeil: '',
             loading: true,
             isRouterAlive: true
         }
@@ -54,8 +55,10 @@ export default {
             let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
             if (flag) {
                 window.localStorage.setItem('isMobile', 'Mobile')
+                this.pcOrMobeil = 'Mobile'
             } else {
                 window.localStorage.setItem('isMobile', 'PC')
+                this.pcOrMobeil = 'PC'
             }
         }
     }
@@ -78,4 +81,9 @@ export default {
     /* background: #184FB4; */
     /* background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#005777), to(#005777), color-stop(0.2, #007aab),color-stop(0.8, #007aab)); */
 }
+.appClass{
+    width: 100% ;
+    height: 100%;
+    overflow: hidden;
+}
 </style>

+ 34 - 0
src/api/api.js

@@ -163,6 +163,14 @@ export function apiGetcheckAuditStatus(params) {
     })
 }
 
+// 部门业绩指标计划 部门业绩指标考评同意前判断接口
+export function apiGetcheckAuditAssessmentStatus(params) {
+    return httpRequest({
+        url: `evaluation-dept-assessment/checkAuditStatus/${params.id}/${params.deptId}`,
+        method: 'get'
+    })
+}
+
 
 //----------------------------------------通告管理------------------------------------------------
 //---------列表
@@ -368,6 +376,15 @@ export function apiGetdeptresponDetail(params) {
         params: params
     })
 }
+
+//------部门考评启动-获取部门
+export function apiGetevaluationdetailDeptData(params) {
+    return httpRequest({
+        url: `evaluation-dept-plan/detailDeptData`,
+        method: 'get',
+        params: params
+    })
+}
 //------部门考评启动-详情
 export function apiGetevaluationdeptplanDetail(params) {
     return httpRequest({
@@ -675,6 +692,17 @@ export function apiGetorganizationevaluationlist(params) {
 }
 
 
+//单位目标启动详情-----根据属性和阶段获取--获取表格数据
+export function apiGetgetResponsibilityInfoList(params) {
+    return httpRequest({
+        url: 'responsibility-indicator-info/getResponsibilityInfoList',
+        method: 'get',
+        params: params
+    })
+}
+
+
+
 //单位月季年详情-----根据属性和阶段获取--获取指标名---表格头
 export function apiGetEvaluationIndicatorList(params) {
     return httpRequest({
@@ -696,6 +724,12 @@ export function apiPostorganizationUpdateEvaluationInfo(params) {
     return httpRequest.post('organization-evaluation-info/updateEvaluationInfo', params)
 }
 
+
+//单位目标启动详情-----修改
+export function apiPostupdateResponsibilityInfo(params) {
+    return httpRequest.post('responsibility-indicator-info/updateResponsibilityInfo', params)
+}
+
 //单位月季年详情-----新增
 export function apiPostorganizationUpdateAddEvaluationInfo(params) {
     return httpRequest.post('organization-evaluation-info/addEvaluationInfo', params)

+ 2 - 2
src/assets/css/main.css

@@ -6,11 +6,11 @@
 html,
 body,
 #app,
-.wrapper {
+/* .wrapper {
     width: 100%;
     height: 100%;
     overflow: hidden;
-}
+} */
 
 body {
     font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;

BIN
src/assets/mobeilImg/daohang.png


BIN
src/assets/mobeilImg/date.png


BIN
src/assets/mobeilImg/huodian.png


BIN
src/assets/mobeilImg/logo.png


BIN
src/assets/mobeilImg/meidian.png


BIN
src/assets/mobeilImg/more.png


BIN
src/assets/mobeilImg/shuidian.png


BIN
src/assets/mobeilImg/xinnengyuan.png


+ 28 - 3
src/components/assessment/evaluationAmendmentNewFrom.vue

@@ -56,6 +56,10 @@
                                     </el-tag>
                                 </div>
                                 <div class="headerRight">
+                                    <div class="seachFor">
+                                        <el-input v-model="compNameSa" placeholder="请输入单位名称"></el-input>
+                                        <el-icon :size="20" color="#3B7AD1" @click="getTableData(isClickTagId)"><Search /></el-icon>
+                                    </div>
                                     <div class="tableBtn add" @click="addTableDetail"
                                      v-if="(activeName === 'ZDZX' || activeName === 'GLSX') && indicatorList.length > 0">
                                         <img :src="addIcon" alt="">
@@ -152,6 +156,7 @@ export default {
             monthQuarterYearHeader: [],
             indicatorList: [],
             isClickTagId: '',
+            compNameSa: '',
             receiptMsg: {
                 code: '',
                 des: '',
@@ -285,7 +290,8 @@ export default {
             let that = this
             let params = {
                 organizationEvaluationId: that.rowMsg.id,
-                indicatorId: id
+                indicatorId: id,
+                organizationShortName: that.compNameSa
             }
             apiGetgetEvaluationInfoDataList(params).then(datas =>{
                 if (datas && datas.data) {
@@ -532,7 +538,8 @@ export default {
                                 justify-content: space-between;
                                 .headerLeft{
                                     display: flex;
-                                    width: 80%;
+                                    width: 70%;
+                                    overflow-x: auto;
                                     .tagArr {
                                         height: 33px;
                                         margin-right: 10px;
@@ -558,8 +565,26 @@ export default {
                                 .headerRight{
                                     display: flex;
                                     justify-content: end;
-                                    width: 20%;
+                                    width: 30%;
                                     margin-bottom: 5px;
+                                    .seachFor{
+                                        display: flex;
+                                        .el-input{
+                                            height: 30px;
+                                            .el-input__inner{
+                                                height:30px;
+                                            }
+                                            .el-input__suffix{
+                                                .el-select__caret{
+                                                    line-height:30px;
+                                                }
+                                            }
+                                        }
+                                        .el-icon{
+                                            margin: 5px 10px 0 10px;
+                                            cursor: pointer;
+                                        }
+                                    }
                                     .tableBtn {
                                         display: flex;
                                         height: 20px;

+ 5 - 5
src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -97,7 +97,7 @@
                             </el-table-column>
                             <el-table-column label="审核状态" width="200" >
                                 <template #default="scope">
-                                    <el-select v-model="scope.row.auditStatus" placeholder="请选择审核状态">
+                                    <el-select v-model="scope.row.auditStatusKp" placeholder="请选择审核状态">
                                         <el-option
                                         v-for="item in statusData"
                                         :key="item.id"
@@ -237,9 +237,9 @@ export default {
             this.changeDateSelect = []
         },
         tableRowClassName(row, rowIndex) {
-            if (row.row.auditStatus === '-1') {
+            if (row.row.auditStatusKp === '-1') {
                 return 'warning-row'
-            } else if (row.row.auditStatus === '0') {
+            } else if (row.row.auditStatusKp === '0') {
                 return 'success-row'
             } else {
                 return 'error-row'
@@ -279,7 +279,7 @@ export default {
                     targetValue: item.targetValue,
                     baseScore: item.baseScore.toString(),
                     evaluationCriteria: item.evaluationCriteria,
-                    auditStatus: item.auditStatus,
+                    auditStatusKp: item.auditStatusKp,
                     serialNumber: item.serialNumber,
                     completionStatus: item.completionStatus,
                     evaluationScore: item.evaluationScore
@@ -307,7 +307,7 @@ export default {
             this.$refs.importPage.upload.title = "本部部门业绩指标考核信息导入"
             this.$refs.importPage.upload.data = {id: this.rowMsg.id}
             this.$refs.importPage.upload.open = true
-            this.$refs.importPage.upload.url = '/evaluation-dept-plan/import'
+            this.$refs.importPage.upload.url = '/evaluation-dept-assessment/import'
         },
         successImport(val) {
             this.getDetails(this.rowMsg.id)

+ 30 - 14
src/components/assessment/evaluationDeptStartFrom.vue

@@ -148,7 +148,7 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
-import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiPostIsdoAction} from '../../api/api'
+import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiPostIsdoAction, apiGetevaluationdetailDeptData} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
 import addIcon from '../../assets/btnIcon/add.png'
@@ -235,7 +235,7 @@ export default {
                 recStage: '有效'
             }
             this.getDetails(row.id)
-            this.getshowDepartDataFn(row, deptData)
+            // this.getshowDepartDataFn(row)
             this.rowMsg = row
 
         },
@@ -251,17 +251,17 @@ export default {
             }
             return show
         },
-        // 整合部门数据
-        getshowDepartDataFn(row, deptData) {
-            let deptIdArr = row.deptId.split(',')
-            deptIdArr.forEach(it =>{
-                deptData.forEach(itv =>{
-                    if (itv.id === it) {
-                        this.departData.push(itv)
-                    }
-                })
-            })
-        },
+        // 获取部门数据
+        // getshowDepartDataFn(row) {
+            // let deptIdArr = row.deptId.split(',')
+            // deptIdArr.forEach(it =>{
+            //     deptData.forEach(itv =>{
+            //         if (itv.id === it) {
+            //             this.departData.push(itv)
+            //         }
+            //     })
+            // })
+        // },
         handleClick() {
             this.changeDateSelect = []
         },
@@ -287,10 +287,24 @@ export default {
         getDetails(id) {
             let that = this
             that.quantifiedList = []
+            that.departData = []
             let params = {
                 id: id,
                 deptId: that.userMes.deptId
             }
+            // 获取部门数据
+            apiGetevaluationdetailDeptData(params).then(datas =>{
+                if (datas && datas.data) {
+                    for(let i in datas.data) {
+                        let obj = {
+                            id: i,
+                            name: datas.data[i]
+                        } 
+                        that.departData.push(obj)
+                    }
+                }
+            })
+            //获取详情
             apiGetevaluationdeptplanDetail(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data
@@ -322,7 +336,9 @@ export default {
                     baseScore: item.baseScore.toString(),
                     evaluationCriteria: item.evaluationCriteria,
                     auditStatus: item.auditStatus,
-                    serialNumber: item.serialNumber
+                    serialNumber: item.serialNumber,
+                    createDept: that.userMes.deptId,
+                    currentUserDept: that.userMes.deptId
                 }
                 if (item.showInput) {
                     obj.deptId = item.deptName

+ 681 - 0
src/components/assessment/evaluationStartNewFrom.vue

@@ -0,0 +1,681 @@
+<template>
+    <div class="monthQuarterYearFrom">
+        <el-dialog title="考评详情" v-model="dialogVisible" :fullscreen="true" :close-on-click-modal="false">
+            <div class="startDetail">
+                <p class="starttitleSty">单据信息:</p>
+                <el-row class="danjuMsg">
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">业务编号:</span>
+                            <span>{{receiptMsg.code}}</span>
+                        </div>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">创建日期:</span>
+                            <span>{{receiptMsg.createDate}}</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">业务简述:</span>
+                            <span>{{receiptMsg.des}}</span>
+                        </div>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">业务类别:</span>
+                            <span>{{receiptMsg.type}}</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">流程状态:</span>
+                            <span>{{receiptMsg.stage}}</span>
+                        </div>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">年度:</span>
+                            <span>{{receiptMsg.year}}</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="6">
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">创建人:</span>
+                            <span>{{receiptMsg.createName}}</span>
+                        </div>
+                        <div class="danjuMsg_data">
+                            <span class="data_tit">单据状态:</span>
+                            <span>{{receiptMsg.recStage}}</span>
+                        </div>
+                    </el-col>
+                </el-row>
+                <div class="monthQuarterYear">
+                    <el-tabs v-model="activeName" class="tableMain" @tab-click="handleClick">
+                        <el-tab-pane v-for="it in stageData" :key="it.id" :label="it.stageName" :name="it.stageCode">
+                            <div class="detailsHeader">
+                                <div class="headerRight">
+                                    <div class="seachFor">
+                                        <el-input v-model="compNameSa" placeholder="请输入单位名称"></el-input>
+                                        <el-icon :size="20" color="#3B7AD1" @click="getTableData(isClickTagId)"><Search /></el-icon>
+                                    </div>
+                                    <div class="tableBtn add" @click="addTableDetail"
+                                     v-if="activeName === 'ZDZX' || activeName === 'GLSX'">
+                                        <img :src="addIcon" alt="">
+                                        <span>新增</span>
+                                    </div>
+                                    <div class="tableBtn save" @click="saveAddDetail"
+                                    v-if="activeName === 'ZDZX' || activeName === 'GLSX'">
+                                        <img :src="saveIcon" alt="">
+                                        <span>保存</span>
+                                    </div>
+                                    <div class="tableBtn save" @click="saveDetail" v-else>
+                                        <img :src="saveIcon" alt="">
+                                        <span>保存</span>
+                                    </div>
+                                    <div class="tableBtn import" @click="handleImport">
+                                        <img :src="importIcon" alt="">
+                                        <span>导入</span>
+                                    </div>
+                                    <div class="tableBtn export" @click="handleExport">
+                                        <img :src="exportIcon" alt="">
+                                        <span>导出</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <el-table :data="monthQuarterYearData" style="width: 100%" ref="monthQuarterYearTT" :border="true" >
+                                <el-table-column type="index" label="排名" align="center"></el-table-column>
+                                <el-table-column label="考评单位" prop="organizationShortName" width="300" />
+                                <el-table-column  v-for="(it, index) in monthQuarterYearHeader" :key="index" :label="it.name" align="center">
+                                    <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key"
+                                     align="center" :width="iv.code === 'state'?'150':''">
+                                        <template #default="scope">
+                                            <el-select v-model="scope.row[iv.code]" placeholder="请选择审核状态" v-if="scope.row['IS_LH_'+iv.code] === '3'">
+                                                <el-option
+                                                v-for="item in statusData"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id">
+                                                </el-option>
+                                            </el-select>
+                                            <el-input v-model="scope.row[iv.code]" v-else-if="scope.row['IS_LH_'+iv.code] === '2'"></el-input>
+                                            <el-input-number v-model="scope.row[iv.code]" :precision="2" :step="0.1" v-else />
+                                        </template>
+                                    </el-table-column>
+                                </el-table-column>
+                            </el-table>
+                        </el-tab-pane>
+                    </el-tabs>
+                    <div class="tableSeach">
+                        <div class="seachType" v-for="item in titleMsgArr" :key="item.isName"
+                        :class="item.showClick? 'seachTypeCha':''" @click="changType(item)">
+                            <img :src="item.img" alt="" v-if="!item.showClick">
+                            <img :src="item.clickImg" alt="" v-else>
+                            <p :style="item.showClick? 'color: #3B7AD1' : ''">{{item.isName}}</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="dialogVisible = false">取 消</el-button>
+                </span>
+            </template>
+        </el-dialog>
+        <import-dailog ref="importPage" @successImport="successImport"></import-dailog>
+    </div>
+</template>
+
+<script>
+import importDailog from '../importPage/importDailog.vue'
+import {apiGetgetResponsibilityInfoList,apiGetbinsectionList, apiGetbinstageList,apiGetExportMsg,
+apiPostupdateResponsibilityInfo, apiPostorganizationUpdateAddEvaluationInfo} from '../../api/api'
+import * as XLSX from 'xlsx'
+import { saveAs } from 'file-saver'
+import  * as XLSXD from 'xlsx-js-style'
+
+import sectionDef from '../../assets/benchmarkImg/sectionDef.png'
+
+import sectionCha from '../../assets/benchmarkImg/sectionCha.png'
+
+import addIcon from '../../assets/btnIcon/add.png'
+import saveIcon from '../../assets/btnIcon/save.png'
+import exportIcon from '../../assets/btnIcon/export.png'
+import importIcon from '../../assets/btnIcon/import.png'
+
+export default {
+    components: {
+        importDailog
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            activeName: '',
+            monthQuarterYearData: [],
+            monthQuarterYearHeader: [],
+            isClickTagId: '',
+            compNameSa: '',
+            receiptMsg: {
+                code: '',
+                des: '',
+                stage: '',
+                createName: '',
+                createDate: '',
+                type: '',
+                year: '',
+                recStage: ''
+            },
+            rowMsg: {},
+            moduleData: [],
+            stageData: [],
+            titleMsgArr: [],
+            statusData: [],
+            binSectionStr: '',
+            addIcon: addIcon,
+            saveIcon: saveIcon,
+            exportIcon: exportIcon,
+            importIcon: importIcon,
+            addstageId: '',
+            userMes: {}
+        }
+    },
+    created() {
+        this.statusData = [
+            {
+                name: '已确认',
+                id: '1'
+            },
+            {
+                name: '待确认',
+                id: '0'
+            },
+            {
+                name: '不合格',
+                id: '-1'
+            }
+        ]
+    },
+    methods: {
+        init(row) {
+            this.dialogVisible = true
+            this.receiptMsg = {
+                code: row.organizationEvaluationCode,
+                des: row.des,
+                stage: row.stage,
+                createName: row.createName,
+                createDate: row.createTime,
+                type: row.checkCycle === 'YDKP'?'月度考评':row.checkCycle === 'JDKP'?'季度考评':'年度考评',
+                year: row.year,
+                recStage: '有效'
+            }
+            
+            this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            this.getModelData()
+            this.rowMsg = row
+        },
+        // 获取业务属性
+        getModelData() {
+            let that = this
+            that.titleMsgArr = []
+            let params = {
+                type: '3'
+            }
+            apiGetbinsectionList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.moduleData = datas.data
+                    that.moduleData.forEach(item =>{
+                        let obj = {
+                            id: item.id,
+                            isName: item.sectionName === '新能源(光电)' ? '新能源光电' : item.sectionName === '新能源(风电)' ? '新能源风电' : item.sectionName,
+                            isNameEn: item.sectionCode,
+                            showClick: false,
+                            isClass: 'sectionDef',
+                            img: sectionDef,
+                            isClassC: 'sectionCha',
+                            clickImg: sectionCha
+                        }
+                        that.titleMsgArr.push(obj)
+                    })
+                    that.titleMsgArr[0].showClick = true
+                    that.binSectionStr = that.titleMsgArr[0].id
+                    that.getStageData()
+                }
+            })
+        },
+        //根据业务属性获取业务阶段
+        getStageData() {
+            let that = this
+            apiGetbinstageList().then(datas =>{
+                if (datas && datas.data) {
+                    that.stageData = datas.data
+                    that.activeName = datas.data[0].stageCode
+                    that.addstageId = datas.data[0].id
+                    that.getTableData(datas.data[0].id)
+                }
+            })
+        },
+        handleClick(val) {
+            let stageId = ''
+            this.activeName = val.props.name
+            console.log('activeName', this.activeName)
+            this.stageData.forEach(it =>{
+                if (it.stageCode === val.props.name) {
+                    stageId = it.id
+                    this.addstageId = it.id
+                }
+            })
+            this.getTableData(stageId)
+        },
+        //获取表格数据
+        getTableData(id) {
+            let that = this
+            let params = {
+                responsibilityId: that.rowMsg.id,
+                binSection: that.binSectionStr,
+                binStage: id
+            }
+            apiGetgetResponsibilityInfoList(params).then(datas =>{
+                if (datas && datas.data) {
+                    if (datas.data.title) {
+                        let header = []
+                        for(let i in datas.data.title) {
+                            let obj = {
+                                name: i,
+                                children: datas.data.title[i]
+                            }
+                            header.push(obj)
+                        }
+                        that.monthQuarterYearHeader = header
+                    }
+                    that.monthQuarterYearData = datas.data.value
+                }
+            })
+        },
+        changType(data) {
+            this.titleMsgArr.forEach(it =>{
+                it.showClick = false
+                if (it.isName === data.isName) {
+                    it.showClick = true
+                    this.binSectionStr = it.id
+                }
+            })
+            let stageId = ''
+            this.stageData.forEach(it =>{
+                if (it.stageCode === this.activeName) {
+                    stageId = it.id
+                }
+            })
+            this.getTableHeaderData(stageId)
+        },
+        addTableDetail() {
+            console.log('表头数据11====>>>>>>>', this.monthQuarterYearHeader)
+            if (this.monthQuarterYearHeader.length>0) {
+                let headerArr = []
+                this.monthQuarterYearHeader.forEach(item =>{
+                    headerArr = headerArr.concat(item.children)
+                })
+
+                console.log('表头数据22====>>>>>>>', headerArr)
+                this.addstageId = ''
+                this.stageData.forEach(it =>{
+                    if (it.stageCode === this.activeName) {
+                        this.addstageId = it.id
+                    }
+                })
+
+                let obj = {
+                    isAdd: true,
+                    
+                }
+                headerArr.forEach(it =>{
+                    obj[it.code] = ''
+                    obj['IS_LH_'+it.code] = it.flag
+                })
+                this.monthQuarterYearData.unshift(obj)
+            }
+            console.log('表格数据====>>>>>>>', this.monthQuarterYearData)
+        },
+        saveAddDetail() {
+            let that = this
+            let addParams = []
+            let saveParams = []
+            let addObj = {
+                organizationId: that.userMes.unitId,
+                // organizationId: "23079300",
+                organizationEvaluationId: that.rowMsg.id,
+                indicatorId: that.isClickTagId,
+                binSection: that.binSectionStr,
+                binStage: that.addstageId,
+                optionMap: {}
+            }
+            that.monthQuarterYearData.forEach(it =>{
+                if (it.isAdd) {
+                    addObj.optionMap = it
+                    addParams.push(addObj)
+                } else {
+                    saveParams.push(it)
+                }
+            })
+            if (addParams.length > 0) {
+                apiPostorganizationUpdateAddEvaluationInfo(addParams).then(datas =>{
+                    if (datas) {
+                        that.responseData(datas)
+                    }
+                })
+            }
+            if (saveParams.length > 0) {
+                apiPostupdateResponsibilityInfo(saveParams).then(datas =>{
+                    if (datas) {
+                        that.responseData(datas)
+                    }
+                })
+            }
+        },
+        // 返回数据
+        responseData(datas) {
+            if (datas.message === '成功') {
+                this.$message({
+                    message: '考评详情信息保存成功',
+                    type: 'success'
+                });
+            } else {
+                this.$message({
+                    message: datas.message,
+                    type: 'error'
+                });
+            }
+            this.getTableData(this.isClickTagId)
+        },
+        saveDetail() {
+            let that = this
+            apiPostupdateResponsibilityInfo(that.monthQuarterYearData).then(datas =>{
+                if (datas) {
+                    if (datas.message === '成功') {
+                        that.$message({
+                            message: '考评详情信息保存成功',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message({
+                            message: datas.message,
+                            type: 'error'
+                        });
+                    }
+                    that.getTableData(that.addstageId)
+                }
+            })
+        },
+        handleImport() {
+            this.$refs.importPage.upload.title = "考评详情信息导入"
+            this.$refs.importPage.upload.open = true
+            this.$refs.importPage.upload.url = '/organization-evaluation-info/import-excel'
+        },
+        successImport(val) {
+            that.getTableData(that.isClickTagId)
+        },
+        handleExport() {
+            let that = this
+            let url = 'organization-evaluation-info/download-excel'
+            let params = {
+                organizationEvaluationId: that.rowMsg.id,
+                indicatorId: that.isClickTagId
+            }
+            apiGetExportMsg(url,params).then(datas =>{
+                let blob = new Blob([datas])
+                saveAs(blob, '考评详情数据导出.xlsx')
+            }).catch((r) => {
+                console.error(r)
+            })
+        },
+    }
+}
+</script>
+
+<style lang="less">
+.monthQuarterYearFrom{
+    .el-overlay{
+        .el-dialog{
+            // margin-top: 7vh;
+            .el-dialog__body{
+                padding: 0 20px !important;
+                .startDetail{
+                    .starttitleSty{
+                        font-size: 18px;
+                        font-family: Microsoft YaHei;
+                        font-weight: bold;
+                        color: #3B7AD1;
+                        // line-height: 12px;
+                        margin: 20px 0 20px 10px;
+                    }
+                    .danjuMsg{
+                        border: 1px solid #D6DBEA;
+                        padding: 10px 20px;
+                        border-radius: 10px;
+                        // margin-bottom: 20px;
+                        .danjuMsg_data{
+                            padding: 5px 0 10px 0;
+                            .data_tit{
+                                margin-right: 10px;
+                                font-weight: bold;
+                                font-size: 14px;
+                                font-family: Microsoft YaHei;
+                                color: #8991B0;
+                            }
+                            .data_tit_wd{
+                                display: inline-block;
+                                width: 90px;
+                            }
+                            .el-form-item--small{
+                                .el-input{
+                                    height: 25px;
+                                    width: 160px;
+                                }
+                                margin-bottom: 0;
+                                .el-input-number{
+                                    height: 25px;
+                                    .el-input-number__decrease, .el-input-number__increase{
+                                        right: -39px;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    .el-select, .el-input{
+                        width: 100%;
+                    }
+                    .monthQuarterYear{
+                        display: flex;
+                        width: 100%;
+                        margin-top: 20px;
+                        .tableMain{
+                            width: calc(100% - 100px);
+                            .el-tabs__header{
+                                .el-tabs__nav{
+                                    .el-tabs__item{
+                                        font-size: 18px;
+                                        font-family: Microsoft YaHei;
+                                        font-weight: bold;
+                                        margin: 0 10px;                                    
+                                        color: #8991B0;
+                                    }
+                                    .is-active{
+                                        font-size: 18px;
+                                        font-family: Microsoft YaHei;
+                                        font-weight: bold;
+                                        color: #3B7AD1;
+                                        margin: 0 10px;
+                                    }
+                                }
+                            }
+                            .detailsHeader{
+                                width: 100%;
+                                display: flex;
+                                .headerRight{
+                                    display: flex;
+                                    justify-content: end;
+                                    width: 100%;
+                                    margin-bottom: 5px;
+                                    .seachFor{
+                                        display: flex;
+                                        .el-input{
+                                            height: 30px;
+                                            .el-input__inner{
+                                                height:30px;
+                                            }
+                                            .el-input__suffix{
+                                                .el-select__caret{
+                                                    line-height:30px;
+                                                }
+                                            }
+                                        }
+                                        .el-icon{
+                                            margin: 5px 10px 0 10px;
+                                            cursor: pointer;
+                                        }
+                                    }
+                                    .tableBtn {
+                                        display: flex;
+                                        height: 20px;
+                                        margin: 5px 10px 0 10px;
+                                        img{
+                                            margin-right: 5px;
+                                            margin-top: 1px;
+                                        }
+                                        span{
+                                            font-size: 14px;
+                                            font-family: Microsoft YaHei;
+                                            font-weight: 400;
+                                        }
+                                    }
+                                    .add{
+                                        cursor: pointer;
+                                        span{
+                                            color: #3B7AD1;
+                                        }
+                                    }
+                                    .save{
+                                        cursor: pointer;
+                                        span{
+                                            color: #50C14E;
+                                        }
+                                    }
+                                    .import{
+                                        cursor: pointer;
+                                        span{
+                                            color: #ce1e78;
+                                        }
+                                    }
+                                    .export{
+                                        cursor: pointer;
+                                        span{
+                                            color: #2baa8a;
+                                        }
+                                    }
+                                }
+                            }
+                            .el-table {
+                                .el-table__header-wrapper{
+                                    .el-table__header{
+                                        .el-table__cell {
+                                            border-bottom: none !important;
+                                        }
+                                        thead{
+                                            tr{
+                                                th{
+                                                    .cell{
+                                                        line-height: 16px;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                .el-table__body-wrapper {
+                                    height: 47vh !important;
+                                    .el-scrollbar{
+                                        .is-horizontal{
+                                            .el-scrollbar__thumb{
+                                                width: 100% !important;
+                                            }
+                                        }
+                                        .el-table__body{
+                                            tr{
+                                                td{
+                                                    padding: 0;
+                                                    .cell{
+                                                        background: #F6F7FA;
+                                                        line-height: 47px;
+                                                        height: 47px;
+                                                    }
+                                                }
+                                                td:hover {
+                                                    line-height: 45px;
+                                                    height: 45px;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                .el-table--border .el-table__cell{
+                                    border: none;
+                                }
+                                .el-table thead.is-group th.el-table__cell{
+                                    background: transparent;
+                                }
+                
+                                .tooltipCC {
+                                    width: 180px;
+                                    display: inline-block;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                    white-space: nowrap;
+                                }
+                            }
+                            .el-pagination {
+                                margin-top: 20px;
+                                text-align: end;
+                                position: relative;
+                            }
+                        }
+                        .tableSeach{
+                            width: 88px;
+                            height: 63vh;
+                            margin-left: 10px;
+                            margin-top: 37px;
+                            border: 1px solid #D6DBEA;
+                            padding: 5px 0;
+                            border-radius: 5px;
+                            overflow-y: auto;
+                            .seachType{
+                                width: 78px;
+                                height: 78px;
+                                cursor: pointer;
+                                border-left: 3px solid transparent;
+                                img{
+                                    margin-top: 17px;
+                                    margin-left: 27px;
+                                }
+                                p{
+                                    text-align: center;
+                                    font-size: 14px;
+                                }
+                            }
+                            .seachTypeCha{
+                                background: #E6EBF5;
+                                cursor: pointer;
+                                border-left: 3px solid #3B7AD1;
+                            }
+                        }
+                    }
+                }
+            }
+            .el-dialog__footer{
+                .dialog-footer{
+                    display: flex;
+                    justify-content: center;
+                    .el-button{
+                        width: 180px !important;
+                        height: 40px !important;
+                    }
+                }
+            }
+        }
+    }
+    
+}
+</style>

+ 1 - 1
src/components/assessment/evaluationStartPage.vue

@@ -171,7 +171,7 @@
 </template>
 
 <script>
-import startFromList from './evaluationStartFrom.vue'
+import startFromList from './evaluationStartNewFrom.vue'
 import btns from '../elbuttonS.vue'
 import seachs from '../seachGroup.vue'
 import {apiGetdeptresponsibilityList, apiGetdeptresponsibilitySave,apiGetdoAction,apiGetworkflowgetOpinion,

+ 1 - 0
src/components/assessment/monthQuarterYearFrom.vue

@@ -539,6 +539,7 @@ export default {
                                 .headerLeft{
                                     display: flex;
                                     width: 70%;
+                                    overflow-x: auto;
                                     .tagArr {
                                         height: 33px;
                                         margin-right: 10px;

+ 2 - 2
src/components/taskCenter/taskCenterDeptBusinessFrom.vue

@@ -136,7 +136,7 @@
 
 <script>
 import importDailog from '../importPage/importDailog.vue'
-import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiPostIsdoAction, apiGetcheckAuditStatus,
+import {apiGetevaluationdeptplanDetail,apiGetevaluationdeptplanUpdate, apiPostIsdoAction, apiGetcheckAuditAssessmentStatus,
 apiGetevaluationdeptassessmentDetailHeader} from '../../api/api'
 import ExcelJS from 'exceljs'
 import fileSave from 'file-saver'
@@ -331,7 +331,7 @@ export default {
                     id: that.rowMsg.id,
                     deptId: userMes.deptId
                 }
-                apiGetcheckAuditStatus(paramsob).then(datas =>{
+                apiGetcheckAuditAssessmentStatus(paramsob).then(datas =>{
                     if (datas) {
                         if (datas.success) {
                              that.IsdoActionFn(params)

+ 4 - 1
src/components/taskCenter/taskCenterDeptStartFrom.vue

@@ -320,6 +320,7 @@ export default {
         saveDetail() {
             let that = this
             let params = []
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             that.quantifiedList.forEach(item =>{
                 let obj = {
                     targetName: item.targetName,
@@ -327,7 +328,9 @@ export default {
                     baseScore: item.baseScore.toString(),
                     evaluationCriteria: item.evaluationCriteria,
                     auditStatus: item.auditStatus,
-                    serialNumber: item.serialNumber
+                    serialNumber: item.serialNumber,
+                    createDept: userMes.deptId,
+                    currentUserDept: userMes.deptId
                 }
                 if (item.showInput) {
                     obj.deptId = item.deptName

+ 3 - 2
src/components/taskCenter/taskCenterEvlNewFrom.vue

@@ -635,7 +635,8 @@ export default {
                                 justify-content: space-between;
                                 .headerLeft{
                                     display: flex;
-                                    width: 80%;
+                                    width: 70%;
+                                    overflow-x: auto;
                                     .tagArr {
                                         height: 33px;
                                         margin-right: 10px;
@@ -661,7 +662,7 @@ export default {
                                 .headerRight{
                                     display: flex;
                                     justify-content: end;
-                                    width: 20%;
+                                    width: 30%;
                                     margin-bottom: 5px;
                                     .seachFor{
                                         display: flex;

+ 1 - 1
src/components/taskCenter/taskCenterPage.vue

@@ -130,7 +130,7 @@ export default {
                         that.$refs.taskCenterdeptbusinessEvl.init(row, keyId, allData)
                     } else if(taskDefKey === 'jxjgkhsb'){
                         that.$refs.taskApplicationFrom.init(row, keyId)
-                    } else {
+                    } else if(taskDefKey === 'yddwkplc' || taskDefKey === 'jddwkplc' || taskDefKey === 'nddwkplc') {
                         that.$refs.taskCenterEvl.init(row)
                     }
                 }

+ 435 - 14
src/mobeilComponent/homeMobeilPage.vue

@@ -1,25 +1,107 @@
 <template>
+    <div :class="showDatePicker? 'homeMobeilMask': ''">
+    </div>
     <div class="homeMobeilPage">
         <van-nav-bar title="首页" />
         <div class="mobeilVant">
             <div class="mobeilTop">
                 <div class="topLeft">
-                    <van-icon name="star" size="20" />
+                    <!-- <van-icon name="star" size="20" /> -->
+                    <img :src="logoImg" alt="">
                     <span>全业务域考评系统</span>
                 </div>
                 <div class="topRight">
                     <span>系统导航</span>
-                    <van-icon name="wap-nav"  size="23" />
+                    <!-- <van-icon name="wap-nav"  size="23" /> -->
+                    <img :src="daohangImg" alt="">
                 </div>
             </div>
             <div class="mobeilMain">
-
+                <div class="rankingList">
+                    <span>{{showDate}}年度排行榜</span>
+                    <img :src="dateImg" @click="changeDate" alt="">
+                    <van-date-picker
+                        v-model="currentDate"
+                        title="选择年份"
+                        :columns-type="['year']"
+                        @confirm="confirmFn"
+                        @cancel="cancelFn"
+                        v-if="showDatePicker"
+                        />
+                </div>
+                <div class="mainModel" v-for="(it, index) in cupDataYearArr.section" :key="index">
+                    <div class="mainModelTit">
+                        <div class="mainModelTit_left">
+                            <img :src="huodianImg" alt="">
+                            <span>火电板块</span>
+                        </div>
+                        <img :src="moreImg" alt="" class="mainModelTit_right">
+                    </div>
+                    <div class="mainModelMsg">
+                        <div class="mainTwo">
+                            <div class="echartsNum" :style="it.echartsData.allNum < 10 ? 'left:56px': 'left: 65px'">{{it.echartsData.allNum}}</div>
+                            <div :id="'pieChart'+index" style="height: 100px;width: 100%"></div>
+                            <el-row>
+                                <el-col :span="12">
+                                    <span class="mainTwoComColor" style="background: #F65177;"></span>
+                                    <span class="mainTwoComTit">A级</span>
+                                </el-col>
+                                <el-col :span="12">
+                                    <span class="mainTwoComColor" style="background: #50C14E;"></span>
+                                    <span class="mainTwoComTit">B级</span>
+                                </el-col>
+                                <el-col :span="12">
+                                    <span class="mainTwoComColor" style="background: #5093E1;"></span>
+                                    <span class="mainTwoComTit">C级</span>
+                                </el-col>
+                                <el-col :span="12">
+                                    <span class="mainTwoComColor" style="background: #9DA5BE;"></span>
+                                    <span class="mainTwoComTit">D级</span>
+                                </el-col>
+                            </el-row>
+                        </div>
+                        <div class="mainThree">
+                            <div class="headerNameTit">
+                                <div class="headerNameTit_left">
+                                    <span>单位名称</span>
+                                </div>
+                                <div class="headerNameTit_right">
+                                    <span>级别</span>
+                                    <span style="margin-left: 20px">得分</span>
+                                </div>
+                            </div>
+                            <div style="display: flex" v-for="(item, index) in it.tableDatas" :key="index">
+                                <div class="mainThreeMsg">
+                                    <img :src="item.img" alt="">
+                                    <div class="msgProgress">
+                                        <span>{{item.company}}</span>
+                                        <span>{{item.grade}}</span>
+                                        <span>{{item.score}}</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
 </template>
 
 <script>
+import logoImg from '../assets/mobeilImg/logo.png'
+import daohangImg from '../assets/mobeilImg/daohang.png'
+import dateImg from '../assets/mobeilImg/date.png'
+import huodianImg from '../assets/mobeilImg/huodian.png'
+import shuidianImg from '../assets/mobeilImg/shuidian.png'
+import xinnengyuanImg from '../assets/mobeilImg/xinnengyuan.png'
+import meidianImg from '../assets/mobeilImg/meidian.png'
+import moreImg from '../assets/mobeilImg/more.png'
+import cup1 from '../assets/getwayImg/cup1.png'
+import cup2 from '../assets/getwayImg/cup2.png'
+import cup3 from '../assets/getwayImg/cup3.png'
+
+import {apiGetevaluationportallist, apiGetevaluationCircularDisplaylist} from '../api/api'
 export default {
     data() {
         return {
@@ -27,17 +109,194 @@ export default {
             expendData: ['0'],
             openeds: [],
             routeTags: [],
-            userName: ''
+            userName: '',
+            logoImg: logoImg,
+            daohangImg: daohangImg,
+            dateImg: dateImg,
+            huodianImg: huodianImg,
+            shuidianImg: shuidianImg,
+            xinnengyuanImg: xinnengyuanImg,
+            meidianImg: meidianImg,
+            moreImg: moreImg,
+            showDatePicker: false,
+            currentDate: [],
+            showDate: '',
+            cupDataYearArr: {
+                section: [],
+                integration: []
+            }
         }
     },
     created() {
+        this.showDate = new Date().getFullYear()
+        this.getGateWayData()
     },
     methods: {
+        // 获取首页数据
+        getGateWayData() {
+            let that = this
+            let params = {
+                binSection: '',
+                year: '2022',
+                season: '1'
+            }
+            apiGetevaluationportallist(params).then(datas =>{
+                if (datas && datas.data) {
+                    let secArr = ['HD', 'SD', 'XNYFG', 'GJYW', 'MDYTH']
+                    secArr.forEach(item =>{
+                        for(let i in datas.data.year) {
+                            let it = datas.data.year[i]
+                            if (item === i && i !== 'MDYTH') {
+                                let gradeA = 0
+                                let gradeB = 0
+                                let gradeC = 0
+                                let gradeD = 0
+                                let tableData = []
+                                it.forEach((iv, index) =>{
+                                    if (index < 3) {
+                                        let obj = iv
+                                        if (index === 0) {
+                                            obj.img = cup1
+                                        } else if (index === 1) {
+                                            obj.img = cup2
+                                        } else if (index === 2) {
+                                            obj.img = cup3
+                                        }
+                                        tableData.push(iv)
+                                    }
+                                    if (iv.grade === 'A') {
+                                        gradeA ++
+                                    } else if (iv.grade === 'B') {
+                                        gradeB ++
+                                    } else if (iv.grade === 'C') {
+                                        gradeC ++
+                                    } else if (iv.grade === 'D') {
+                                        gradeD ++
+                                    }
+                                })
+                                let obj = {
+                                    name: item === 'HD' ? '火电板块' : item === 'SD' ? '水电板块' :item === 'XNYFG' ? '新能源' : '海外业务',
+                                    nameEn: item,
+                                    echartsData: {
+                                        allNum: it.length,
+                                        echarts: [
+                                            { value: gradeA, name: 'A类' },
+                                            { value: gradeB, name: 'B类' },
+                                            { value: gradeC, name: 'C类' },
+                                            { value: gradeD, name: 'D类' }
+                                        ]
+                                    },
+                                    tableDatas: tableData,
+                                    allTableData: it,
+                                    section: [],
+                                    sectionAll: []
+                                }
+                                that.cupDataYearArr.section.push(obj)
+                            } else if(item === i && i === 'MDYTH') {
+                                it.forEach((iv, index) =>{
+                                    if (index<2) {
+                                        if (index === 0) {
+                                            iv.img = cup1
+                                        } else if (index === 1) {
+                                            iv.img = cup2
+                                        }
+                                        that.cupDataYearArr.integration.push(iv)
+                                    }
+                                })
+                            }
+                        }
+                    })
+                    that.cupDataYearArr.section.forEach(item =>{
+                        for(let i in datas.data.season) {
+                            let it = datas.data.season[i]
+                            if (item.nameEn === i) {
+                                it.forEach((iv, index) =>{
+                                    if (index<3) {
+                                        item.section.push(iv)
+                                    }
+                                })
+                                item.sectionAll = it
+                            }
+                        }
+                    })
+                    console.log(that.cupDataYearArr)
+                    console.log(that.cupDataSeasonArr)
+                    this.$nextTick(() =>{
+                        that.getEcharts(that.cupDataYearArr.section)
+                    })
+                }
+            })
+        },
+        getEcharts(datas) {
+            datas.forEach((item, index) =>{
+                this.getEchartsData(item.echartsData.echarts, 'pieChart'+index)
+            })
+        },
+        
+        getEchartsData(data, name) {
+            let option = {
+                color: ['#F65177', '#50C14E', '#5093E1', '#9DA5BE'],
+                tooltip: {
+                    trigger: 'item'
+                },
+                series: [
+                    {
+                    name: '年度榜',
+                    type: 'pie',
+                    radius: ['50%', '70%'],
+                    avoidLabelOverlap: false,
+                    label: {
+                        show: false,
+                        position: 'center'
+                    },
+                    // emphasis: {
+                    //     label: {
+                    //     show: true,
+                    //     fontSize: 10,
+                    //     fontWeight: 'bold'
+                    //     }
+                    // },
+                    labelLine: {
+                        show: false
+                    },
+                    data: data
+                    }
+                ]
+            };
+            // 基于准备好的dom,初始化echarts实例
+            let dom = document.getElementById(name);
+            dom.removeAttribute("_echarts_instance_")
+            let myChart = this.$echarts.init(dom);
+            myChart.setOption(option);
+            window.addEventListener("resize", function () {
+                myChart.resize()
+            })
+        },
+        changeDate() {
+            this.showDatePicker = true
+        },
+        confirmFn(val) {
+            this.showDate = val.selectedValues[0]
+            console.log('riqi', val)
+            this.cancelFn()
+        },
+        cancelFn() {
+            this.showDatePicker = false
+        }
     }
 }
 </script>
 
 <style lang="less">
+.homeMobeilMask{
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0,0,0,0.5);
+    z-index: 111;
+}
 .homeMobeilPage {
     background-color: #184FB4;
     .van-nav-bar{
@@ -55,36 +314,198 @@ export default {
             justify-content: space-around;
             .topLeft{
                 display: flex;
-                .van-icon{
-                    line-height: 60px;
+                img{
+                    width: 24px;
+                    height: 28px;
+                    position: relative;
+                    top: 18px;
+                    left: -10px;
                 }
                 span{
-                    font-family: Microsoft YaHei;
+                    font-family: MicrosoftYaHei;
                     font-weight: 600;
                     font-size: 16px;
-                    color: #333333;
+                    color: #444950;
                     line-height: 60px;
                 }
             }
             .topRight{
                 display: flex;
-                .van-icon{
-                    line-height: 60px;
-                    color: #d9d9d9;
+                img{
+                    width: 22px;
+                    height: 18px;
+                    position: relative;
+                    top: 21px;
+                    left: 5px;
                 }
                 span{
-                    font-family: Microsoft YaHei;
+                    font-family: MicrosoftYaHei;
                     font-weight: 400;
                     font-size: 14px;
-                    color: #d9d9d9;
+                    color: #545960;
                     line-height: 60px;
                     margin-right: 5px;
                 }
             }
         }
         .mobeilMain{
-            height: 50px;
+            // height: 50px;
             background-color: #ededf5;
+            padding: 17px 20px 0 20px;
+            .rankingList{
+                width: 100%;
+                height: 45px;
+                background: #184FB4;
+                border-radius: 5px;
+                margin-bottom: 15px;
+                span{
+                    display: inline-block;
+                    width: 85%;
+                    text-align: center;
+                    font-family: MicrosoftYaHei;
+                    font-weight: 400;
+                    font-size: 16px;
+                    color: #fff;
+                    margin-right: 5px;
+                    position: relative;
+                    top: 12px;
+                    left: 8vw;
+                }
+                img{
+                    width: 22px;
+                    height: 18px;
+                    position: relative;
+                    top: 15px;
+                    right: 5px;
+                }
+                .van-picker{
+                    z-index: 222;
+                }
+            }
+            .mainModel{
+                background: #fff;
+                border-radius: 5px;
+                .mainModelTit{
+                    height: 50px;
+                    padding: 0 15px;
+                    display: flex;
+                    justify-content: space-between;
+                    border-bottom: 1px solid #96A1B4;
+                    .mainModelTit_left{
+                        img{
+                            width: 22px;
+                            height: 22px;
+                            position: relative;
+                            top: 12px;
+                            right: 5px;
+                        }
+                        span{
+                            display: inline-block;
+                            font-family: MicrosoftYaHei;
+                            font-weight: 500;
+                            font-size: 16px;
+                            color: #545960;
+                            margin-right: 5px;
+                            position: relative;
+                            top: 8px;
+                        }
+                    }
+                    .mainModelTit_right{
+                        width: 18px;
+                        height: 18px;
+                        position: relative;
+                        top: 14px;
+                        right: 5px;
+                    }
+                }
+                .mainModelMsg{
+                    width: 100%;
+                    display: flex;
+                    margin-bottom: 10px;
+                    .mainTwo{
+                        width: 35%;
+                        border-right: 1px solid #E1E3EA;
+                        position: relative;
+                        .echartsNum{
+                            font-size: 16px;
+                            font-weight: 600;
+                            position: absolute;
+                            top: 40px;
+                            left: 60px;
+                        }
+                        .mainTwoComColor{
+                            display: inline-block;
+                            width: 6px;
+                            height: 6px;
+                            border-radius: 20px;
+                            margin-left: 15px;
+                            position: relative;
+                            top: -1px;
+                        }
+                        .mainTwoComTit{
+                            font-size: 14px;
+                            display: inline-block;
+                            margin-left: 5px;
+                        }
+                    }
+                    .mainThree{
+                        width: 65%;
+                        padding-top: 13px;
+                        border-right: 1px solid #E1E3EA;
+                        position: relative;
+                        .headerNameTit{
+                            display: flex;
+                            justify-content: space-between;
+                            padding: 0px 20px;
+                            font-size: 14px;
+                            color: #414141;
+                        }
+                        .mainThreeMsg{
+                            display: flex;
+                            margin: 0 10px;
+                            width: 100%;
+                            height: 33px;
+                            background: #F6F7FA;
+                            margin-bottom: 8px;
+                            padding-left: 10px;
+                            padding-top: 2px;
+                            border-radius: 5px;
+                            img{
+                                width: 20px;
+                                height: 20px;
+                                position: relative;
+                                top: 5px;
+                                margin-right: 10px;
+                            }
+                            .msgProgress{
+                                margin-top: 5px;
+                                display: flex;
+                                width: 90%;
+                                span{
+                                    font-size: 14px;
+                                    font-family: Microsoft YaHei;
+                                }
+                                span:nth-child(1){
+                                    display: inline-block;
+                                    width: 70%;
+                                    font-weight: 400;
+                                    color: #666;
+                                    margin-right: 10px;
+                                }
+                                span:nth-child(2){
+                                    font-weight: 600;
+                                    margin-right: 30px;
+                                    color: #F65177;
+                                }
+                                span:nth-child(3){
+                                    font-weight: 600;
+                                    color: #666;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 }

+ 1 - 1
src/utils/baseUrl.js

@@ -10,7 +10,7 @@ switch (process.env.NODE_ENV) {
     case 'development': 
         baseUrl.ROOT = "/api"  //开发环境url
         // baseUrl.URL = "http://10.65.59.67:28800"
-        baseUrl.URL = "http://192.168.2.8:28800"
+        baseUrl.URL = "http://192.168.2.10:28800"
         // baseUrl.URL = "http://10.65.78.23:28800"  //测试环境
         // baseUrl.URL = "http://10.65.78.81:28800"  // 正式环境
         break