Home Explore Help
Sign In
eta_front
/
eta_mobile_front
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'custom' of http://8.136.199.33:3000/eta_front/eta_mobile_front into custom

cxmo 1 year ago
parent
3cf062762e 076321d1bc
commit
5f7f5efae0
9 changed files with 63 additions and 19 deletions
Split View Show Diff Stats
  1. 1 1
      index.html
  2. 7 0
      src/api/user.js
  3. 3 3
      src/router/chartETA.js
  4. 2 2
      src/router/myETA.js
  5. 22 7
      src/views/Login.vue
  6. 1 1
      src/views/myETA/ChooseChart.vue
  7. 1 1
      src/views/report/components/reportInsert/ETAChart.vue
  8. 17 3
      src/views/tabbar/Home.vue
  9. 9 1
      src/views/tabbar/User.vue

+ 1 - 1
index.html
View File 

@@ -4,7 +4,7 @@
 
     <meta charset="UTF-8" />
 
     <link rel="icon" type="image/x-icon" href="/fa.ico"/>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
 
-    <title>ETA投研平台</title>
 
+    <title>投研平台</title>
 
     <link href='/froala_editor.pkgd.min.css' rel='stylesheet' type='text/css' />
 
   </head>
 
   <body>

+ 7 - 0
src/api/user.js
View File 

@@ -105,6 +105,13 @@ export const _apiLogin = {
 
     getICPLicense:(params)=>{
 
         return get('/user_login/icp_license',params)
 
     },
 
+    /**
 
+     * 获取配置信息
 
+     * @returns 
+    */
 
+    getBaseInfo:(params)=>{
 
+        return get('/user_login/base_info',params)
 
+    },
 
 }

+ 3 - 3
src/router/chartETA.js
View File 

@@ -5,7 +5,7 @@ export const chartETARoutes=[
 
         name:"ChartETAList",
 
         component: () => import("@/views/chartETA/List.vue"),
 
         meta: { 
-            title: "ETA图库",
 
+            title: "图库",
 
             keepAlive:true,
 
             hasBackTop:true,
 
         },
 
@@ -15,7 +15,7 @@ export const chartETARoutes=[
 
         name:"ChartETASearch",
 
         component: () => import("@/views/chartETA/Search.vue"),
 
         meta: { 
-            title: "ETA图库",
 
+            title: "图库",
 
             keepAlive:true,
 
             hasBackTop:true,
 
         },
 
@@ -25,7 +25,7 @@ export const chartETARoutes=[
 
         name:"ChartETAChartDetail",
 
         component: () => import("@/views/chartETA/ChartDetail.vue"),
 
         meta: { 
-            title: "ETA图库",
 
+            title: "图库",
 
             keepAlive:false,
 
         },
 
     }

+ 2 - 2
src/router/myETA.js
View File 

@@ -9,7 +9,7 @@
 
         name:"MyETAIndex",
 
         component: () => import("@/views/myETA/Index.vue"),
 
         meta: { 
-            title: "My ETA",
 
+            title: "我的图库",
 
             keepAlive:true
 
         },
 
     },
 
@@ -18,7 +18,7 @@
 
         name:"MyETASearchList",
 
         component: () => import("@/views/myETA/SearchList.vue"),
 
         meta: { 
-            title: "My ETA",
 
+            title: "我的图库",
 
             keepAlive:true
 
         },
 
     },

+ 22 - 7
src/views/Login.vue
View File 

@@ -10,6 +10,8 @@ import OrdinaryModel from './login/OrdinaryModel.vue';
 
 import EmailModel from './login/EmailModel.vue';
 
 import ForgetPassModel from './login/ForgetPassModel.vue';
 
 
+import logoImg from '@/assets/imgs/logo_icon.png'
 
+
 
 const router=useRouter()
 
 
 //登陆模式 ordinaryModel账号密码 mobileModel手机号 emailModel邮箱
 
