单点登录修改、login页面闪屏修复

public/index.html

@@ -18,6 +18,7 @@
             height: 100%;
             margin: 0px;
             padding: 0px;
+            background-color: #7171C6;
         }
         
         .chromeframe {

src/api/login.js

@@ -18,9 +18,9 @@ export function login(username, password, code, uuid) {
 // 登录方法(ERP)
 export function loginERP(data) {
   return request({
-    url: '/loginByCenterId',
-    method: 'get',
-    params: data
+    url: '/loginByCenter',
+    method: 'post',
+    data
   })
 }
 

src/store/modules/user.js

@@ -49,9 +49,9 @@ const user = {
         // 登录PER
         LoginERP({ commit }, userInfo) {
             return new Promise((resolve, reject) => {
-                loginERP({centerId:userInfo.id}).then(res => {
-                    setToken(res.data)
-                    commit('SET_TOKEN', res.data)
+                loginERP({username:userInfo.username,password:userInfo.password}).then(res => {
+                    setToken(res.data.token)
+                    commit('SET_TOKEN', res.data.token)
                     resolve()
                 }).catch(error => {
                     reject(error)

src/utils/request.js

@@ -52,7 +52,6 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    console.log(res)
         // 未设置状态码则默认成功状态
         const code = res.data.status;
         // 获取错误信息

src/views/login.vue

@@ -40,7 +40,7 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;" @change="memory">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
@@ -128,12 +128,10 @@ export default {
   methods: {
     getUrl(){
       let url = this.$route.query
-      if(url.id && url.name){
-        let data = {id:url.id,name:url.name}
+      if(url.redirect && url.password){
+        let data = {username:url.redirect.split("username=")[1],password:url.password}
         this.handleLoginERP(data)
       }else{
-        this.erp = true
-        this.ERPloading = false
         this.getCode();
         this.getCookie();
       }
@@ -152,6 +150,11 @@ export default {
         if (this.captchaOnOff) {
           this.codeUrl = "data:image/gif;base64," + res.data.img;
           this.loginForm.uuid = res.data.uuid;
+          this.erp = true
+          setTimeout(()=>{
+            this.ERPloading = false
+          },)
+          
         }
       });
     },
@@ -165,19 +168,21 @@ export default {
         rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
       };
     },
+    memory(){
+      if (this.loginForm.rememberMe) {
+        Cookies.set("username314", this.loginForm.username, { expires: 30 });
+        Cookies.set("password314", encrypt(this.loginForm.password), { expires: 30 });
+        Cookies.set('rememberMe314', this.loginForm.rememberMe, { expires: 30 });
+      } else {
+        Cookies.remove("username314");
+        Cookies.remove("password314");
+        Cookies.remove('rememberMe314');
+      }
+    },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username314", this.loginForm.username, { expires: 30 });
-            Cookies.set("password314", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe314', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username314");
-            Cookies.remove("password314");
-            Cookies.remove('rememberMe314');
-          }
           this.$store.dispatch("Login", this.loginForm).then((res) => {
             this.$router.push({ path: "/index"}).catch(()=>{});
           }).catch(() => {
@@ -190,13 +195,10 @@ export default {
       });
     },
     handleLoginERP(data) {//erp登录
-      Cookies.set("username20220313", data.name);
       this.$store.dispatch("LoginERP", data).then((res) => {
-        console.log(res)
         this.$router.push({ path: "/index"}).catch(()=>{});
       }).catch((err) => {
-        console.log(err)
-        location.href = '/deviceManager/#/';
+        location.href = '/vuedx/#/';
       });
     }
   }
@@ -244,6 +246,7 @@ export default {
   height: 100%;
   // background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
+  
 }
 .title {
   margin: 0px auto 30px auto;
@@ -308,177 +311,16 @@ export default {
   line-height: 36px !important;
 }
 
-body,html{
-  width:100%;
-  height:100%;
-  background: #7171C6;
+</style>
+
+<style>
+html,
+body,
+#app {
+    height: 100%;
+    margin: 0px;
+    padding: 0px;
+    background-color: transparent !important;
+    
 }
-        
-        #loader-wrapper {
-            position: fixed;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            z-index: 999999;
-        }
-        
-        #loader {
-            display: block;
-            position: relative;
-            left: 50%;
-            top: 50%;
-            width: 150px;
-            height: 150px;
-            margin: -75px 0 0 -75px;
-            border-radius: 50%;
-            border: 3px solid transparent;
-            border-top-color: #FFF;
-            -webkit-animation: spin 2s linear infinite;
-            -ms-animation: spin 2s linear infinite;
-            -moz-animation: spin 2s linear infinite;
-            -o-animation: spin 2s linear infinite;
-            animation: spin 2s linear infinite;
-            z-index: 1001;
-        }
-        
-        #loader:before {
-            content: "";
-            position: absolute;
-            top: 5px;
-            left: 5px;
-            right: 5px;
-            bottom: 5px;
-            border-radius: 50%;
-            border: 3px solid transparent;
-            border-top-color: #FFF;
-            -webkit-animation: spin 3s linear infinite;
-            -moz-animation: spin 3s linear infinite;
-            -o-animation: spin 3s linear infinite;
-            -ms-animation: spin 3s linear infinite;
-            animation: spin 3s linear infinite;
-        }
-        
-        #loader:after {
-            content: "";
-            position: absolute;
-            top: 15px;
-            left: 15px;
-            right: 15px;
-            bottom: 15px;
-            border-radius: 50%;
-            border: 3px solid transparent;
-            border-top-color: #FFF;
-            -moz-animation: spin 1.5s linear infinite;
-            -o-animation: spin 1.5s linear infinite;
-            -ms-animation: spin 1.5s linear infinite;
-            -webkit-animation: spin 1.5s linear infinite;
-            animation: spin 1.5s linear infinite;
-        }
-        
-        @-webkit-keyframes spin {
-            0% {
-                -webkit-transform: rotate(0deg);
-                -ms-transform: rotate(0deg);
-                transform: rotate(0deg);
-            }
-            100% {
-                -webkit-transform: rotate(360deg);
-                -ms-transform: rotate(360deg);
-                transform: rotate(360deg);
-            }
-        }
-        
-        @keyframes spin {
-            0% {
-                -webkit-transform: rotate(0deg);
-                -ms-transform: rotate(0deg);
-                transform: rotate(0deg);
-            }
-            100% {
-                -webkit-transform: rotate(360deg);
-                -ms-transform: rotate(360deg);
-                transform: rotate(360deg);
-            }
-        }
-        
-        #loader-wrapper .loader-section {
-            position: fixed;
-            top: 0;
-            width: 51%;
-            height: 100%;
-            background: #7171C6;
-            z-index: 1000;
-            -webkit-transform: translateX(0);
-            -ms-transform: translateX(0);
-            transform: translateX(0);
-        }
-        
-        #loader-wrapper .loader-section.section-left {
-            left: 0;
-        }
-        
-        #loader-wrapper .loader-section.section-right {
-            right: 0;
-        }
-        
-        .loaded #loader-wrapper .loader-section.section-left {
-            -webkit-transform: translateX(-100%);
-            -ms-transform: translateX(-100%);
-            transform: translateX(-100%);
-            -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-            transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-        }
-        
-        .loaded #loader-wrapper .loader-section.section-right {
-            -webkit-transform: translateX(100%);
-            -ms-transform: translateX(100%);
-            transform: translateX(100%);
-            -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-            transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-        }
-        
-        .loaded #loader {
-            opacity: 0;
-            -webkit-transition: all 0.3s ease-out;
-            transition: all 0.3s ease-out;
-        }
-        
-        .loaded #loader-wrapper {
-            visibility: hidden;
-            -webkit-transform: translateY(-100%);
-            -ms-transform: translateY(-100%);
-            transform: translateY(-100%);
-            -webkit-transition: all 0.3s 1s ease-out;
-            transition: all 0.3s 1s ease-out;
-        }
-        
-        .no-js #loader-wrapper {
-            display: none;
-        }
-        
-        .no-js h1 {
-            color: #222222;
-        }
-        
-        #loader-wrapper .load_title {
-            font-family: 'Open Sans';
-            color: #FFF;
-            font-size: 19px;
-            width: 100%;
-            text-align: center;
-            z-index: 9999999999999;
-            position: absolute;
-            top: 60%;
-            opacity: 1;
-            line-height: 30px;
-        }
-        
-        #loader-wrapper .load_title span {
-            font-weight: normal;
-            font-style: italic;
-            font-size: 13px;
-            color: #FFF;
-            opacity: 0.5;
-        }
 </style>

