常规提交

src/api/permission.js

@@ -12,22 +12,23 @@ router.beforeEach((to, from, next) => {
     // if (to.query.markKey === "YXSSO") {
     //     return next()
     // } else {
-    //     let token = getToken()
-    //     if(to.path==='/login'){
-    //         return next()
-    //     }else{
-    //         if(!token){
-    //             ElMessage.error('登录已失效，请重新登录');
-    //             store.commit('clearAxiosArr')
-    //             return next('/login')
-    //         } else if (to.path==='/') {
-    //             store.commit('clearAxiosArr')
-    //             return next('/login')
-    //         } else{
-    //             store.commit('clearAxiosArr')
-    //             next()
-    //         }
-    //     }
+        // let token = getToken()
+        let userMsg = getToken('userMsg')
+        if(to.path==='/login'){
+            return next()
+        }else{
+            if(!userMsg){
+                ElMessage.error('登录已失效，请重新登录');
+                store.commit('clearAxiosArr')
+                return next('/login')
+            } else if (to.path==='/') {
+                store.commit('clearAxiosArr')
+                return next('/login')
+            } else{
+                store.commit('clearAxiosArr')
+                next()
+            }
+        }
     // }
     return next()
 })

src/components/gatewayPage.vue

@@ -24,21 +24,34 @@
 
                     </div>
                     <div class="bot_leftMain">
-                        
+
                     </div>
                 </div>
             </el-col>
-            <el-col :span="12" class="gateway_bot_right">
-                <p>年度评级公示栏：</p>
-                <el-table :data="tableData" style="width: 100%">
-                    <el-table-column type="index" label="序号" width="50" />
-                    <el-table-column prop="name" label="公告标题" width="300" />
-                    <el-table-column prop="address" label="发布部门" />
-                    <el-table-column prop="address" label="发布日期" />
-                </el-table>
+            <el-col :span="12">
+                <div class="gateway_bot_center">
+                    <div class="bot_Tit">
+                        <p>考评排行榜</p>
+
+                    </div>
+                    <el-table :data="tableData" style="width: 100%">
+                        <el-table-column type="index" label="序号" width="50" />
+                        <el-table-column prop="name" label="公告标题" width="300" />
+                        <el-table-column prop="address" label="发布部门" />
+                        <el-table-column prop="address" label="发布日期" />
+                    </el-table>
+                </div>
             </el-col>
-            <el-col :span="6" class="gateway_bot_left">
-                <p>任务完成排行榜：</p>
+            <el-col :span="6">
+                <div class="gateway_bot_right">
+                    <div class="bot_leftTit">
+                        <p>通告栏</p>
+
+                    </div>
+                    <div class="bot_leftMain">
+
+                    </div>
+                </div>
             </el-col>
         </el-row>
     </div>
@@ -173,6 +186,26 @@ export default {
                 color: #3B7AD1;
             }
         }
+        .gateway_bot_center{
+            background: #fff;
+            margin-right: 33px;
+            p{
+                font-size: 18px;
+                font-family: Microsoft YaHei;
+                font-weight: bold;
+                color: #3B7AD1;
+            }
+        }
+        .gateway_bot_right{
+            background: #fff;
+            width: 92%;
+            p{
+                font-size: 18px;
+                font-family: Microsoft YaHei;
+                font-weight: bold;
+                color: #3B7AD1;
+            }
+        }
     }
 }
 </style>

src/request/index.js

