feat: 业务和项目标签名称统一从接口取

chore: 修改开发环境协议
fix: 修改代理接口
2024-10-29 17:04:52 +08:00 · 2024-04-01 12:19:38 +08:00 · 2024-03-14 14:05:43 +08:00
3 changed files with 82 additions and 35 deletions
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -1,4 +1,4 @@
-lockfileVersion: 5.3
+lockfileVersion: 5.4

 specifiers:
  '@ant-design/icons-vue': ^6.0.1
@ -76,8 +76,8 @@ devDependencies:
  '@types/qs': 6.9.7
  '@vitejs/plugin-vue': 2.2.0_vite@2.8.3+vue@3.2.31
  '@vitejs/plugin-vue-jsx': 1.3.7
-  '@vue/eslint-config-prettier': 7.0.0_eslint@8.9.0+prettier@2.5.1
-  '@vue/eslint-config-typescript': 10.0.0_cd100ca74b8c3cfb64acbb3ff997764b
+  '@vue/eslint-config-prettier': 7.0.0_o3yyxvqqntu2psyhklvnrymevm
+  '@vue/eslint-config-typescript': 10.0.0_zuiazj2lrq6pwzfmxm77tf3wjm
  '@vue/tsconfig': 0.1.3_@types+node@16.11.25
  eslint: 8.9.0
  eslint-plugin-vue: 8.4.1_eslint@8.9.0
@ -315,7 +315,6 @@ packages:
  /@babel/helper-validator-identifier/7.16.7:
    resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==}
    engines: {node: '>=6.9.0'}
-    dev: true

  /@babel/helper-validator-option/7.16.7:
    resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
@ -346,6 +345,8 @@ packages:
    resolution: {integrity: sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==}
    engines: {node: '>=6.0.0'}
    hasBin: true
+    dependencies:
+      '@babel/types': 7.17.0

  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.17.5:
    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
@ -429,7 +430,6 @@ packages:
    dependencies:
      '@babel/helper-validator-identifier': 7.16.7
      to-fast-properties: 2.0.0
-    dev: true

  /@commitlint/cli/11.0.0:
    resolution: {integrity: sha512-YWZWg1DuqqO5Zjh7vUOeSX76vm0FFyz4y0cpGMFhrhvUi5unc4IVfCXZ6337R9zxuBtmveiRuuhQqnRRer+13g==}
@ -691,8 +691,10 @@ packages:
      zen-observable:
        optional: true
    dependencies:
-      any-observable: 0.3.0
+      any-observable: 0.3.0_rxjs@6.6.7
      rxjs: 6.6.7
+    transitivePeerDependencies:
+      - zenObservable
    dev: true

  /@simonwep/pickr/1.8.2:
@ -758,7 +760,7 @@ packages:
    resolution: {integrity: sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==}
    dev: true

