comit

src/hooks/chart/render.js

@@ -8,14 +8,18 @@ import moment from 'moment'
 import _ from 'lodash';
 HighchartszhCN(Highcharts)
 
+let LangType='zh'//当前图表显示的语言版本
+
 /**
  * 渲染图方法
  * @param data 图详情数据
  * @param renderId 图表在dom中的id
+ * @param lang 图表显示为中文/英文 默认 zh中文 en英文
  */
-export function chartRender(data,renderId){
+export function chartRender(data,renderId,lang='zh'){
     let obj={...chartDefaultOpts}
     let chartOpt={}
+    LangType=lang
     if([1,3,4,5,6].includes(data.ChartInfo.ChartType)){
         const chartSetMap = {
             1: setSplineOpt,
@@ -27,7 +31,6 @@ export function chartRender(data,renderId){
         chartOpt=chartSetMap[data.ChartInfo.ChartType](data)
     }else if(data.ChartInfo.ChartType ===2 ) {
         chartOpt=setSeasonOpt(data)
-        console.log(chartOpt);
     }else if(data.ChartInfo.ChartType ===7){//奇怪柱形图依赖数据
         chartOpt=initBarData(data);
     }else if(data.ChartInfo.ChartType ===8){//商品价格曲线

src/layouts/Index.vue

@@ -27,7 +27,7 @@ function handleLoginOut(){
             <div>
                 <div 
                     class="back-home-box" 
-                    v-if="$route.meta.hasBack"
+                    v-if="$route.meta.hasBackHome"
                     @click="$router.replace('/')"
                 >返回首页</div>
             </div>

src/router/index.js

@@ -64,20 +64,20 @@ const routes = [
 const router = createRouter({
 	history: createWebHistory(import.meta.env.VITE_APP_BASE_URL),
   	routes,
-	scrollBehavior(to, from, savedPosition) {
-		if (savedPosition && to.meta.keepAlive) {
-			return savedPosition;
-		} else {
-			return new Promise((resolve) => {
-				setTimeout(() => {
-					resolve({ left: 0, top: 0 });
-				}, 0);
-			});
-		}
-	},
+	// scrollBehavior(to, from, savedPosition) {
+	// 	if (savedPosition && to.meta.keepAlive) {
+	// 		return savedPosition;
+	// 	} else {
+	// 		return new Promise((resolve) => {
+	// 			setTimeout(() => {
+	// 				resolve({ left: 0, top: 0 });
+	// 			}, 0);
+	// 		});
+	// 	}
+	// },
 });
 
-// router.beforeEach((to, from, next) => {
+router.beforeEach((to, from, next) => {
 //   if (to.query.token) {
 //     store.commit("getToken", to.query.token);
 //     store.dispatch("getUserInfo");
@@ -90,8 +90,8 @@ const router = createRouter({
 //     }
 //   }
 
-//   document.title = to.meta.title;
-//   next();
-// });
+	document.title = to.meta.title;
+  	next();
+});
 
 export default router;

src/router/ppt.js

@@ -2,7 +2,7 @@
 /**
  * meta:{
  * noHead:pad端不需要顶部
- * hasBack:pad端顶部有返回首页
+ * hasBackHome:pad端顶部有返回首页
  * }
  */
 export const pptRoutes=[
@@ -12,14 +12,17 @@ export const pptRoutes=[
         component: () => import("@/views/ppt/Index.vue"),
         meta: { 
             title: "智能PPT",
-            hasBack:true
+            hasBackHome:true
         },
     },
     {
         path:"/ppt/detail",
         name:"PPTDetail",
         component: () => import("@/views/ppt/Detail.vue"),
-        meta: { title: "智能PPT" },
+        meta: { 
+            title: "智能PPT",
+            hasBackHome:true
+        },
     },
     {
         path:"/ppt/search",

src/router/pptEn.js

@@ -2,7 +2,7 @@
 /**
  * meta:{
  * noHead:pad端不需要顶部
- * hasBack:pad端顶部有返回首页
+ * hasBackHome:pad端顶部有返回首页
  * }
  */
  export const pptENRoutes=[
@@ -12,14 +12,17 @@
         component: () => import("@/views/ppt/Index.vue"),
         meta: { 
             title: "智能PPT",
-            hasBack:true
+            hasBackHome:true
         },
     },
     {
         path:"/ppten/detail",
         name:"PPTENDetail",
         component: () => import("@/views/ppt/Detail.vue"),
-        meta: { title: "智能PPT" },
+        meta: { 
+            title: "智能PPT",
+            hasBackHome:true
+        },
     },
     {
         path:"/ppten/search",

src/views/404.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="nofound-page">
-        <img src="@/assets/404.png" alt="">
+        <img src="@/assets/imgs/404.png" alt="">
         <p>404</p>
     </div>
 </template>

src/views/ppt/components/ChartWrap.vue

@@ -25,7 +25,11 @@ async function getChartInfo(){
             chartIsDelete.value=true
             return
         }
-        chartRender(res.Data,renderId.value)
+        let lang='zh'
+        if(window.location.pathname.startsWith('/ppten')){
+            lang='en'
+        }
+        chartRender(res.Data,renderId.value,lang)
     }
 }