@@ -8,7 +8,7 @@ const baseUrl = require('../utils/baseUrl.js')
 // 创建一个 axios 实例
 // const token = getToken() ? getToken() : window.sessionStorage.getItem('token')
 const service = axios.create({
-    // baseURL: '/api/', // 所有的请求地址前缀部分
+    // baseURL: process.env.VUE_APP_BASE_API, // 所有的请求地址前缀部分
     baseURL: process.env.NODE_ENV === "production" ? baseUrl.ROOT : baseUrl.ROOT, // 所有的请求地址前缀部分
     timeout: 60000, // 请求超时时间毫秒
     // withCredentials: true, // 异步请求携带cookie

src/views/Login.vue

@@ -31,8 +31,7 @@
 <script>
 import { setToken } from '@/api/auth'
 import { ElMessage } from "element-plus";
-import { toLoginApi } from '../api/api'
-import md5 from 'js-md5'
+import { loginApi } from '../api/api'
 export default {
     data() {
         return {
@@ -47,20 +46,6 @@ export default {
     created() {
     },
     methods:{
-        getLogin() {
-            this.$axios({
-                method: 'post',
-                baseURL: '/apisc/',
-                // url: '/api/ims-idas/oauth/tokenWrapper?tenantId=000000&username='+this.inputUser+'&password='+md5(this.inputMima)+'&grant_type=password&scope=all&type=',
-                // headers: {
-                //     'Authorization': 'Basic c2FiZXI6NWMwMmMzZDViNzYxNTNkZGM5ZTczYzc5YzMzNzYzODAxNmE5ZDM2Ng==',
-                //     'Tenant-Id': '000000'
-                // }
-                url: 'predict/api/ppc/panoramicPower'
-            }).then(datas =>{
-
-            })
-        },
         handleLogin() {
             if (this.loginText === this.$utils.strChangeCase(this.inputYanzhengma, 5)) {
                 if (this.inputUser && this.inputMima) {
@@ -77,34 +62,36 @@ export default {
             }
         },
         //登录接口
-        toLogin(name, pass) {
+        getLogin() {
             let params={
-                username: name,
-                password:pass
+                username: this.inputUser,
+                password: this.inputMima
             }
-            toLoginApi(params).then(datas=>{
-                if (datas && datas.code === 0) {
-                    this.loading = false
-                    setToken(datas.token)
-                    let userObj = {
-                        role: '',
-                        userId: datas.id
-                    }
-                    if (datas.role === '0' || datas.role === '1') {
-                        userObj.role = 'administrators'
-                        window.sessionStorage.setItem('userMessage', JSON.stringify(userObj))
-                    } else {
-                        userObj.role = 'ordinaryUser'
-                        window.sessionStorage.setItem('userMessage', JSON.stringify(userObj))
-                    }
-                    this.$router.push({ path: "/index"})
-                } else {
-                    ElMessage.error(datas.msg);
-                }
-            }).catch(e =>{
-                this.loading = false
-                window.location.reload();
-            })
+            setToken('userMsg', params)
+            this.$router.push({ path: "/home"})
+            // loginApi(params).then(datas=>{
+            //     if (datas && datas.code === 0) {
+            //         this.loading = false
+            //         setToken('token', datas.token)
+            //         let userObj = {
+            //             role: '',
+            //             userId: datas.id
+            //         }
+            //         if (datas.role === '0' || datas.role === '1') {
+            //             userObj.role = 'administrators'
+            //             window.sessionStorage.setItem('userMessage', JSON.stringify(userObj))
+            //         } else {
+            //             userObj.role = 'ordinaryUser'
+            //             window.sessionStorage.setItem('userMessage', JSON.stringify(userObj))
+            //         }
+            //         this.$router.push({ path: "/index"})
+            //     } else {
+            //         ElMessage.error(datas.msg);
+            //     }
+            // }).catch(e =>{
+            //     this.loading = false
+            //     // window.location.reload();
+            // })
         }
     }
 }

vue.config.js

@@ -38,10 +38,13 @@ module.exports = defineConfig({
         //     '/api': {
         //         target: 'http://123.60.219.66:28800',
         //         // target: 'http://10.65.78.23:28800',
-        //         pathRewrite: { '^/api': '' },
+        //         changeOrigin: true,
+        //         // pathRewrite: { '^/api/': '' },
+        //         rewrite: (path) => path.replace(/^\/api/, '')
         //     },
         //     '/login-api': {
         //         target: 'http://10.65.78.23:81',
+        //         changeOrigin: true,
         //         pathRewrite: { '^/login-api': '' },
         //     },
         // }