Merge branch 'v1.7_EDB' into v1.7.1_EDB

.env.development

@@ -1,5 +1,5 @@
 # 接口地址http://8.136.199.33:8610/v1   http://8.136.199.33:7778/adminapi
-VITE_APP_API_URL="http://8.136.199.33:7778/adminapi"
+VITE_APP_API_URL="http://8.136.199.33:8610/v1"
 # 路由根地址
 VITE_APP_BASE_URL="/"
 # 打包输入文件名

src/api/common.js

@@ -42,4 +42,12 @@ export function apiGetWXQRCodeImg(params){
  */
 export function apiCommonSetSysConfig(params){
     return post('/system/sysuser/config/set',params)
+}
+
+/**
+ * 获取系统中模块语言设置
+ * @param SourceKey edb指标库语言edb_language；预测指标库语言predict_edb_language；ETA图库语言chart_language
+ */
+export function apiGetLanguageConfig(params){
+    return get('/system/config/language',params)
 }

src/api/dataEDB.js

@@ -270,12 +270,5 @@ export default{
      */
     getEDBSourceOpts(params){
         return get('/datamanage/edb_source/list',params)
-    },
-
-    /**
-     * 获取当前用户指标库设置显示的语言版本
-     */
-    getEDBShowLangType(){
-        return get('/datamanage/classify/items/v3',{})
     }
 }

src/views/dataEDB/Detail.vue

@@ -1,6 +1,7 @@
 <script setup name="DataEDBDetail">
 import {ref} from 'vue'
 import apiDataEDB from '@/api/dataEDB'
+import {apiGetLanguageConfig} from '@/api/common'
 import EDBChartDetailVue from './components/EDBChartDetail.vue'
 import EDBDataDetailVue from './components/EDBDataDetail.vue'
 import EditBaseEDB from './components/EditBaseEDB.vue'
@@ -28,9 +29,9 @@ const dataDetailIns=ref(null)//数据详情组件实例
 const langType=ref('zh')
 // 获取当前要显示的语言版本
 async function getLangType(){
-    const res=await apiDataEDB.getEDBShowLangType()
+    const res=await apiGetLanguageConfig({SourceKey:'edb_language'})
     if(res.Ret===200){
-        langType.value=res.Data.Language==='CN'?'zh':'en'
+        langType.value=res.Data==='CN'?'zh':'en'
     }
 }
 getLangType()

src/views/dataEDB/Index.vue

@@ -1,7 +1,7 @@
 <script setup name="DataEDBIndex">
 import {reactive,ref, watch} from 'vue'
 import apiDataEDB from '@/api/dataEDB'
-import {apiCommonSetSysConfig} from '@/api/common'
+import {apiCommonSetSysConfig,apiGetLanguageConfig} from '@/api/common'
 import EDBClassify from './components/EDBClassify.vue'
 import { showSuccessToast, showToast } from 'vant'
 import {useRouter} from 'vue-router'
@@ -15,9 +15,10 @@ const router=useRouter()
 const langType=ref('zh')
 // 获取当前要显示的语言版本
 async function getLangType(){
-    const res=await apiDataEDB.getEDBShowLangType()
+    const res=await apiGetLanguageConfig({SourceKey:'edb_language'})
     if(res.Ret===200){
-        langType.value=res.Data.Language==='CN'?'zh':'en'
+        langType.value=res.Data==='CN'?'zh':'en'
+        // 修改分类的语言显示
         classifyPopIns.value.langTypeChange(langType.value)
     }
 }
@@ -26,7 +27,7 @@ getLangType()
 async function langTypeChange(){
     const res=await apiCommonSetSysConfig({
         ConfigCode: 'edb_language',
-		ConfigValue: langType.value === 'en' ? 'EN' : 'CN'
+		ConfigValue: langType.value === 'en' ? 'CN' : 'EN'
     })
     if(res.Ret===200){
         showSuccessToast('设置成功')

src/views/dataEDB/components/EDBClassify.vue

@@ -58,7 +58,7 @@ async function getEDBClassifyList(){
     const res=await apiDataEDB.edbClassifyList()
     if(res.Ret===200){
         classifyList.value=res.Data.AllNodes||[]
-        langType.value=res.Data.Language==='CN'?'zh':'en'
+        // langType.value=res.Data.Language==='CN'?'zh':'en'
     }
 }
 getEDBClassifyList()