src/views/recharge/detailed/index.vue

@@ -263,7 +263,7 @@ export default {
       this.exportLoading = true;
       exportDetail(queryParams).then(response =>{
         this.exportLoading = false;
-        localStorage.setItem('fileExportId', response.msg)
+        localStorage.setItem('fileExportId', response.data)
         this.$router.push({path:'/recharge/fileExport'})
       })
       // this.$confirm('是否确认导出数据?', "警告", {

src/views/recharge/reportForm/index.vue

@@ -129,7 +129,7 @@ export default {
       this.exportLoading = true;
       exportReport(queryParams).then(response =>{
         this.exportLoading = false;
-        localStorage.setItem('fileExportId', response.msg)
+        localStorage.setItem('fileExportId', response.data)
         this.$router.push({path:'/recharge/fileExport'})
       })
 

src/views/system/dept/index.vue

@@ -43,16 +43,17 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="deptName" label="部门名称" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="orderNum" label="排序" ></el-table-column>
+      <!-- <el-table-column prop="orderNum" label="排序" ></el-table-column> -->
       <el-table-column prop="status" label="状态" :formatter="statusFormat" ></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip>
+      <!-- <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" width="250" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            disabled
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -60,6 +61,7 @@
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
+            disabled
             size="mini"
             type="text"
             icon="el-icon-plus"
@@ -67,6 +69,7 @@
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
+           disabled
             v-if="scope.row.parentId != 0"
             size="mini"
             type="text"