Home Explore Help
Register Sign In
yixue
/
yixue_gzh_web
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

0812 19:49

22285461@qq.com 3 months ago
parent
27c30a3108
commit
81a9d7ee93
7 changed files with 32 additions and 11 deletions
Unified View Show Diff Stats
  1. 0 0
      dist/assets/index-CZwqv-Q5.css
  2. 0 0
      dist/assets/index-YjwAygK8.js
  3. 2 2
      dist/index.html
  4. 5 2
      src/DataCenter.ts
  5. 20 1
      src/components/customer/BaseInfo.vue
  6. 3 4
      src/components/customer/zhen_duan/GaoNengZhenDuan.vue
  7. 2 2
      src/customer/APICenter.ts

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-CZwqv-Q5.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-YjwAygK8.js


+ 2 - 2
dist/index.html
View File 

@@ -5,8 +5,8 @@
 
     <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
 
     <link rel="icon" type="image/svg+xml" href="/vite.svg"/>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"/>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"/>
 
     <title>桢禧文化</title>
 
     <title>桢禧文化</title>
 
-  <script type="module" crossorigin src="/assets/index-Dw3TePmX.js"></script>
 
-  <link rel="stylesheet" crossorigin href="/assets/index-TJPQTzOJ.css">
 
+  <script type="module" crossorigin src="/assets/index-YjwAygK8.js"></script>
 
+  <link rel="stylesheet" crossorigin href="/assets/index-CZwqv-Q5.css">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <div id="app"></div>
 
 <div id="app"></div>

+ 5 - 2
src/DataCenter.ts
View File 