-  /@typescript-eslint/eslint-plugin/5.12.0_c467cf9bb49b295941e83ce479a578b7:
+  /@typescript-eslint/eslint-plugin/5.12.0_yrt47g5utmuvsqpihtshtjlyw4:
    resolution: {integrity: sha512-fwCMkDimwHVeIOKeBHiZhRUfJXU8n6xW1FL9diDxAyGAFvKcH4csy0v7twivOQdQdA0KC8TDr7GGRd3L4Lv0rQ==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -769,10 +771,10 @@ packages:
      typescript:
        optional: true
    dependencies:
-      '@typescript-eslint/parser': 5.12.0_eslint@8.9.0+typescript@4.5.5
+      '@typescript-eslint/parser': 5.12.0_fhzmdq77bspfhxkfuzq4fbrdsy
      '@typescript-eslint/scope-manager': 5.12.0
-      '@typescript-eslint/type-utils': 5.12.0_eslint@8.9.0+typescript@4.5.5
-      '@typescript-eslint/utils': 5.12.0_eslint@8.9.0+typescript@4.5.5
+      '@typescript-eslint/type-utils': 5.12.0_fhzmdq77bspfhxkfuzq4fbrdsy
+      '@typescript-eslint/utils': 5.12.0_fhzmdq77bspfhxkfuzq4fbrdsy
      debug: 4.3.3
      eslint: 8.9.0
      functional-red-black-tree: 1.0.1
@ -785,7 +787,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/parser/5.12.0_eslint@8.9.0+typescript@4.5.5:
+  /@typescript-eslint/parser/5.12.0_fhzmdq77bspfhxkfuzq4fbrdsy:
    resolution: {integrity: sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -813,7 +815,7 @@ packages:
      '@typescript-eslint/visitor-keys': 5.12.0
    dev: true

-  /@typescript-eslint/type-utils/5.12.0_eslint@8.9.0+typescript@4.5.5:
+  /@typescript-eslint/type-utils/5.12.0_fhzmdq77bspfhxkfuzq4fbrdsy:
    resolution: {integrity: sha512-9j9rli3zEBV+ae7rlbBOotJcI6zfc6SHFMdKI9M3Nc0sy458LJ79Os+TPWeBBL96J9/e36rdJOfCuyRSgFAA0Q==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -823,7 +825,7 @@ packages:
      typescript:
        optional: true
    dependencies:
-      '@typescript-eslint/utils': 5.12.0_eslint@8.9.0+typescript@4.5.5
+      '@typescript-eslint/utils': 5.12.0_fhzmdq77bspfhxkfuzq4fbrdsy
      debug: 4.3.3
      eslint: 8.9.0
      tsutils: 3.21.0_typescript@4.5.5
@ -858,7 +860,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/utils/5.12.0_eslint@8.9.0+typescript@4.5.5:
+  /@typescript-eslint/utils/5.12.0_fhzmdq77bspfhxkfuzq4fbrdsy:
    resolution: {integrity: sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -1019,20 +1021,18 @@ packages:
      magic-string: 0.25.7
      postcss: 8.4.6
      source-map: 0.6.1
-    dev: false

  /@vue/compiler-ssr/3.2.31:
    resolution: {integrity: sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==}
    dependencies:
      '@vue/compiler-dom': 3.2.31
      '@vue/shared': 3.2.31
-    dev: false

  /@vue/devtools-api/6.0.12:
    resolution: {integrity: sha512-iO/4FIezHKXhiDBdKySCvJVh8/mZPxHpiQrTy+PXVqJZgpTPTdHy4q8GXulaY+UKEagdkBb0onxNQZ0LNiqVhw==}
    dev: false

-  /@vue/eslint-config-prettier/7.0.0_eslint@8.9.0+prettier@2.5.1:
+  /@vue/eslint-config-prettier/7.0.0_o3yyxvqqntu2psyhklvnrymevm:
    resolution: {integrity: sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw==}
    peerDependencies:
      eslint: '>= 7.28.0'
@ -1040,25 +1040,29 @@ packages:
    dependencies:
      eslint: 8.9.0
      eslint-config-prettier: 8.3.0_eslint@8.9.0
-      eslint-plugin-prettier: 4.0.0_07b422646bb75d3db791621d4fdbc992
+      eslint-plugin-prettier: 4.0.0_a62cezdlw5ot3n4rmiou7w6jsi
      prettier: 2.5.1
    dev: true

-  /@vue/eslint-config-typescript/10.0.0_cd100ca74b8c3cfb64acbb3ff997764b:
+  /@vue/eslint-config-typescript/10.0.0_zuiazj2lrq6pwzfmxm77tf3wjm:
    resolution: {integrity: sha512-F94cL8ug3FaYXlCfU5/wiGjk1qeadmoBpRGAOBq+qre3Smdupa59dd6ZJrsfRODpsMPyTG7330juMDsUvpZ3Rw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
      eslint-plugin-vue: ^8.0.1
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
    dependencies:
-      '@typescript-eslint/eslint-plugin': 5.12.0_c467cf9bb49b295941e83ce479a578b7
-      '@typescript-eslint/parser': 5.12.0_eslint@8.9.0+typescript@4.5.5
+      '@typescript-eslint/eslint-plugin': 5.12.0_yrt47g5utmuvsqpihtshtjlyw4
+      '@typescript-eslint/parser': 5.12.0_fhzmdq77bspfhxkfuzq4fbrdsy
      eslint: 8.9.0
      eslint-plugin-vue: 8.4.1_eslint@8.9.0
+      typescript: 4.5.5
      vue-eslint-parser: 8.2.0_eslint@8.9.0
    transitivePeerDependencies:
      - supports-color
-      - typescript
    dev: true

  /@vue/reactivity-transform/3.2.31:
@ -1069,7 +1073,6 @@ packages:
      '@vue/shared': 3.2.31
      estree-walker: 2.0.2
      magic-string: 0.25.7
-    dev: false

  /@vue/reactivity/3.2.31:
    resolution: {integrity: sha512-HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw==}
@ -1081,7 +1084,6 @@ packages:
    dependencies:
      '@vue/reactivity': 3.2.31
      '@vue/shared': 3.2.31
-    dev: false

  /@vue/runtime-dom/3.2.31:
    resolution: {integrity: sha512-N+o0sICVLScUjfLG7u9u5XCjvmsexAiPt17GNnaWHJUfsKed5e85/A3SWgKxzlxx2SW/Hw7RQxzxbXez9PtY3g==}
@ -1089,7 +1091,6 @@ packages:
      '@vue/runtime-core': 3.2.31
      '@vue/shared': 3.2.31
      csstype: 2.6.19
-    dev: false

  /@vue/server-renderer/3.2.31_vue@3.2.31:
    resolution: {integrity: sha512-8CN3Zj2HyR2LQQBHZ61HexF5NReqngLT3oahyiVRfSSvak+oAvVmu8iNLSu6XR77Ili2AOpnAt1y8ywjjqtmkg==}
@ -1099,7 +1100,6 @@ packages:
      '@vue/compiler-ssr': 3.2.31
      '@vue/shared': 3.2.31
      vue: 3.2.31
-    dev: false

  /@vue/shared/3.2.31:
    resolution: {integrity: sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==}
@ -1247,9 +1247,19 @@ packages:
      warning: 4.0.3
    dev: false

-  /any-observable/0.3.0:
+  /any-observable/0.3.0_rxjs@6.6.7:
    resolution: {integrity: sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==}
    engines: {node: '>=6'}
+    peerDependencies:
+      rxjs: '*'
+      zenObservable: '*'
+    peerDependenciesMeta:
+      rxjs:
+        optional: true
+      zenObservable:
+        optional: true
+    dependencies:
+      rxjs: 6.6.7
    dev: true

  /anymatch/3.1.2:
@ -1422,6 +1432,8 @@ packages:
      snapdragon-node: 2.1.1
      split-string: 3.1.0
      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /braces/3.0.2:
@ -1753,8 +1765,8 @@ packages:
    engines: {node: '>=10'}
    hasBin: true
    dependencies:
-      is-text-path: 1.0.1
      JSONStream: 1.3.5
+      is-text-path: 1.0.1
      lodash: 4.17.21
      meow: 8.1.2
      split2: 3.2.2
@ -1867,7 +1879,6 @@ packages:

  /csstype/2.6.19:
    resolution: {integrity: sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==}
-    dev: false

  /dargs/7.0.0:
    resolution: {integrity: sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==}
@ -1884,12 +1895,22 @@ packages:

  /debug/2.6.9:
    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
    dependencies:
      ms: 2.0.0
    dev: true

  /debug/3.2.7:
    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
    dependencies:
      ms: 2.1.3
    dev: true
@ -2374,7 +2395,7 @@ packages:
      eslint: 8.9.0
    dev: true

-  /eslint-plugin-prettier/4.0.0_07b422646bb75d3db791621d4fdbc992:
+  /eslint-plugin-prettier/4.0.0_a62cezdlw5ot3n4rmiou7w6jsi:
    resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==}
    engines: {node: '>=6.0.0'}
    peerDependencies:
@ -2562,6 +2583,8 @@ packages:
      regex-not: 1.0.2
      snapdragon: 0.8.2
      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /extend-shallow/2.0.1:
@ -2591,6 +2614,8 @@ packages:
      regex-not: 1.0.2
      snapdragon: 0.8.2
      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /fast-deep-equal/3.1.3:
@ -3518,6 +3543,8 @@ packages:
      mime: 1.6.0
      needle: 2.9.1
      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /levn/0.4.1:
@ -3563,6 +3590,7 @@ packages:
    transitivePeerDependencies:
      - supports-color
      - zen-observable
+      - zenObservable
    dev: true

  /listr-silent-renderer/1.1.1:
@ -3612,6 +3640,7 @@ packages:
      rxjs: 6.6.7
    transitivePeerDependencies:
      - zen-observable
+      - zenObservable
    dev: true

  /loader-utils/1.4.0:
@ -3802,6 +3831,8 @@ packages:
      regex-not: 1.0.2
      snapdragon: 0.8.2
      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /micromatch/3.1.10:
@ -3821,6 +3852,8 @@ packages:
      regex-not: 1.0.2
      snapdragon: 0.8.2
      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /micromatch/4.0.4:
@ -3916,6 +3949,8 @@ packages:
      regex-not: 1.0.2
      snapdragon: 0.8.2
      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /nanopop/2.1.0:
@ -3935,6 +3970,8 @@ packages:
      debug: 3.2.7
      iconv-lite: 0.4.24
      sax: 1.2.4
+    transitivePeerDependencies:
+      - supports-color
    dev: true
    optional: true

@ -4907,6 +4944,8 @@ packages:
      source-map: 0.5.7
      source-map-resolve: 0.5.3
      use: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /source-map-js/1.0.2:
@ -5123,6 +5162,8 @@ packages:
      deepmerge: 1.3.2
      mitt: 1.1.2
      svg-baker: 1.7.0
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /svg-baker/1.7.0:
@ -5141,6 +5182,8 @@ packages:
      posthtml-svg-mode: 1.0.3
      query-string: 4.3.4
      traverse: 0.6.6
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /svg-sprite-loader/6.0.11:
@ -5155,6 +5198,8 @@ packages:
      svg-baker: 1.7.0
      svg-baker-runtime: 1.4.7
      url-slug: 2.0.0
+    transitivePeerDependencies:
+      - supports-color
    dev: true

  /svg-tags/1.0.0:
@ -5210,7 +5255,6 @@ packages:
  /to-fast-properties/2.0.0:
    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
    engines: {node: '>=4'}
-    dev: true

  /to-object-path/0.3.0:
    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
@ -5697,7 +5741,6 @@ packages:
      '@vue/runtime-dom': 3.2.31
      '@vue/server-renderer': 3.2.31_vue@3.2.31
      '@vue/shared': 3.2.31
-    dev: false

  /vuex/4.0.2_vue@3.2.31:
    resolution: {integrity: sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==}
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@ -10,7 +10,7 @@ const state = {
  isCollapsed: false,
  sideMenuData: [],
  pageConfig: {},
-  systemConfig: {},
+  systemConfig: JSON.parse(localStorage.getItem('systemConfig')) || {},
  userData: null,
  operateTime: '',
  basePath: '',
@ -66,6 +66,10 @@ const mutations = {
    state.pageConfig = data
  },
  SETTING_SYSTEM_CONFIG(state, data) {
+    // 为什么不用 csc 的方式 管理端父传子是异步方式 可能导致表格列渲染完成后接口还没返回
+    data.projectConfigLabel = data.projectConfigLabel || '项目'
+    data.serviceConfigLabel = data.serviceConfigLabel || '业务'
+    localStorage.setItem('systemConfig', JSON.stringify(data))
    state.systemConfig = data
  }
 }
@ -102,7 +106,7 @@ const actions = {
    }
  },
  async GetSystemConfigs({ commit }) {
-    const data = await getSystemConfigs({ codes: 'pwdStrength,lockScreenTime' })
+    const data = await getSystemConfigs({ codes: 'pwdStrength,lockScreenTime,serviceConfigLabel,projectConfigLabel' })
    if (data.success) {
      commit('SETTING_SYSTEM_CONFIG', data.data)
    }
--- a/vite.config.ts
+++ b/vite.config.ts
@ -12,7 +12,7 @@ function resolve(dir: string) {
 }

 const httpType = 'https://'
-const proxyUrl = 'develop.cmp56.com:60006/' // 代理地址设置
+const proxyUrl = '23.33.3.22:60006/' // 代理地址设置

 // https://vitejs.dev/config/
 export default defineConfig({
Author	SHA1	Message	Date
时启龙	36d63032e7	feat: 业务和项目标签名称统一从接口取	2024-10-29 17:04:52 +08:00
时启龙	a43e5eadae	chore: 修改开发环境协议	2024-04-01 12:19:38 +08:00
时启龙	2d60aa72f1	fix: 修改代理接口	2024-03-14 14:05:43 +08:00