From c0a3ebe495832d7c438fe6ae757ef9afaa789c40 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sat, 11 May 2024 02:35:05 +0800
Subject: [PATCH] login seo

---
 src/api/api.js                               | 13 +++++++-
 src/api/request.js                           | 14 ++++++++-
 src/components/doctorCheck/CheckItemList.vue |  4 +--
 src/store/index.js                           | 15 ++++-----
 src/views/Home.vue                           | 15 +++++----
 src/views/login/Login.vue                    | 32 +++++++++++++++-----
 6 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index dc22c34..20ed9cf 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1,6 +1,17 @@
 import request from "@/api/request";
+import store from "../store/index";
 
-const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
+const sysConfig = getSysConfig()
+
+function getSysConfig(){
+    console.log('store',store.state.sysConfig)
+    if(store.state.sysConfig && store.state.sysConfig.apiurl){
+        window.sessionStorage.setItem('sysConfig', JSON.stringify(store.state.sysConfig))
+        return store.state.sysConfig
+    }else{
+        return JSON.parse(window.sessionStorage.getItem('sysConfig')) 
+    }
+}
 
 export async function getapi(url, params = {}, config) {
     return new Promise((resolve, reject) => {
diff --git a/src/api/request.js b/src/api/request.js
index 67de3a3..32f0efb 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -4,8 +4,20 @@ import axios from "axios";
 // import Promise from 'promise'
 import { yztoken } from "@/utlis/istoken";
 import { Message, Loading } from "element-ui";
+import store from "../store/index";
 
-const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
+
+const sysConfig = getSysConfig()
+
+function getSysConfig(){
+    console.log('store',store.state.sysConfig)
+    if(store.state.sysConfig && store.state.sysConfig.apiurl){
+        window.sessionStorage.setItem('sysConfig', JSON.stringify(store.state.sysConfig))
+        return store.state.sysConfig
+    }else{
+        return JSON.parse(window.sessionStorage.getItem('sysConfig')) 
+    }
+}
 
 const instance = axios.create({
     baseURL: sysConfig.apiurl,
diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index accba78..d8ce4f8 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -18,8 +18,8 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="unit" label="单位" width="80" align="center" />
-      <el-table-column prop="referenceRangeValue" label="参考范围" width="80" align="center" />
+      <el-table-column prop="unit" label="单位" width="90" align="center" />
+      <el-table-column prop="referenceRangeValue" label="参考范围" width="120" align="center" />
       <el-table-column prop="resultStatusId" label="提示" width="40" align="center">
         <template slot-scope="scope">
           <div>{{ dddw(resultStatus, 'id', scope.row.resultStatusId, 'dataInputPrompt') }}</div>
diff --git a/src/store/index.js b/src/store/index.js
index b2ed906..006212d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,6 +7,7 @@ Vue.use(Vuex);
 
 export default new Vuex.Store({
     state: {
+        sysConfig: { apiurl: '' }, // 
         changepassword: '', //用户密码
         set: "qqqq",
         importexcel: {
@@ -262,7 +263,7 @@ export default new Vuex.Store({
                 { id: "1", displayName: "换行" },
                 { id: "2", displayName: "继承项目类别换行属性" },
             ],
-            qztlType:[
+            qztlType: [
                 { id: "0", displayName: "高原" },
                 { id: "1", displayName: "健康" }
             ],
@@ -320,7 +321,7 @@ export default new Vuex.Store({
                 sum_diagnosis: { S: 0, M: 0 }, // 总检诊断
 
                 sumDoctor: { S: 0, M: 0 }, // 总检--综述 触发强制刷新 （sumDoctor.M 合并包含：综述、建议、对比、历史等，不包含总检诊断）
-                
+
             },
             //表当前数据（单条记录 S--single）
             tableS: {
@@ -336,7 +337,7 @@ export default new Vuex.Store({
                 charge: { id: '' }, // 收费
                 menu_info: { id: '' }, // 菜单与页面
                 lis_request: { id: '' }, // 检验申请（条码）
-                patient_register: { id: '', patientRegisterNo: ''},   // 体检人员记录
+                patient_register: { id: '', patientRegisterNo: '' },   // 体检人员记录
                 register_check_asbitem: { id: '' },   // 体检人员登记的项目（合并前）
                 register_check: { id: '' },     // 体检人员登记的项目（合并后）
                 register_check_item: { id: '' }, // 体检人员登记的明细项目
@@ -364,13 +365,13 @@ export default new Vuex.Store({
                 role_menu_info: [], // 角色对应的菜单
                 sum_diagnosis: [], // 总检诊断
             },
-            plus: {  
-                PatientRegisterEditQuery:0,         // 更新查询条件        
+            plus: {
+                PatientRegisterEditQuery: 0,         // 更新查询条件        
                 clearPatientRegisterQuery: 0,       // 清空人员登记界面查询条件(重新赋值体检单位)
                 PatientRegisterEditGroupBatch: 0,   // 刷新批量调整分组窗口
                 PatientRegisterEditItemBatch: 0,    // 刷新批量调整项目窗口
-                PatientRegisterForChoose:0,         // 体检人员查询窗口  
-                              
+                PatientRegisterForChoose: 0,         // 体检人员查询窗口  
+
             }
 
         },
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 67c537b..5c1aa99 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -217,11 +217,7 @@ export default {
     this.password = this.changepassword;
     // console.log(this.password);
     // console.log(this.$store.state.changepassword, "ssssssssssss");
-    this.user = window.sessionStorage.getItem("user");
-
-    //获取当前用户的菜单权限
-    this.getUserAllPriv();
-    // this.getUserMenuPriv();
+    this.user = window.sessionStorage.getItem("user");    
 
     this.LocalConfigInit = deepCopy(this.LocalConfig)
     let LocalConfig = window.localStorage.getItem("LocalConfig") || null
@@ -231,6 +227,13 @@ export default {
       console.log('window.localStorage.getItem("LocalConfig")', error)
     }
   },
+  
+  mounted() {
+    //获取当前用户的菜单权限
+    this.getUserAllPriv();
+    // this.getUserMenuPriv();
+  },
+
   methods: {
     // 菜单操作
     handleSelect(key, keyPath) {
@@ -399,7 +402,7 @@ export default {
       this.$peisAPI.windowClose();
     },
   },
-  components: { router },
+  // components: { router },
 };
 </script>
 <style scoped>
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 86da7c6..074ea92 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -59,16 +59,15 @@
   </div>
 </template>
 <script>
-
 import { writetoken } from "@/utlis/istoken";
 import { deepCopy } from "@/utlis/proFunc";
 import axios from "axios";
 import { Loading } from "element-ui";
+import { mapState,mapMutations } from "vuex";
 
 export default {
   data() {
-    return {
-      sysConfig: {}, // 配置信息
+    return {      
       form: {
         Username: "",
         Password: "",
@@ -91,7 +90,15 @@ export default {
       LocalConfigInit: {}
     };
   },
+  
   created() {
+    
+  },
+
+  
+
+  async mounted() {
+
     this.LocalConfigInit = deepCopy(this.LocalConfig)
     let LocalConfig = window.localStorage.getItem("LocalConfig") || null
     try {
@@ -99,8 +106,7 @@ export default {
     } catch (error) {
       console.log('window.localStorage.getItem("LocalConfig")', error)
     }
-  },
-  async mounted() {
+
     if (this.$peisAPI) {
       this.$peisAPI.lazyLoadMenuContrl()
         .then(res => {
@@ -112,15 +118,25 @@ export default {
     } else {
       console.log('this.$peisAPI undefind')
     }
+
+    // console.log("this.sysConfig",this.sysConfig)
     await this.getSysConfig()
+    // console.log("this.sysConfig2",this.sysConfig)
   },
+
+  computed: {
+    ...mapState(['sysConfig']),
+  },
+
   methods: {
+    ...mapMutations(["setData"]),
     async getSysConfig() {
       try {
         let res = await axios.get('/sysConfig.json', { timeout: 50000 }) // , { timeout: 50000 }
         console.log('axios.get /sysConfig.json', res)
         if (!res.data.apiurl) this.$message.error({ showClose: true, message: `获取配置参数错误，请重新刷新本页面！` })
-        this.sysConfig = res.data
+        this.setData({ key: "sysConfig", value: res.data });
+        // this.sysConfig = res.data
         window.sessionStorage.setItem('sysConfig', JSON.stringify(res.data))
       } catch (error) {
         this.$message.error({ showClose: true, message: `获取配置参数错误 ${error}` })
@@ -178,8 +194,10 @@ export default {
             userName: this.form.Username,
             passWord: this.form.Password,
           }).then(ret => {
+            console.log('api/identity/users/login',ret)
             let res = ret.data
-            if (res.code != -1) {
+
+            if (res.code > -1) {
 
               window.sessionStorage.setItem("peisid", res.data.peisid); //设置当前人员所属体检中心
               writetoken(res.data.expires_in);