@@ -139,17 +141,30 @@ function userLogin(params,values){
 
 
 let recordInformation=ref([])
 
 
-function getRecordInfo(){
 
-    _apiLogin.getICPLicense().then(res=>{
 
+// function getRecordInfo(){
 
+//     _apiLogin.getICPgetBaseInfoLicense().then(res=>{
 
+//         if(res.Ret == 200){
 
+//             // 两个空格以上截一段
 
+//             recordInformation.value = res.Data.ConfVal.split(/\s{2,}/)
 
+//         }
 
+//     })
 
+
 
+// }
 
+const logo=ref('')
 
+function getBaseInfo(){
 
+    _apiLogin.getBaseInfo().then(res=>{
 
         if(res.Ret == 200){
 
-            // 两个空格以上截一段
 
-            recordInformation.value = res.Data.ConfVal.split(/\s{2,}/)
 
+            logo.value=res.Data.LogoMobile?res.Data.LogoMobile.ConfVal:''
 
+            // 备案信息两个空格以上截一段 
+            recordInformation.value = res.Data.Icp?res.Data.Icp.ConfVal.split(/\s{2,}/):''
 
+
 
         }
 
     })
 
-
 
 }
 
 
-getRecordInfo();//获取备案信息
 
+// getRecordInfo();//获取备案信息
 
+getBaseInfo()//获取基础信息
 
+
 
 </script>
 
 
 <template>
 
@@ -157,7 +172,7 @@ getRecordInfo();//获取备案信息
 
         <div class="login-page">
 
             <van-form class="form-box" ref="loginForm" v-if="activeModel!=='forgetPassModel'">
 
                 <div class="logo-wrap">
 
-                    <img class="logo" src="@/assets/imgs/logo_icon.png" alt="">
 
+                    <img class="logo" :src="logo || logoImg" alt="">
 
                     <div class="title">Bind on account,</div>
 
                     <div class="sub-title">sign in to continue</div>
 
                 </div>

+ 1 - 1
src/views/myETA/ChooseChart.vue
View File 

@@ -15,7 +15,7 @@ const keyword=ref('')
 
 
 const typeOpt=[
 
     {
 
-        name:"ETA图库",
 
+        name:"图库",
 
         type:1,
 
     },
 
     {

+ 1 - 1
src/views/report/components/reportInsert/ETAChart.vue
View File 

@@ -102,7 +102,7 @@ watch(
 
         <div class="sticky-box">
 
             <van-search v-model="searchVal" shape="round" placeholder="请输入图表名称" @search="handleRefreshList" @clear="handleRefreshList" />
 
             <van-tabs v-model:active="typeActive" line-width="16px" title-active-color="#0052D9" @change="handleRefreshList">
 
-                <van-tab title="ETA图库" :name="1"></van-tab>
 
+                <van-tab title="图库" :name="1"></van-tab>
 
                 <van-tab title="商品价格曲线" :name="2"></van-tab>
 
                 <van-tab title="相关性图表" :name="3"></van-tab>
 
                 <van-tab title="拟合方程曲线" :name="6"></van-tab>

+ 17 - 3
src/views/tabbar/Home.vue
View File 

@@ -6,6 +6,10 @@ import {getStaticImg} from '@/hooks/common'
 
 import {useCachedViewsStore} from '@/store/modules/cachedViews'
 
 import { showToast } from 'vant';
 
 import { useWindowSize } from '@vueuse/core'
 
+import {usePublicSettingStore} from '@/store/modules/publicSetting'
 
+import {_apiLogin} from '@/api/user'
 
+const publicSettingStore = usePublicSettingStore()
 
+
 
 
 const { width } = useWindowSize()
 
 const cachedViewsStore=useCachedViewsStore()
 
@@ -136,7 +140,7 @@ const menuConfig=[
 
         show:false
 
     },
 
     {
 
-        name:'ETA图库',
 
+        name:'图库',
 
         des:'数据可视化平台',
 
         key:'ETA图库',
 
         type:'zh',
 
@@ -147,7 +151,7 @@ const menuConfig=[
 
         show:false
 
     },
 
     {
 
-        name:'My ETA',
 
+        name:'我的图库',
 
         des:'图表收藏',
 
         key:'My ETA',
 
         type:'zh',
 
@@ -158,7 +162,7 @@ const menuConfig=[
 
         show:false
 
     },
 
     {
 
-        name:'ETA表格',
 
+        name:'表格',
 
         des:'快速建立平衡表',
 
         key:'ETA表格',
 
         type:'zh',
 
@@ -209,7 +213,17 @@ async function getMenuList(){
 
         resMenuList.value=res.Data.List||[]
 
     }
 
 }
 
+
 
+const getSetTitle=()=>{
 
+    _apiLogin.getBaseInfo().then(res=>{
 
+        if(res.Ret == 200){
 
+            document.title=res.Data.TabNameMobile?res.Data.TabNameMobile.ConfVal:''
 
+        }
 
+    })
 
+}
 
+
 
 getMenuList()
 
+getSetTitle()
 
 
 </script>

+ 9 - 1
src/views/tabbar/User.vue
View File 

@@ -3,7 +3,7 @@ import {Base64} from 'js-base64'
 
 import  {ref} from 'vue'
 
 import { useRouter } from 'vue-router'
 
 import {useUserInfo} from '@/hooks/common'
 
-
 
+import {_apiLogin} from '@/api/user'
 
 const router=useRouter()
 
 
 let userInfo=useUserInfo()
 
@@ -13,7 +13,15 @@ function handleLoginOut(){
 
     localStorage.removeItem('userInfo')
 
     router.replace('/login')
 
 }
 
+const getSetTitle=()=>{
 
+    _apiLogin.getBaseInfo().then(res=>{
 
+        if(res.Ret == 200){
 
+            document.title=res.Data.TabNameMobile?res.Data.TabNameMobile.ConfVal:''
 
+        }
 
+    })
 
+}
 
 
+getSetTitle()
 
 </script>
 
 
 <template>