@@ -14,6 +14,7 @@ import {
 
 import {ref} from "vue";
 
 import {ref} from "vue";
 
 import {QuShiLogic} from "./customer/QuShiLogic.ts";
 
 import {QuShiLogic} from "./customer/QuShiLogic.ts";
 
 import {RiYunShiLogic} from "./customer/RiYunShiLogic.ts";
 
 import {RiYunShiLogic} from "./customer/RiYunShiLogic.ts";
 
+import {Tools} from "./Tools.ts";
 
 
 
 export namespace DataCenter {
 
 export namespace DataCenter {
 
 
 
@@ -61,14 +62,16 @@ export namespace DataCenter {
 
 
 
     export let lastKeyInGeJu = ref(null)
 
     export let lastKeyInGeJu = ref(null)
 
 
 
-    export let owernId = 99
 
-
 
     export let ownerUsers = ref<UserInfo[]>([])
 
     export let ownerUsers = ref<UserInfo[]>([])
 
 
 
     export let historyUser = ref<UserInfo[]>([])
 
     export let historyUser = ref<UserInfo[]>([])
 
 
 
     export let historyBaZi = ref<BaZi[]>([])
 
     export let historyBaZi = ref<BaZi[]>([])
 
 
 
+    export function getOwnerId() {
 
+        return Tools.getCookie("yx_uid")
 
+    }
 
+
 
     export function addAreaData(data: LocalModels.Area) {
 
     export function addAreaData(data: LocalModels.Area) {
 
         let key1 = data.sheng
 
         let key1 = data.sheng
 
         if (!shengShi.has(key1)) {
 
         if (!shengShi.has(key1)) {

+ 20 - 1
src/components/customer/BaseInfo.vue
View File 

@@ -184,7 +184,7 @@ function createUserInfo() {
 
   info.name = userName.value.trim()
 
   info.name = userName.value.trim()
 
   info.dateMode = dateMode.value
 
   info.dateMode = dateMode.value
 
   info.extra = extraInfo.value.trim()
 
   info.extra = extraInfo.value.trim()
 
-  info.owner_id = DataCenter.owernId
 
+  info.owner_id = DataCenter.getOwnerId()
 
   info.fillData(DataCenter.bazi.value)
 
   info.fillData(DataCenter.bazi.value)
 
   return info
 
   return info
 
 }
 
 }
 
@@ -226,6 +226,25 @@ function onSelectLastUser() {
 
 function loginOut() {
 
 function loginOut() {
 
   Tools.removeCookie("yx_uname")
 
   Tools.removeCookie("yx_uname")
 
   Tools.removeCookie("yx_token")
 
   Tools.removeCookie("yx_token")
 
+  DataCenter.bazi.value = null
 
+  DataCenter.historyBaZi.value = []
 
+  DataCenter.historyUser.value = []
 
+  DataCenter.ownerUsers.value = []
 
+  DataCenter.lastKeyInGeJu.value = null
 
+  DataCenter.selectedLiuNianInGeJu.value = null
 
+  DataCenter.selectedDaYunInGeJu.value = null
 
+  DataCenter.includeDaYunInGeJu.value = false
 
+  DataCenter.includeLiuNianInGeJu.value = false
 
+  DataCenter.powerMode.value = 1
 
+  DataCenter.dayunIndex.value = null
 
+  DataCenter.curDaYun.value = null
 
+  DataCenter.liunianIndex.value = null
 
+  DataCenter.curLiuNianList.value = []
 
+  DataCenter.curLiuNian.value = null
 
+  DataCenter.liuyueIndex.value = null
 
+  DataCenter.curLiuYue.value = null
 
+  DataCenter.liuriIndex.value = null
 
+  DataCenter.curLiuRi.value = null
 
   router.push({name: "login"})
 
   router.push({name: "login"})
 
 }
 
 }
 
 </script>
 
 </script>

+ 3 - 4
src/components/customer/zhen_duan/GaoNengZhenDuan.vue
View File 

@@ -5,11 +5,10 @@ import {DataCenter} from "../../../DataCenter.ts";
 
 let getGaoNengTexts = computed(function () {
 
 let getGaoNengTexts = computed(function () {
 
   let result = []
 
   let result = []
 
   if (DataCenter.bazi.value != null) {
 
   if (DataCenter.bazi.value != null) {
 
-    let ks = DataCenter.bazi.value.zhenduan.gaoneng.keys()
 
-    let key = null
 
-    while ((key = ks.next()) != null) {
 
+    //@ts-ignore
 
+    DataCenter.bazi.value.zhenduan.gaoneng.forEach(function (value, key) {
 
       result.push(key)
 
       result.push(key)
 
-    }
 
+    })
 
   }
 
   }
 
   return result
 
   return result
 
 })
 
 })

+ 2 - 2
src/customer/APICenter.ts
View File 

@@ -202,7 +202,7 @@ export namespace APICenter {
 
 
 
     export function loadUsers(cb: () => void) {
 
     export function loadUsers(cb: () => void) {
 
         let request = new LoadUserRequest()
 
         let request = new LoadUserRequest()
 
-        request.owner_id = DataCenter.owernId
 
+        request.owner_id = DataCenter.getOwnerId()
 
         post(getServerUrl() + "loadUser", beanToObject(request), function (response: string) {
 
         post(getServerUrl() + "loadUser", beanToObject(request), function (response: string) {
 
             try {
 
             try {
 
                 let obj = JSON.parse(response)
 
                 let obj = JSON.parse(response)
 
@@ -224,7 +224,7 @@ export namespace APICenter {
 
 
 
     export function deleteUser(id: number) {
 
     export function deleteUser(id: number) {
 
         let request = new DeleteUserRequest()
 
         let request = new DeleteUserRequest()
 
-        request.owner_id = DataCenter.owernId
 
+        request.owner_id = DataCenter.getOwnerId()
 
         request.user_id = id
 
         request.user_id = id
 
         post(getServerUrl() + "deleteUser", beanToObject(request), function (response: string) {
 
         post(getServerUrl() + "deleteUser", beanToObject(request), function (response: string) {
 
             try {
 
             try {

Some files were not shown because too many files changed in this diff