소스 검색

首页中火电板块,水电板块,新能源和海外业务服务联调(评级统计,年度榜,考评排行榜);根据后端需求修改考评指标管理功能;

SunZehao 1 년 전
부모
커밋
8cf6d95aa7
5개의 변경된 파일365개의 추가작업 그리고 136개의 파일을 삭제
  1. 10 0
      src/api/api.js
  2. 36 8
      src/components/evaluationSystem/evaluationIndexPage.vue
  3. 317 125
      src/components/gatewaynNewPage.vue
  4. 0 1
      src/components/taskCenter/taskCenterEvlFrom.vue
  5. 2 2
      src/router/index.js

+ 10 - 0
src/api/api.js

@@ -68,6 +68,16 @@ export function apiPostremoveByToken(params) {
     })
 }
 
+//----------------------------------------首页---------------------------------------------------
+//----------首页服务
+export function apiGetevaluationportallist(params) {
+    return httpRequest({
+        url: 'evaluation/portal/list',
+        method: 'get',
+        params: params
+    })
+}
+
 
 //----------------------------------------任务中心------------------------------------------------
 //---------列表

+ 36 - 8
src/components/evaluationSystem/evaluationIndexPage.vue

@@ -77,9 +77,9 @@
                 </el-pagination>
             </div>
             <div class="indexdialog">
-                <el-dialog :title="title" v-model="dialogVisible" width="70vw" :close-on-click-modal="false">
+                <el-dialog :title="title" v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
                     <el-row class="periodFrom">
-                        <el-col :span="8">
+                        <el-col :span="7">
                             <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="DruleForm" :validate-on-rule-change="false">
                                 <el-form-item label="指标名称" prop="indicatorName">
                                     <el-input v-model="ruleForm.indicatorName" placeholder="请输入指标名称" @blur="blurInput"></el-input>
@@ -156,7 +156,7 @@
                                 </el-form-item>
                             </el-form>
                         </el-col>
-                        <el-col :span="16" class="indicatorItemBtn">
+                        <el-col :span="17" class="indicatorItemBtn">
                             <div class="PeriodBtnDia">
                                 <p class="indItemC">指标项配置管理</p>
                                 <el-button
@@ -209,6 +209,23 @@
                                                             <span>{{scope.row.optionCode}}</span>
                                                         </template>
                                                     </el-table-column>
+                                                    <el-table-column label="计算公式">
+                                                        <template #default="scope">
+                                                            <el-input v-model="scope.row.formula" :rows="1" type="textarea" placeholder="请输入计算公式"></el-input>
+                                                        </template>
+                                                    </el-table-column>
+                                                    <el-table-column label="是否显示">
+                                                        <template #default="scope">
+                                                            <el-select v-model="scope.row.isShow" placeholder="请选择是否显示">
+                                                                <el-option
+                                                                    v-for="item in isShowEvaluation"
+                                                                    :key="item.value"
+                                                                    :label="item.label"
+                                                                    :value="item.value">
+                                                                </el-option>
+                                                            </el-select>
+                                                        </template>
+                                                    </el-table-column>
                                                     <el-table-column label="描述">
                                                         <template #default="scope">
                                                             <el-input v-model="scope.row.des" :rows="1" type="textarea" placeholder="请输入描述"></el-input>
