对标考评分析页面样式调整，前端增加升序和降序的排序功能；考评规则配置页面的二级页面新增功能样式调整；部门考评评级页面搜索功能增加考评年度，默认时间为当年；基础信息配置中对于人员权限配置和工作流程配置页面进行地址跳转；

src/App.vue

@@ -36,6 +36,7 @@ export default {
     mounted() {
         window.workSpaceVo = {}
         this.loadPage()
+        this.isMobile()
     },
     methods:{
         loadPage() {
@@ -48,6 +49,14 @@ export default {
             this.$nextTick(() =>{
                 this.isRouterAlive = true
             })
+        },
+        isMobile() {
+            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')
+            } else {
+                window.localStorage.setItem('isMobile', 'PC')
+            }
         }
     }
 }

src/components/assessment/evaluationBenchmarkingIndicPage.vue

@@ -62,7 +62,7 @@
                 <div class="tableMain">
                     <el-table :data="benchmarkingIndicatorData" style="width: 100%" ref="benchmark" :border="true" >
                         <el-table-column type="index" label="排名" align="center"></el-table-column>
-                        <el-table-column label="考评单位" prop="organization_name">
+                        <el-table-column label="考评单位" prop="organization_name" width="200" sortable>
                             <template #default="scope">
                                 <el-tooltip class="box-item" effect="customized" :content="scope.row.organization_name"
                                     placement="right">
@@ -70,9 +70,10 @@
                                 </el-tooltip>
                             </template>
                         </el-table-column>
-                        <el-table-column label="综合得分" prop="score_total" />
+                        <el-table-column label="综合得分" prop="score_total" sortable />
                         <el-table-column  v-for="(it, index) in benchmarkingIndicatorHeader" :key="index" :label="it.name" align="center">
-                            <el-table-column v-for="(iv, index) in it.children" :key="index" :label="iv.key" align="center">
+                            <el-table-column sortable :sort-method="(a,b)=>sortMethods(a,b,iv.code)"
+                             v-for="(iv, index) in it.children" :key="index" :label="iv.key" align="center">
                                 <template #default="scope">
                                     <span
                                     style="font-weight: bold"
@@ -264,6 +265,11 @@ export default {
                 }
             })
         },