@@ -328,10 +345,21 @@ export default {
             saveW: saveW,
             addIcon: addIcon,
             indicatoroptions: [],
-            indicItemoptions: []
+            indicItemoptions: [],
+            isShowEvaluation: []
         }
     },
     created() {
+        this.isShowEvaluation = [
+            {
+                label: '是',
+                value: true
+            },
+            {
+                label: '否',
+                value: false
+            }
+        ]
         this.getEvaluationData()
         this.getDataDictionary('BM0001') //部门//模块//阶段
         this.getindicatorTypeData()
@@ -480,7 +508,7 @@ export default {
                 indicatorCode: this.evalradio.indicatorCode,
                 indicatorType: this.evalradio.indicatorTypeId,
                 indicatorUnit: this.evalradio.unit,
-                department: this.evalradio.dept,
+                department: this.evalradio.deptId,
                 binSection: this.evalradio.binSection,
                 binStage: this.evalradio.binStage,
                 isQuantified: this.evalradio.isQuantified,
@@ -536,7 +564,7 @@ export default {
                 indicatorCode: that.ruleForm.indicatorCode,
                 indicatorTypeId: that.ruleForm.indicatorType,
                 unit: that.ruleForm.indicatorUnit,
-                dept: that.ruleForm.department,
+                deptId: that.ruleForm.department,
                 deptName: deptName,
                 binSection: that.ruleForm.binSection,
                 binStage: that.ruleForm.binStage,
@@ -668,7 +696,7 @@ export default {
                 indicatorCode: row.indicatorCode,
                 indicatorType: row.indicatorTypeId,
                 indicatorUnit: row.unit,
-                department: row.dept,
+                department: row.deptId,
                 binSection: row.binSection,
                 binStage: row.binStage,
                 isQuantified: row.isQuantified,
@@ -795,7 +823,7 @@ export default {
                                 }
                                 .indicatorItemTableData{
                                     max-height: 55vh !important;
-                                    overflow-y: auto;
+                                    // overflow-y: auto;
                                     .datasMsg{
                                         .tableBtn {
                                             display: flex;

+ 317 - 125
src/components/gatewaynNewPage.vue

@@ -3,11 +3,11 @@
         <el-row>
             <el-col :span="18" class="quarter">
                 <div class="searchFn">
-                    <el-date-picker v-model="value3" type="year" placeholder="选择年份" />
+                    <el-date-picker v-model="changeYear" type="year" value-format="YYYY" placeholder="选择年份" @change="changeYearFn" />
                     <div class="quarterChoose">
-                        <el-icon :size="20" color="#3B7AD1"><ArrowLeft /></el-icon>
-                        <span class="choose">第一季度</span>
-                        <el-icon :size="20" color="#3B7AD1"><ArrowRight /></el-icon>
+                        <el-icon :size="20" color="#3B7AD1" @click="arrowLeft"><ArrowLeft /></el-icon>
+                        <span class="choose">{{seasonStr}}</span>
+                        <el-icon :size="20" color="#3B7AD1" @click="arrowRight"><ArrowRight /></el-icon>
                     </div>
                 </div>
                 <div class="tableHeader">
@@ -52,13 +52,13 @@
                     </div>
                 </div>
                  <!-- v-for="it in 4" :key="it" -->
-                <div class="tableMain" v-for="it in 4" :key="it">
+                <div class="tableMain" v-for="(it, index) in cupDataYearArr.section" :key="index">
                     <div class="mainOne">
-                        <span>火电板块</span>
+                        <span :style="index === 2 ? 'top:45px': ''">{{it.name}}</span>
                     </div>
                     <div class="mainTwo">
-                        <div class="echartsNum">18</div>
-                        <div id="pieChart" style="height: 100px;width: 100%"></div>
+                        <div class="echartsNum" :style="it.echartsData.allNum < 10 ? 'left:70px': ''">{{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>
@@ -80,75 +80,90 @@
                     </div>
                     <div class="mainThree">
                         <div class="mainMore"></div>
-                        <div style="display: flex" v-for="(item, index) in cupMsgArr" :key="index">
+                        <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.name}}</span>
-                                    <span>{{item.level}}</span>
-                                    <span>{{item.points}}</span>
+                                    <span>{{item.company}}</span>
+                                    <span>{{item.grade}}</span>
+                                    <span>{{item.score}}</span>
                                 </div>
                             </div>
                         </div>
                     </div>
                     <div class="mainFour">
                         <div class="mainMore"></div>
-                        <div style="display: flex" v-for="(item, index) in chartsMsgArr" :key="index">
+                        <div style="display: flex" v-for="(item, index) in it.section" :key="index">
                             <div class="mainFourMsg">
-                                <span>{{item.name}}</span>
-                                <span>{{item.points}}</span>
+                                <span>{{item.company}}</span>
+                                <span>{{item.score}}</span>
                                 <div class="mainFourImg">
                                     <el-popover
                                         placement="right-start"
-                                        title="Title"
+                                        :title="item.company +' '+ item.score"
                                         :width="200"
                                         trigger="hover"
-                                        content="this is content, this is content, this is content"
+                                        :content="item.matter_heigh_note"
                                     >
                                         <template #reference>
-                                            <img :src="item.jiaA === 0 ? cenImg : item.jiaA === 1 ? topImg : botImg" alt="">
+                                            <img :src="item.matter_heigh === 0 ? cenImg : item.matter_heigh === 1 ? topImg : botImg" alt="">
                                         </template>
                                     </el-popover>
-                                    <el-tooltip
-                                        class="box-item"
-                                        effect="customized"
-                                        content="scope.row.des"
-                                        placement="top"
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.manage_low_note"
                                     >
-                                        <img :src="item.jiaB === 0 ? cenImg : item.jiaB === 1 ? topImg : botImg" alt="">
-                                    </el-tooltip>
-                                    <el-tooltip
-                                        class="box-item"
-                                        effect="customized"
-                                        content="scope.row.des"
-                                        placement="top"
+                                        <template #reference>
+                                            <img :src="item.manage_low === 0 ? cenImg : item.manage_low === 1 ? topImg : botImg" alt="">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.manage_height_note"
                                     >
-                                        <img :src="item.guanA === 0 ? cenImg : item.guanA === 1 ? topImg : botImg" alt="">
-                                    </el-tooltip>
-                                    <el-tooltip
-                                        class="box-item"
-                                        effect="customized"
-                                        content="scope.row.des"
-                                        placement="top"
+                                        <template #reference>
+                                            <img :src="item.manage_height === 0 ? cenImg : item.manage_height === 1 ? topImg : botImg" alt="">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.manage_low_note"
                                     >
-                                        <img :src="item.guanB === 0 ? cenImg : item.guanB === 1 ? topImg : botImg" alt="">
-                                    </el-tooltip>
-                                    <el-tooltip
-                                        class="box-item"
-                                        effect="customized"
-                                        content="scope.row.des"
-                                        placement="top"
+                                        <template #reference>
+                                            <img :src="item.manage_low === 0 ? cenImg : item.manage_low === 1 ? topImg : botImg" alt="">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.standard_heigh_note"
                                     >
-                                        <img :src="item.gaoA === 0 ? cenImg : item.gaoA === 1 ? topImg : botImg" alt="">
-                                    </el-tooltip>
-                                    <el-tooltip
-                                        class="box-item"
-                                        effect="customized"
-                                        content="scope.row.des"
-                                        placement="top"
+                                        <template #reference>
+                                            <img :src="item.standard_heigh === 0 ? cenImg : item.standard_heigh === 1 ? topImg : botImg" alt="">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.standard_low_note"
                                     >
-                                        <img :src="item.gaoB === 0 ? cenImg : item.gaoB === 1 ? topImg : botImg" alt="">
-                                    </el-tooltip>
+                                        <template #reference>
+                                            <img :src="item.standard_low === 0 ? cenImg : item.standard_low === 1 ? topImg : botImg" alt="">
+                                        </template>
+                                    </el-popover>
                                 </div>
                             </div>
                         </div>
@@ -159,25 +174,90 @@
                         <span>煤电一体化</span>
                     </div>
                     <div class="footerTwo">
-                        <div style="display: flex" v-for="(item, index) in cupFootMsgArr" :key="index">
+                        <div style="display: flex" v-for="(item, index) in cupDataYearArr.integration" :key="index">
                             <div class="footerTwoMsg">
                                 <img :src="item.img" alt="">
                                 <div class="footerProgress">
-                                    <span class="footerOneSpan">{{item.name}}</span>
-                                    <el-progress percentage="80" :stroke-width="5" />
-                                    <span class="footerTwoSpan">{{item.level}}</span>
-                                    <span class="footerThreeSpan">{{item.points}}</span>
+                                    <span class="footerOneSpan">{{item.company}}</span>
+                                    <el-progress :percentage="Math.floor((item.score/item.base_score)*100)" :stroke-width="5" />
+                                    <span class="footerTwoSpan">{{item.grade}}</span>
+                                    <span class="footerThreeSpan">{{item.score}}</span>
                                 </div>
                             </div>
                         </div>
                     </div>
                     <div class="footerThree">
                         <div class="mainMore"></div>
-                        <div style="display: flex" v-for="(item, index) in cupFootMsgArr" :key="index">
+                        <div style="display: flex" v-for="(item, index) in cupDataSeasonArr.integration" :key="index">
                             <div class="footerThreeMsg" v-for="it in matterMsg" :key="it">
                                 <div class="footerImg">
                                     <span>{{it}}</span>
-                                    <img :src="item.jiaA === 0 ? cenImg : item.jiaA === 1 ? topImg : botImg" alt="">
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.matter_heigh_note"
+                                    >
+                                        <template #reference>
+                                            <img :src="item.matter_heigh === 0 ? cenImg : item.matter_heigh === 1 ? topImg : botImg" v-if="it === '加分事项'">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.matter_low_note"
+                                    >
+                                        <template #reference>
+                                            <img :src="item.matter_low === 0 ? cenImg : item.matter_low === 1 ? topImg : botImg" v-if="it === '扣分事项'">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.manage_heigh_note"
+                                    >
+                                        <template #reference>
+                                            <img :src="item.manage_heigh === 0 ? cenImg : item.manage_heigh === 1 ? topImg : botImg" v-if="it === '管理加分'">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.manage_low_note"
+                                    >
+                                        <template #reference>
+                                            <img :src="item.manage_low === 0 ? cenImg : item.manage_low === 1 ? topImg : botImg" v-if="it === '管理扣分'">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.standard_heigh_note"
+                                    >
+                                        <template #reference>
+                                            <img :src="item.standard_heigh === 0 ? cenImg : item.standard_heigh === 1 ? topImg : botImg" v-if="it === '高于基准'">
+                                        </template>
+                                    </el-popover>
+                                    <el-popover
+                                        placement="right-start"
+                                        :title="item.company +' '+ item.score"
+                                        :width="200"
+                                        trigger="hover"
+                                        :content="item.standard_low_note"
+                                    >
+                                        <template #reference>
+                                            <img :src="item.standard_low === 0 ? cenImg : item.standard_low === 1 ? topImg : botImg" v-if="it === '低于基准'">
+                                        </template>
+                                    </el-popover>
                                 </div>
                             </div>
                         </div>
@@ -216,39 +296,32 @@ import cup3 from '../assets/getwayImg/cup3.png'
 import topImg from '../assets/getwayImg/topNew.png'
 import botImg from '../assets/getwayImg/botNew.png'
 import cenImg from '../assets/getwayImg/cenNew.png'
+
+import {apiGetevaluationportallist} from '../api/api'
 export default {
     data() {
         return {
-            cupMsgArr: [],
+            cupDataYearArr: {
+                section: [],
+                integration: []
+            },
+            cupDataSeasonArr: {
+                section: [],
+                integration: []
+            },
             cupFootMsgArr: [],
-            chartsMsgArr: [],
             matterMsg: ['加分事项', '扣分事项', '管理加分', '管理扣分', '高于基准', '低于基准'],
             topImg: topImg,
             botImg: botImg,
             cenImg: cenImg,
+            changeYear: '',
+            seasonStr: '',
+            seasonArr: ['第一季度', '第二季度', '第三季度']
         }
     },
     created() {
-        this.cupMsgArr = [
-            {
-                level: 'A',
-                points: '134',
-                img: cup1,
-                name: '大港电厂(广安津能)'
-            },
-            {
-                level: 'A',
-                points: '134',
-                img: cup2,
-                name: '怀安热电'
-            },
-            {
-                level: 'A',
-                points: '124',
-                img: cup3,
-                name: '滨海电力'
-            }
-        ]
+        this.changeYear = (new Date().getFullYear()-1).toString()
+        this.seasonStr = '第一季度'
         this.cupFootMsgArr = [
             {
                 level: 'A',
@@ -263,44 +336,168 @@ export default {
                 name: '怀安热电'
             }
         ]
-        this.chartsMsgArr = [
-            {
-                name: '中国国电电力上海庙公司',
-                points: '134',
-                jiaA: 1,
-                jiaB: 2,
-                guanA: 1,
-                guanB: 0,
-                gaoA: 1,
-                gaoB: 0    
-            },
-            {
-                name: '中国国电电力上海庙公司',
-                points: '134',
-                jiaA: 1,
-                jiaB: 2,
-                guanA: 1,
-                guanB: 0,
-                gaoA: 1,
-                gaoB: 0    
-            },
-            {
-                name: '中国国电电力上海庙公司',
-                points: '134',
-                jiaA: 1,
-                jiaB: 2,
-                guanA: 1,
-                guanB: 0,
-                gaoA: 1,
-                gaoB: 0    
-            }
-        ]
     },
     mounted() {
-        this.getEchartsData()
+        this.getGateWayData()
     },
     methods: {
-        getEchartsData() {
+        changeYearFn(val) {
+            this.changeYear = val
+            this.cupDataYearArr = {
+                section: [],
+                integration: []
+            }
+            this.cupDataSeasonArr = {
+                section: [],
+                integration: []
+            }
+            this.getGateWayData()
+        },
+        arrowLeft() {
+            if (this.seasonStr === '第一季度') {
+                this.seasonStr = '第三季度'
+            } else if (this.seasonStr === '第二季度') {
+                this.seasonStr = '第一季度'
+            } else if (this.seasonStr === '第三季度') {
+                this.seasonStr = '第二季度'
+            }
+            this.cupDataYearArr = {
+                section: [],
+                integration: []
+            }
+            this.cupDataSeasonArr = {
+                section: [],
+                integration: []
+            }
+            this.getGateWayData()
+        },
+        arrowRight() {
+            if (this.seasonStr === '第一季度') {
+                this.seasonStr = '第二季度'
+            } else if (this.seasonStr === '第二季度') {
+                this.seasonStr = '第三季度'
+            } else if (this.seasonStr === '第三季度') {
+                this.seasonStr = '第一季度'
+            }
+            this.cupDataYearArr = {
+                section: [],
+                integration: []
+            }
+            this.cupDataSeasonArr = {
+                section: [],
+                integration: []
+            }
+            this.getGateWayData()
+        },
+        // 获取首页数据
+        getGateWayData() {
+            let that = this
+            let params = {
+                binSection: '',
+                year: that.changeYear,
+                season: that.seasonStr === '第一季度' ? '1' : that.seasonStr === '第二季度' ? '2' : '3'
+            }
+            apiGetevaluationportallist(params).then(datas =>{
+                if (datas && datas.data) {
+                    let secArr = ['HD', 'SD', 'XNYFG', 'GJYE', '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
+                            }
+                        }
+                    })
+                    if (datas.data.season['MDYTH']) {
+                        datas.data.season['MDYTH'].forEach((item, index) =>{
+                            if (index<2) {
+                                that.cupDataSeasonArr.integration.push(item)
+                            }
+                        })
+                    }
+                    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: {
@@ -308,7 +505,7 @@ export default {
                 },
                 series: [
                     {
-                    name: 'Access From',
+                    name: '年度榜',
                     type: 'pie',
                     radius: ['50%', '70%'],
                     avoidLabelOverlap: false,
@@ -326,17 +523,12 @@ export default {
                     labelLine: {
                         show: false
                     },
-                    data: [
-                        { value: 1048, name: 'Search Engine' },
-                        { value: 735, name: 'Direct' },
-                        { value: 580, name: 'Email' },
-                        { value: 484, name: 'Union Ads' }
-                    ]
+                    data: data
                     }
                 ]
             };
             // 基于准备好的dom,初始化echarts实例
-            let dom = document.getElementById('pieChart');
+            let dom = document.getElementById(name);
             dom.removeAttribute("_echarts_instance_")
             let myChart = this.$echarts.init(dom);
             myChart.setOption(option);
@@ -368,7 +560,7 @@ export default {
                 .el-input__wrapper{
                     background: #2C7EDC;
                     height: 30px;
-                    .el-input__prefix{
+                    .el-input__prefix, .el-input__inner, .el-input__suffix{
                         color: #fff;
                     }
                 }

+ 0 - 1
src/components/taskCenter/taskCenterEvlFrom.vue

@@ -268,7 +268,6 @@ import addIcon from '../../assets/btnIcon/add.png'
 import saveIcon from '../../assets/btnIcon/save.png'
 import editIcon from '../../assets/btnIcon/edit.png'
 import deleteIcon from '../../assets/btnIcon/delete.png'
-import { getToken } from '../../api/auth'
 export default {
     components: {
         importDailog

+ 2 - 2
src/router/index.js

@@ -30,8 +30,8 @@ const routes = [
                 },
                 component: () =>
                     import(
-                        '../components/gatewayPage.vue'
-                        // '../components/gatewaynNewPage.vue'
+                        // '../components/gatewayPage.vue'
+                        '../components/gatewaynNewPage.vue'
                     ),
             },
             {