+        sortMethods(a, b, it) {
+            if (a[it] < b[it]) {
+                return -1
+            }
+        },
         // 获取阶段数据及指标类型数据
         getBinstageAndType() {
             let that = this
@@ -431,7 +437,15 @@ export default {
                             .el-table__cell {
                                 border-bottom: none !important;
                             }
-
+                            thead{
+                                tr{
+                                    th{
+                                        .cell{
+                                            line-height: 16px;
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                     .el-table__body-wrapper {

src/components/evaluationSystem/ruleDetailPage.vue

@@ -415,6 +415,9 @@ export default {
                         .el-overlay{
                             .el-dialog{
                                 margin-top: 10vh !important;
+                                .el-dialog__body{
+                                    padding: 30px 60px 30px 20px !important;
+                                }
                             }
                         }
                     }

src/components/menuTreeconfig.vue

@@ -20,7 +20,7 @@
           <!-- <i :class="menu.icon"></i> -->
           <img :src="menu.img" alt="">
           <template #title>
-            <span style="margin-left: 10px">{{menu.name}}</span>
+            <span style="margin-left: 10px" @click="open(menu.name)">{{menu.name}}</span>
           </template>
           <!-- <span slot="title">{{menu.name}}</span> -->
       </el-menu-item>
@@ -31,7 +31,20 @@
 <script>
 export default {
     props: ['menuData'],
-    name: 'MenuTree'
+    name: 'MenuTree',
+    methods: {
+        open(item) {
+            if (item === '人员权限配置' || item === '工作流程配置') {
+                let url = ''
+                if (window.location.href.includes('10.65.78.23')) {
+                    url = 'http://10.65.78.23:81/#/login'
+                } else {
+                    url = 'http://10.65.79.83:81/#/login'
+                }
+                window.open(url, 'blank')
+            }
+        }
+    }
 }
 </script>
 

src/views/Login.vue

@@ -1,38 +1,41 @@
 <template>
-  <div class="loginPic">
-        <!-- <div class="login_left">
-            <p>Welcome!</p>
-            <p class="title">光耀集中式风电功率预测系统</p>
-        </div> -->
-        <div class="login_right">
-            <img class="titleIcon" src="../assets/loginImage/logo.png" alt="">
-            <div class="loginCom" style="margin-bottom: 30px">
-                <img class="userIcon" src="../assets/loginImage/userIcon.png" alt="">
-                <el-input v-model="inputUser" placeholder="请输入用户名" />
-            </div>
-            <div class="loginCom" style="margin-bottom: 16px">
-                <img class="passwordIcon" src="../assets/loginImage/passwordIcon.png" alt="">
-                <el-input type="password" v-model="inputMima" placeholder="请输入密码" />
-            </div>
-            <div class="remeber">
-                <el-checkbox v-model="ememberMe" @change="changeBox">记住密码</el-checkbox>
-            </div>
-             <!-- v-if="!loginLoading"  v-else -->
-            <div class="loginBtn" @click="handleLogin" v-if="!loginLoading">
-                <span class="loginSpan">登录</span>
-            </div>
-            <div class="loginBtn" v-else>
-                <div class="loading">
-                    <el-icon color="#fff"><Loading /></el-icon>
-                    <span class="loadingSpan">登录</span>
+    <div class="loginPic" v-if="isMobile === 'PC'">
+            <!-- <div class="login_left">
+                <p>Welcome!</p>
+                <p class="title">光耀集中式风电功率预测系统</p>
+            </div> -->
+            <div class="login_right">
+                <img class="titleIcon" src="../assets/loginImage/logo.png" alt="">
+                <div class="loginCom" style="margin-bottom: 30px">
+                    <img class="userIcon" src="../assets/loginImage/userIcon.png" alt="">
+                    <el-input v-model="inputUser" placeholder="请输入用户名" />
+                </div>
+                <div class="loginCom" style="margin-bottom: 16px">
+                    <img class="passwordIcon" src="../assets/loginImage/passwordIcon.png" alt="">
+                    <el-input type="password" v-model="inputMima" placeholder="请输入密码" />
+                </div>
+                <div class="remeber">
+                    <el-checkbox v-model="ememberMe" @change="changeBox">记住密码</el-checkbox>
+                </div>
+                <!-- v-if="!loginLoading"  v-else -->
+                <div class="loginBtn" @click="handleLogin" v-if="!loginLoading">
+                    <span class="loginSpan">登录</span>
+                </div>
+                <div class="loginBtn" v-else>
+                    <div class="loading">
+                        <el-icon color="#fff"><Loading /></el-icon>
+                        <span class="loadingSpan">登录</span>
+                    </div>
                 </div>
             </div>
-        </div>
-        <!--  底部  -->
-            <!-- <div class="loginFooter">
-                <span>Copyright © 2021-2022 GuangYaoDianLi All Rights Reserved.</span>
-            </div> -->
-  </div>
+            <!--  底部  -->
+                <!-- <div class="loginFooter">
+                    <span>Copyright © 2021-2022 GuangYaoDianLi All Rights Reserved.</span>
+                </div> -->
+    </div>
+    <div v-else>
+        <div>cesMobile</div>
+    </div>
 </template>
 
 <script>
@@ -49,7 +52,8 @@ export default {
             ememberMe:false,
             loading:false,
             loginText: '',
-            loginLoading: false
+            loginLoading: false,
+            isMobile: window.localStorage.getItem('isMobile')
         }
     },
     created() {

src/views/homePage.vue

@@ -78,189 +78,171 @@ export default {
         }
     },
     created(){
-        this.getMenuData()
-        // this.forecastDatas = [
-        //     {
-        //         index: '/home',
-        //         name: '考评首页',
-        //         img: homeImg
-        //     },
-        //     {
-        //         index: '/taskCenter',
-        //         name: '任务中心',
-        //         img: taskImg
-        //     },
-        //     {
-        //         index: '/notification',
-        //         name: '通告管理',
-        //         img: tonggaoImg
-        //     },
-        //     {
-        //         index: '1',
-        //         name: '考评体系配置',
-        //         img: tixiImg,
-        //         children: [
-        //             {
-        //                 index: '/evaluationSystem/evaluationIndex',
-        //                 name: '考评指标管理',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/evaluationRules',
-        //                 name: '考评规则配置',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/company',
-        //                 name: '单位权重配置',
-        //             },
-        //             {
-        //                 index: '/baseInfomation/moreBrand',
-        //                 name: '单位营业收入',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/achievementK',
-        //                 name: '业绩考核系数配置',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/partyBuildingK',
-        //                 name: '党建考核系数配置',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/department',
-        //                 name: '部门考评配置',
-        //             },
-        //             {
-        //                 index: '/evaluationSystem/personnel',
-        //                 name: '人员考评配置',
-        //             },
-        //         ]
-        //     },
-        //     {
-        //         index: '2',
-        //         name: '单位考评业务',
-        //         img: yewuImg,
-        //         children: [
-        //             {
-        //                 index: '/assessment/evaluationStart',
-        //                 name: '单位考评目标启动',
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationAmendment',
-        //                 name: '单位考评目标修订',
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationMonth',
-        //                 name: '单位月度考评'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationQuarter',
-        //                 name: '单位季度考评'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationYear',
-        //                 name: '单位年度考评'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationBenchmarkingIndic',
-        //                 name: '考评对标分析'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationWarning',
-        //                 name: '考评预警'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '单位考评评级'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '考评监督管理'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationReport',
-        //                 name: '考评报告'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '单位考核结果应用'
-        //             }
-        //         ]
-        //     },
-        //     {
-        //         index: '3',
-        //         name: '本部考评业务',
-        //         img: benbuImg,
-        //         children: [
-        //             {
-        //                 index: '/assessment/evaluationDeptStart',
-        //                 name: '业绩指标计划',
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationDeptBusiness',
-        //                 name: '业绩指标考评'
-        //             },
-        //             {
-        //                 index: '/assessment/evaluationDeptRating',
-        //                 name: '部门考评评级'
-        //             },
-        //             {
-        //                 index: '/assessment/assessmentApplication',
-        //                 name: '绩效结果考核申报'
-        //             }
-        //         ]
-        //     },
-        //     {
-        //         index: '4',
-        //         name: '本部人员考评',
-        //         img: renyuanImg,
-        //         children: [
-        //             {
-        //                 index: '',
-        //                 name: '人员考评结果',
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '任期考评结果'
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '人员考评评级'
-        //             }
-        //         ]
-        //     },
-        //     {
-        //         index: '5',
-        //         name: '基础信息配置',
-        //         img: quanxianImg,
-        //         children: [
-        //             {
-        //                 index: '',
-        //                 name: '人员权限配置',
-        //             },
-        //             {
-        //                 index: '',
-        //                 name: '工作流程配置',
-        //             }
-        //         ]
-        //     },
-        //     {
-        //         index: '6',
-        //         name: '对标考评知识库',
-        //         img: zhishikuImg,
-        //         children: [
-        //             {
-        //                 index: '/evaluationknowledge/scoringRules',
-        //                 name: '考评得分规则',
-        //             },
-        //             {
-        //                 name: '考评评级规则',
-        //             },
-        //             {
-        //                 index: '/evaluationknowledge/earlyWarningRule',
-        //                 name: '考评预警规则',
-        //             }
-        //         ]
-        //     },
-        // ]
+        // this.getMenuData()
+        this.forecastDatas = [
+            {
+                index: '/home',
+                name: '考评首页',
+                img: homeImg
+            },
+            {
+                index: '/taskCenter',
+                name: '任务中心',
+                img: taskImg
+            },
+            {
+                index: '/notification',
+                name: '通告管理',
+                img: tonggaoImg
+            },
+            {
+                index: '1',
+                name: '考评体系配置',
+                img: tixiImg,
+                children: [
+                    {
+                        index: '/evaluationSystem/evaluationIndex',
+                        name: '考评指标管理',
+                    },
+                    {
+                        index: '/evaluationSystem/evaluationRules',
+                        name: '考评规则配置',
+                    },
+                    {
+                        index: '/evaluationSystem/company',
+                        name: '单位权重配置',
+                    },
+                    {
+                        index: '/baseInfomation/moreBrand',
+                        name: '单位营业收入',
+                    },
+                    {
+                        index: '/evaluationSystem/achievementK',
+                        name: '业绩考核系数配置',
+                    },
+                    {
+                        index: '/evaluationSystem/partyBuildingK',
+                        name: '党建考核系数配置',
+                    },
+                    {
+                        index: '/evaluationSystem/department',
+                        name: '部门考评配置',
+                    },
+                    {
+                        index: '/evaluationSystem/personnel',
+                        name: '人员考评配置',
+                    },
+                ]
+            },
+            {
+                index: '2',
+                name: '单位考评业务',
+                img: yewuImg,
+                children: [
+                    {
+                        index: '/assessment/evaluationStart',
+                        name: '单位考评目标启动',
+                    },
+                    {
+                        index: '/assessment/evaluationAmendment',
+                        name: '单位考评目标修订',
+                    },
+                    {
+                        index: '/assessment/evaluationMonth',
+                        name: '单位月度考评'
+                    },
+                    {
+                        index: '/assessment/evaluationQuarter',
+                        name: '单位季度考评'
+                    },
+                    {
+                        index: '/assessment/evaluationYear',
+                        name: '单位年度考评'
+                    },
+                    {
+                        index: '/assessment/evaluationBenchmarkingIndic',
+                        name: '考评对标分析'
+                    },
+                    {
+                        index: '/assessment/evaluationWarning',
+                        name: '考评预警'
+                    },
+                    {
+                        index: '',
+                        name: '单位考评评级'
+                    },
+                    {
+                        index: '',
+                        name: '考评监督管理'
+                    },
+                    {
+                        index: '/assessment/evaluationReport',
+                        name: '考评报告'
+                    },
+                    {
+                        index: '',
+                        name: '单位考核结果应用'
+                    }
+                ]
+            },
+            {
+                index: '3',
+                name: '本部考评业务',
+                img: benbuImg,
+                children: [
+                    {
+                        index: '/assessment/evaluationDeptStart',
+                        name: '业绩指标计划',
+                    },
+                    {
+                        index: '/assessment/evaluationDeptBusiness',
+                        name: '业绩指标考评'
+                    },
+                    {
+                        index: '/assessment/evaluationDeptRating',
+                        name: '部门考评评级'
+                    },
+                    {
+                        index: '/assessment/assessmentApplication',
+                        name: '绩效结果考核申报'
+                    }
+                ]
+            },
+            {
+                index: '5',
+                name: '基础信息配置',
+                img: quanxianImg,
+                children: [
+                    {
+                        index: '',
+                        href: '',
+                        name: '人员权限配置',
+                    },
+                    {
+                        index: '',
+                        name: '工作流程配置',
+                    }
+                ]
+            },
+            {
+                index: '6',
+                name: '对标考评知识库',
+                img: zhishikuImg,
+                children: [
+                    {
+                        index: '/evaluationknowledge/scoringRules',
+                        name: '考评得分规则',
+                    },
+                    {
+                        name: '考评评级规则',
+                    },
+                    {
+                        index: '/evaluationknowledge/earlyWarningRule',
+                        name: '考评预警规则',
+                    }
+                ]
+            },
+        ]
         if (window.sessionStorage.getItem('routeTags')) {
             this.routeTags = JSON.parse(window.sessionStorage.getItem('routeTags'))
             if (this.$route?.path === '/') {