v1.7_EDB

src/api/common.js

@@ -32,4 +32,14 @@ export function apiGetOSSSign(){
  */
 export function apiGetWXQRCodeImg(params){
     return post('/report/getSunCode',params)
+}
+
+/**
+ * 设置系统配置项
+ * @param ConfigCode edb指标库语言edb_language；预测指标库语言predict_edb_language
+ *                   ETA图库语言chart_language
+ * @param ConfigValue 中文CN 英文EN
+ */
+export function apiCommonSetSysConfig(params){
+    return post('/system/sysuser/config/set',params)
 }

src/api/dataEDB.js

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

src/layouts/Index.vue

@@ -144,6 +144,7 @@ function goBack(){
             font-size: 16px;
             display: flex;
             align-items: center;
+            cursor: pointer;
             &::before{
                 content: '';
                 display: block;

src/views/dataEDB/AddBaseEDB.vue

@@ -30,8 +30,9 @@ async function getEDBSourceOpts(){
 }
 getEDBSourceOpts()
 function onConfirmDataSource(e){
-    dataSourceText.value=e.selectedOptions[0].text
-    dataSourceVal.value=e.selectedOptions[0].value
+    console.log(e);
+    dataSourceText.value=e.selectedOptions[0].SourceName
+    dataSourceVal.value=e.selectedOptions[0].EdbSourceId
     showSelectDataSource.value=false
 }
 
@@ -103,9 +104,6 @@ function handleClearPage(){
     result.value=null
 }
 
-
-
-
 </script>
 
 <template>
@@ -117,6 +115,7 @@ function handleClearPage(){
                 show-action
                 shape="round"
                 placeholder="指标ID/指标名称"
+                @clear="searchEDBTxt=''"
                 @search="onSearch"
             >
                 <template #action>
@@ -130,6 +129,7 @@ function handleClearPage(){
                 show-action
                 shape="round"
                 placeholder="公司ID"
+                @clear="searchCompanyTxt=''"
                 @search="onSearch"
             >
                 <template #action>
@@ -298,4 +298,27 @@ function handleClearPage(){
     background-color: #fff;
 }
 
+@media screen and (min-width:$media-width){
+    .search-box{
+        .van-search{
+            padding: 6px;
+        }
+        .right-btn{
+            width: 56px;
+            height: 28px;
+            line-height: 28px;
+        }
+    }
+    .data-value-wrap{
+        margin-top: 33px;
+        .item{
+            padding: 16px;
+            .val-box{
+                padding: 0 15px;
+                line-height: 28px;
+                border-radius: 4px;
+            }
+        }
+    }
+}
 </style>

src/views/dataEDB/Detail.vue

@@ -25,6 +25,16 @@ const activeType=ref('chart')
 const chartDetailIns=ref(null)//图表组件实例
 const dataDetailIns=ref(null)//数据详情组件实例
 
+const langType=ref('zh')
+// 获取当前要显示的语言版本
+async function getLangType(){
+    const res=await apiDataEDB.getEDBShowLangType()
+    if(res.Ret===200){
+        langType.value=res.Data.Language==='CN'?'zh':'en'
+    }
+}
+getLangType()
+
 // 获取指标详情
 const edbInfo=ref(null)
 // async function getEDBInfo(){
@@ -170,19 +180,21 @@ function handleSave(){
 <template>
     <div class="edb-detail-page" v-if="edbInfo">
         <div class="top-box">
-            <div class="van-multi-ellipsis--l2 edb-name-box">{{edbInfo.EdbName}}</div>
+            <div class="van-multi-ellipsis--l2 edb-name-box">{{langType==='zh'?edbInfo.EdbName:edbInfo.EdbNameEn||edbInfo.EdbName}}</div>
         </div>
         <van-tabs v-model:active="activeType" sticky line-width="16" title-active-color="#0052D9" title-inactive-color="#333">
             <van-tab title="图表详情" name="chart">
                 <EDBChartDetailVue
                     ref="chartDetailIns" 
                     :edbInfo="edbInfo"
+                    :langType="langType"
                 />
             </van-tab>
             <van-tab title="数据详情" name="data">
                 <EDBDataDetailVue
                     ref="dataDetailIns"
                     :edbInfo="edbInfo"
+                    :langType="langType"
                 />
             </van-tab>
         </van-tabs>
@@ -277,6 +289,7 @@ function handleSave(){
     display: flex;
     background-color: #fff;
     .item{
+        cursor: pointer;
         flex: 1;
         display: flex;
         flex-direction: column;
@@ -307,4 +320,26 @@ function handleSave(){
         color: $theme-red;
     }
 }
+
+@media screen and (min-width:$media-width){
+    .top-box{
+        padding: 20px $page-padding 10px;
+        .edb-name-box{
+            font-size: 18px;
+            line-height: 27px;
+        }
+    }
+    .edb-detail-page{
+        padding-bottom: 70px;
+    }
+    .fix-bottom-box{
+        height: 56px;
+        .item{
+            .icon{
+                width: 24px;
+                height: 24px;
+            }
+        }
+    }
+}
 </style>

src/views/dataEDB/Index.vue

@@ -1,14 +1,40 @@
 <script setup name="DataEDBIndex">
 import {reactive,ref, watch} from 'vue'
 import apiDataEDB from '@/api/dataEDB'
+import {apiCommonSetSysConfig} from '@/api/common'
 import EDBClassify from './components/EDBClassify.vue'
-import { showToast } from 'vant'
+import { showSuccessToast, showToast } from 'vant'
 import {useRouter} from 'vue-router'
 import {useCachedViewsStore} from '@/store/modules/cachedViews'
+import langIconZH from '@/assets/imgs/chartETA/lang-icon.png'
+import langIconEN from '@/assets/imgs/chartETA/langEn-icon.png'
 
 const cachedViewsStore=useCachedViewsStore()
 const router=useRouter()
 
+const langType=ref('zh')
+// 获取当前要显示的语言版本
+async function getLangType(){
+    const res=await apiDataEDB.getEDBShowLangType()
+    if(res.Ret===200){
+        langType.value=res.Data.Language==='CN'?'zh':'en'
+        classifyPopIns.value.langTypeChange(langType.value)
+    }
+}
+getLangType()
+//设置语言
+async function langTypeChange(){
+    const res=await apiCommonSetSysConfig({
+        ConfigCode: 'edb_language',
+		ConfigValue: langType.value === 'en' ? 'EN' : 'CN'
+    })
+    if(res.Ret===200){
+        showSuccessToast('设置成功')
+        langType.value=langType.value === 'en' ? 'zh' : 'en'
+        classifyPopIns.value.langTypeChange(langType.value)
+    }
+}
+
 
 const listState = reactive({
     list:[],
@@ -21,13 +47,14 @@ const listState = reactive({
     activeClassifyId:0,
 })
 async function getEDBList(){
+    listState.loading=true
     const res=await apiDataEDB.edbChartList({
         PageSize:listState.pageSize,
         CurrentIndex:listState.page,
         ClassifyId:listState.activeClassifyId
     })
-    if(res.Ret===200){
-        listState.loading=false        
+    listState.loading=false 
+    if(res.Ret===200){ 
         const arr=res.Data.List||[]
         listState.list=[...listState.list,...arr]
         listState.total=res.Data.Paging.Totals
@@ -62,22 +89,20 @@ function handleSelectActionOpt(e){
 // 分类弹窗
 const classifyPopIns=ref(null)
 const showClassifyPop=ref(false)
-watch(
-    ()=>showClassifyPop.value,
-    (n)=>{
-        if(!n){
-            listState.page=1
-            listState.list=[]
-            listState.finished=false
-            listState.total=0
-            getEDBList()
-        }
-    }
-)
 function handleSelectClassifyChange(e){
     listState.activeClassifyName=e.selectClassifyNameStr
     listState.activeClassifyId=e.selectClassifyId
 }
+watch(
+    ()=>listState.activeClassifyId,
+    ()=>{
+        listState.page=1
+        listState.list=[]
+        listState.finished=false
+        listState.total=0
+        getEDBList()
+    }
+)
 
 // 单个指标操作数据
 const edbOptState=reactive({
@@ -175,30 +200,10 @@ async function handleConfirmEDBMove(){
 
 // 跳转详情
 function handleEDBDetail(item){
-    let edbType=1// 1基础指标 2计算指标
-    // 基础指标
-    if(item.EdbType===1 || [58,59,67,68].includes(item.Source)){
-        edbType=1
-    }
-    // 计算指标
-    if(item.EdbType === 2 && ![27,40,58,59].includes(item.Source)){
-        edbType=2
-    }
-    //代码运算
-    if(item.Source===27){
-        showToast('代码运算指标请在pc端操作')
-        return
-    }
-    //数据调整
-    if(item.Source===40){
-        showToast('数据调整指标请在pc端操作')
-        return
-    }
     router.push({
         path:'/dataEDB/detail',
         query:{
-            edbInfoId:item.EdbInfoId,
-            edbType:edbType
+            edbInfoId:item.EdbInfoId
         }
     })
 }
@@ -223,8 +228,7 @@ async function goSearch(){
                     @click-input="goSearch"
                 />
                 <div class="lang-icon icon">
-                    <img v-if="true" src="@/assets/imgs/chartETA/lang-icon.png" alt="">
-                    <img v-if="false" src="@/assets/imgs/chartETA/langEn-icon.png" alt="">
+                    <img :src="langType==='zh'?langIconZH:langIconEN" alt="" @click="langTypeChange">
                 </div>
             </div>
             <div class="count-box">
@@ -246,7 +250,7 @@ async function goSearch(){
                 <img v-if="listState.list.length==0&&listState.finished" class="list-empty-img" src="https://hzstatic.hzinsights.com/static/ETA_mobile/empty_img.png" alt="">
                 <ul class="edb-list">
                     <li class="edb-item" v-for="item in listState.list" :key="item.EdbInfoId" @click="handleEDBDetail(item)">
-                        <div class="van-multi-ellipsis--l2 name">{{item.EdbName}}</div>
+                        <div class="van-multi-ellipsis--l2 name">{{langType==='zh'?item.EdbName:item.EdbNameEn||item.EdbName}}</div>
                         <van-image
                             class="img"
                             :src="item.ChartImage"
@@ -349,6 +353,7 @@ async function goSearch(){
     background-color: $page-bg-grey;
 }
 .fixed-opt-btn{
+    cursor: pointer;
     width: var(--van-back-top-size);
     height: var(--van-back-top-size);
     position: fixed;
@@ -382,6 +387,7 @@ async function goSearch(){
             padding: 0;
         }
         .lang-icon{
+            cursor: pointer;
             margin-left: 10px;
             width: 70px;
             height:70px;
@@ -414,6 +420,7 @@ async function goSearch(){
             }
         }
         .menu-icon{
+            cursor: pointer;
             width: 48px;
             height: 48px;
             flex-shrink: 0;
@@ -429,6 +436,7 @@ async function goSearch(){
         flex-wrap: wrap;
         gap: 30px 0;
         .edb-item{
+            cursor: pointer;
             width: 326px;
             border-radius: 8px;
             background: #FFF;
@@ -446,6 +454,7 @@ async function goSearch(){
                 font-size: 24px;
             }
             .opt-icon{
+                cursor: pointer;
                 float: right;
                 width: 28px;
                 height: 28px;
@@ -469,4 +478,67 @@ async function goSearch(){
     }
 }
 
+@media screen and (min-width:$media-width){
+    .fixed-opt-btn{
+        bottom: calc(var(--van-back-top-bottom) + var(--van-back-top-size) + 10px);
+        svg{
+            width: 20px;
+            height: 20px;
+        }
+    }
+    .top-sticky-box{
+        top: 60px;
+        .search-box{
+            padding: 20px $page-padding;
+            .lang-icon{
+                margin-left: 10px;
+                width: 35px;
+                height: 35px;
+                img{
+                    width: 23px;
+                    height: 23px;
+                }
+            }
+        }
+        .count-box{
+            padding: 20px $page-padding;
+            .con{
+                .num{
+                    margin-left: 12px;
+                }
+            }
+            .menu-icon{
+                width: 30px;
+                height: 30px;
+            }
+        }
+    }
+    .edb-list-wrap{
+        padding: 32px $page-padding;
+        .edb-list{
+            gap: 15px;
+            justify-content: flex-start;
+            .edb-item{
+                width: 313px;
+                border-radius: 8px;
+                padding: 10px;
+                .name{
+                    min-height: 36px;
+                }
+                .img{
+                    height: 220px;
+                    margin: 14px 0;
+                }
+                .time{
+                    font-size: 14px;
+                }
+                .opt-icon{
+                    width: 28px;
+                    height: 28px;
+                }
+            }
+        }
+    }
+}
+
 </style>

src/views/dataEDB/RelationChart.vue

@@ -18,20 +18,27 @@ const listState=reactive({
     page:1,
     pageSize:20,
     totals:0,
+    loading:false,
     finished:false
 })
 // 获取关联的图列表
 async function getEdbRelationChartList(){
+    listState.loading=true
     const res=await apiDataEDB.edbRelationChartList({
         PageSize:listState.pageSize,
         CurrentIndex:listState.page,
         EdbInfoId:edbInfoId
     })
+    listState.loading=false
     if(res.Ret===200){
-        const arr=res.Data.List||[]
+        if(!res.Data){
+            listState.finished=true
+            return
+        }
+        const arr=res.Data?.List||[]
         listState.list=[...listState.list,...arr]
-        listState.finished=res.Data.Paging.IsEnd
-        listState.totals=res.Data.Paging.Totals
+        listState.finished=res.Data?.Paging.IsEnd
+        listState.totals=res.Data?.Paging.Totals
     }
 }
 getEdbRelationChartList()
@@ -147,4 +154,38 @@ function goChartDetail(item){
         }
     }
 }
+
+@media screen and (min-width:$media-width){
+    .edb-relation-chart-page{
+        padding:$page-padding;
+    }
+    .total-box{
+        margin-bottom: 10px;
+    }
+    .chart-list{
+        justify-content: flex-start;
+        gap: 10px;
+        .item{
+            width: 313px;
+            border-radius: 8px;
+            padding: 10px;
+            .name{
+                min-height: 36px;
+            }
+            .img{
+                height: 220px;
+                margin: 10px 0;
+            }
+            .time{
+                font-size: 12px;
+            }
+            .opt-icon{
+                bottom: 10px;
+                right: 10px;
+                width: 20px;
+                height: 20px;
+            }
+        }
+    }
+}
 </style>

src/views/dataEDB/RelationEDB.vue

@@ -17,15 +17,18 @@ const listState=reactive({
     page:1,
     pageSize:20,
     totals:0,
+    loading:false,
     finished:false
 })
 // 获取关联的图列表
 async function getEdbRelationEDBList(){
+    listState.loading=true
     const res=await apiDataEDB.edbRelationEdbList({
         PageSize:listState.pageSize,
         CurrentIndex:listState.page,
         EdbInfoId:edbInfoId
     })
+    listState.loading=false
     if(res.Ret===200){
         if(!res.Data){
             listState.finished=true
@@ -115,4 +118,29 @@ function handleCopyEDBData(e){
         }
     }
 }
+@media screen and (min-width:$media-width){
+    .edb-relation-edb-page{
+        padding:$page-padding;
+    }
+    .total-box{
+        margin-bottom: 10px;
+    }
+    .edb-list{
+        .item{
+            margin-bottom: 18px;
+            border-radius: 4px;
+            padding: 10px;
+            .name{
+                font-size: 16px;
+            }
+            .info-list{
+                gap: 5px 0;
+                margin-bottom: 5px;
+            }
+        }
+    }
+
+}
 </style>
+
+

src/views/dataEDB/SearchList.vue

@@ -16,6 +16,7 @@ const listState = reactive({
     loading:false
 })
 async function getList(){
+    listState.loading=true
     const res=await apiDataEDB.edbChartSearchList({
         CurrentIndex:listState.page,
         PageSize:listState.pageSize,
@@ -53,8 +54,7 @@ function goDetail(item){
     router.push({
         path:"/dataEDB/detail",
         query:{
-            edbInfoId:item.EdbInfoId,
-            edbType:item.EdbType
+            edbInfoId:item.EdbInfoId
         }
     })
 }
@@ -142,7 +142,7 @@ function goDetail(item){
         padding: var(--van-search-padding);
         justify-content: flex-start;
         .item{
-            width: 326px;
+            width: 310px;
             padding: 5px 7px;
             margin-bottom: 10px;
             border-radius: 6px;

src/views/dataEDB/components/EDBChartDetail.vue

@@ -23,6 +23,10 @@ const props=defineProps({
         type:Object,
         default:null,
         require:true
+    },
+    langType:{//当前显示的语言
+        type:String,
+        default:'zh'
     }
 })
 
@@ -43,8 +47,6 @@ async function getEDBDataList(){
 getEDBDataList()
 
 
-//当前显示的语言
-const chartLang='zh'
 const oldOptions=reactive({
     MinValue:0,
     MaxValue:0,
@@ -99,12 +101,12 @@ function setLineChart(){
     //y轴
     // 单位 中文时 为无不显示   英文时 为空提示点击输入
 	// 中文不存在或等于无时 英文显示为空  中文存在且英文不存在时 显示'英文单位'
-    let yTitleText = chartLang=='zh'?
+    let yTitleText = props.langType=='zh'?
 	(chartInfo.value.Unit && chartInfo.value.Unit!='无') ? chartInfo.value.Unit:'':
 	!chartInfo.value.UnitEn && chartInfo.value.Unit && chartInfo.value.Unit!='无' ? '英文单位':chartInfo.value.UnitEn
 	// title样式  英文为空时，提示文字样式  英文可以点击设置
     let yTitleStyle = {}
-    if(chartLang=='en'){
+    if(props.langType=='en'){
 		yTitleStyle.cursor='pointer'
 		if(yTitleText=='英文单位'){
 			yTitleStyle.color="#999"
@@ -131,8 +133,8 @@ function setLineChart(){
 	};
 
     // 图例名称和图例文字样式
-	let dataName = chartLang=='zh'?chartInfo.value.EdbName:chartInfo.value.EdbNameEn?chartInfo.value.EdbNameEn:'无英文名称'
-	let color = chartLang=='en'&&(!chartInfo.value.EdbNameEn)?'#999':'#333'
+	let dataName = props.langType=='zh'?chartInfo.value.EdbName:chartInfo.value.EdbNameEn?chartInfo.value.EdbNameEn:'无英文名称'
+	let color = props.langType=='en'&&(!chartInfo.value.EdbNameEn)?'#999':'#333'
 	let legend={
 		...chartDefaultOpts.legend,
 		itemStyle: {
@@ -222,7 +224,7 @@ function setTBChart(data){
 		data: DataList.map(item=>([item.DataTimestamp, item.Value])),
 		type: 'spline',
 		yAxis: 1,
-		name: chartLang=='zh'?`${EdbInfo.EdbName}同比`:EdbInfo.EdbNameEn?`${EdbInfo.EdbNameEn}同比`:'无英文名称',
+		name: props.langType=='zh'?`${EdbInfo.EdbName}同比`:EdbInfo.EdbNameEn?`${EdbInfo.EdbNameEn}同比`:'无英文名称',
 		lineWidth: 1
 	})
     nextTick(()=>{
@@ -256,7 +258,7 @@ function setSeasonChart(){
                     align: 'center',
                 },
                 title: {
-                    text:  chartLang=='zh'?chartInfo.value.Unit:
+                    text:  props.langType=='zh'?chartInfo.value.Unit:
                                     !chartInfo.value.UnitEn && chartInfo.value.Unit && chartInfo.value.Unit!='无' ? '英文单位':chartInfo.value.UnitEn,
                     align: 'high',
                     rotation: 0,
@@ -296,7 +298,7 @@ function setSeasonChart(){
                     align: 'center',
                 },
                 title: {
-                    text:  chartLang=='zh'?chartInfo.value.Unit:
+                    text:  props.langType=='zh'?chartInfo.value.Unit:
                                     !chartInfo.value.UnitEn && chartInfo.value.Unit && chartInfo.value.Unit!='无' ? '英文单位':chartInfo.value.UnitEn,
                     align: 'high',
                     rotation: 0,
@@ -643,6 +645,7 @@ async function handleSaveChartLimit(){
         v-model:show="showSelectDate"
         :position="width>650?'center':'bottom'"
         :style="width>650?{ width: '400px'}:''"
+        round
     >
         <div class="time-picker-wrap">
             <van-picker-group
@@ -745,6 +748,7 @@ async function handleSaveChartLimit(){
     display: flex;
     align-items: center;
     .select-date-box{
+        cursor: pointer;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -760,6 +764,7 @@ async function handleSaveChartLimit(){
         }
     }
     .chart-type-box{
+        cursor: pointer;
         margin-left: 20px;
         flex-shrink: 0;
         display: flex;
@@ -798,6 +803,7 @@ async function handleSaveChartLimit(){
             height: 0;
         }
         .item{
+            cursor: pointer;
             line-height: 88px;
             position: relative;
             height: 100%;
@@ -914,4 +920,116 @@ async function handleSaveChartLimit(){
         }
     }
 }
+
+@media screen and (min-width:$media-width){
+    .edb-chart-detail-page{
+        .chart-render-box{
+            .chart-box{
+                height: 440px;
+            }
+        }
+    }
+    .top-filter-box{
+        padding: $page-padding;
+        .select-date-box{
+            padding: 0 16px;
+            border-radius: 6px;
+            height: 48px;
+            max-width: 300px;
+            .icon{
+                width: 20px;
+                height: 20px;
+            }
+        }
+        .chart-type-box{
+            margin-left: 10px;
+            height: 48px;
+            padding: 0 8px;
+            border-radius: 6px;
+            .icon{
+                width: 20px;
+                height: 20px;
+                margin-right: 10px;
+            }
+        }
+    }
+    .data-source-auth{
+        padding: 0 $page-padding;
+        margin-bottom: 10px;
+    }
+    .select-year-box{
+        margin-top: 15px;
+        height: 44px;
+        gap: 0 20px;
+        padding: 0 $page-padding;
+        box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.08);
+        .item{
+            line-height: 44px;
+            font-size: 16px;
+            &.active{
+                &::after{
+                    width: 25px;
+                    height: 3px;
+                    border-radius: 3px;
+                }
+            }
+        }
+    }
+    .calendar-type-box{
+        width: 224px;
+        margin: 20px auto;
+        border-radius: 4px;
+        span{
+            width: 111px;
+            height: 38px;
+            line-height: 38px;
+        }
+    }
+    .chart-set-limit-wrap{
+            .head-box{
+                .title{
+                    font-size: 18px;
+                    line-height: 50px;
+                    padding-left: 16px;
+                }
+            }
+            .bot-btn-box{
+                font-size: 16px;
+                line-height: 56px;
+                border-top-width: 8px;
+            }
+            .content{
+                max-height: 500px;
+                padding: 30px;
+                .item-box{
+                    margin-bottom: 15px;
+                    .lable-text{
+                        width: 50px;
+                    }
+                    .input-box{
+                        .item{
+                            .type-text{
+                                margin-bottom: 20px;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    .edb-data-list-box{
+        padding: $page-padding;
+        .item{
+            height: 43px;
+            .frequency{
+                width: 80px;
+            }
+            .value{
+                padding: 0 5px;
+                line-height: 28px;
+                border: 2px;
+                min-width: 40px;
+            }
+        }
+    }
+}
 </style>

src/views/dataEDB/components/EDBClassify.vue

@@ -14,14 +14,12 @@ const props=defineProps({
         default:false
     }
 })
-
 const emits=defineEmits(['update:modelValue','change'])
 
 
-
-// 关闭弹窗
-function handleClose(){
-    emits('update:modelValue',false)
+const langType=ref('zh')
+function langTypeChange(type){
+    langType.value=type
 }
 
 // 当前点击了哪些分类
@@ -41,21 +39,26 @@ function handleSelectClassify(level1,level2,level3){
         selectClassifyId=level3.ClassifyId
         selectClassifyNameStr=`${level1.ClassifyName}/${level2.ClassifyName}/${level3.ClassifyName}`
     }
+}
+
+// 关闭弹窗
+function handleClose(){
     emits('change',{selectClassifyNameStr,selectClassifyId})
+    emits('update:modelValue',false)
 }
 
 // 设置显示的分类名称（中英文）
 function getClassifyItemName(item){
-    return item.ClassifyName
+    return langType.value==='zh'?item.ClassifyName:item.ClassifyNameEn||item.ClassifyName
 }
 
 // 获取分类数据
 const classifyList=ref([])
-defineExpose({classifyList})
 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'
     }
 }
 getEDBClassifyList()
@@ -330,6 +333,10 @@ function handleConfirmMove(){
         }
     })
 }
+
+
+
+defineExpose({classifyList,langTypeChange})
 </script>
 
 <template>
@@ -353,12 +360,12 @@ function handleConfirmMove(){
                     >
                         <template #title>
                             <div class="van-ellipsis" @click="handleSelectClassify(level1)">
-                                <van-icon :name="openClassify.includes(level1.ClassifyId)?'arrow-down':'arrow'" style="margin-right:4px"/>
+                                <van-icon :name="openClassify.includes(level1.ClassifyId)?'arrow-down':'arrow'" style="margin-right:4px;cursor: pointer;"/>
                                 <span>{{getClassifyItemName(level1)}}</span>
                             </div>
                         </template>
                         <template #value>
-                            <img style="width:22px;height:22px" src="@/assets/imgs/dataEDB/icon_opt.png" alt="" @click.stop="handleShowClassifyOpt(1,level1)">
+                            <img style="width:22px;height:22px;cursor: pointer;" src="@/assets/imgs/dataEDB/icon_opt.png" alt="" @click.stop="handleShowClassifyOpt(1,level1)">
                         </template>
                         <div class="level2-box">
                             <van-collapse-item
@@ -370,12 +377,12 @@ function handleConfirmMove(){
                             >
                                 <template #title>
                                     <div class="van-ellipsis" @click="handleSelectClassify(level1,level2)">
-                                        <van-icon :name="openClassify.includes(level2.ClassifyId)?'arrow-down':'arrow'" style="margin-right:4px"/>
+                                        <van-icon :name="openClassify.includes(level2.ClassifyId)?'arrow-down':'arrow'" style="margin-right:4px;cursor: pointer;"/>
                                         <span>{{getClassifyItemName(level2)}}</span>
                                     </div>
                                 </template>
                                 <template #value>
-                                    <img style="width:22px;height:22px" src="@/assets/imgs/dataEDB/icon_opt.png" alt="" @click.stop="handleShowClassifyOpt(2,level1,level2)">
+                                    <img style="width:22px;height:22px;cursor: pointer;" src="@/assets/imgs/dataEDB/icon_opt.png" alt="" @click.stop="handleShowClassifyOpt(2,level1,level2)">
                                 </template>
                                 <div class="level3-box">
                                     <van-collapse-item
@@ -393,7 +400,7 @@ function handleConfirmMove(){
                                             </div>
                                         </template>
                                         <template #value>
-                                            <img style="width:22px;height:22px" src="@/assets/imgs/dataEDB/icon_opt.png" alt="" @click.stop="handleShowClassifyOpt(3,level1,level2,level3)">
+                                            <img style="width:22px;height:22px;cursor: pointer;" src="@/assets/imgs/dataEDB/icon_opt.png" alt="" @click.stop="handleShowClassifyOpt(3,level1,level2,level3)">
                                         </template>
                                     </van-collapse-item>
                                 </div>
@@ -495,4 +502,22 @@ function handleConfirmMove(){
     }
 }
 
+
+@media screen and (min-width:$media-width){
+    .edb-classify-wrap{
+        .top-box{
+            height: calc(var(--van-popup-close-icon-margin) + 50px);
+        }
+        .bot-btn-box{
+            padding: 24px;
+        }
+    }
+    .edit-classify-wrap{
+        padding: 16px 24px;
+        .input-box{
+            padding: 12px 16px;
+            border-radius: 6px;
+        }
+    }
+}
 </style>

src/views/dataEDB/components/EDBDataDetail.vue

@@ -11,6 +11,10 @@ const props=defineProps({
         type:Object,
         default:null,
         require:true
+    },
+    langType:{//当前显示的语言
+        type:String,
+        default:'zh'
     }
 })
 
@@ -78,11 +82,11 @@ function refreshList(){
                     </li>
                     <li class="info-item">
                         <span>频度</span>
-                        <span class="con">{{props.edbInfo.Frequency}}</span>
+                        <span class="con">{{props.langType==='zh'?props.edbInfo.Frequency:props.edbInfo.FrequencyEn||props.edbInfo.Frequency}}</span>
                     </li>
                     <li class="info-item">
                         <span>单位</span>
-                        <span class="con">{{props.edbInfo.Unit}}</span>
+                        <span class="con">{{props.langType==='zh'?props.edbInfo.Unit:props.edbInfo.UnitEn||props.edbInfo.Unit}}</span>
                     </li>
                     <li class="info-item">
                         <span>数据来源</span>
@@ -197,4 +201,36 @@ function refreshList(){
         }
     }
 }
+@media screen and (min-width:$media-width){
+    .edb-data-wrap{
+        :deep(.van-cell){
+            padding-left: $page-padding;
+        }
+    }
+    .info-list{
+        .info-item{
+            padding: 16px 16px 16px $page-padding ;
+            font-size: 16px;
+        }
+    }
+    .data-list-box{
+        border-top-width: 8px;
+        .label{
+            font-size: 18px;
+            padding-top: 24px;
+            padding-left: $page-padding;
+            margin-bottom: 14px;
+        }
+        .data-item{
+            padding: 0 $page-padding;
+            height: 43px;
+            .val{
+                padding: 0 10px;
+                line-height: 28px;
+                border-radius: 4px;
+                min-width: 40px;
+            }
+        }
+    }
+}
 </style>

src/views/dataEDB/components/EditBaseEDB.vue

@@ -277,4 +277,15 @@ async function handleSave(){
         }
     }
 }
+@media screen and (min-width:$media-width){
+    .edit-baseEDB-wrap{
+        .edit-icon{
+            width: 24px;
+            height: 24px;
+        }
+        :deep(.van-field__right-icon){
+            width: 30px;
+        }
+    }
+}
 </style>

src/views/dataEDB/components/SetEDBInfoEn.vue

@@ -99,4 +99,20 @@ async function handleSave(){
         }
     }
 }
+@media screen and (min-width:$media-width){
+    .edb-info-set-en-wrap{
+        padding: 24px;
+        .info-item{
+            margin-bottom: 16px;
+            .label{
+                font-size: 16px;
+                line-height: 28px;
+            }
+            .input{
+                padding: 12px 16px;
+                border-radius: 6px;
+            }
+        }
+    }
+}
 </style>

src/views/dataEDB/components/SetEDBNewData.vue

@@ -182,4 +182,40 @@ async function handleSave(){
         }
     }
 }
+
+@media screen and (min-width:$media-width){
+    .set-edb-newdata-wrap{
+        padding: 10px 21px;
+        .label{
+            line-height: 28px;
+            font-size: 16px;
+        }
+        .flex-data-box{
+            margin: 20px 0;
+            .item{
+                padding: 0 5px;
+            }
+        }
+        .input-box{
+            margin-top: 20px;
+            .select-date-box{
+                padding: 6px 16px;
+                max-width: 140px;
+                border-radius: 6px;
+                svg{
+                    width: 20px;
+                    height: 20px;
+                }
+                input{
+                    width: 90px;
+                }
+            }
+            .val-input{
+                padding: 6px 16px;
+                border-radius: 6px;
+                max-width: 100px;
+            }
+        }
+    }
+}
 </style>

src/views/tabbar/Home.vue

@@ -5,7 +5,9 @@ import {apiMenuList} from '@/api/user'
 import {getStaticImg} from '@/hooks/common'
 import {useCachedViewsStore} from '@/store/modules/cachedViews'
 import { showToast } from 'vant';
+import { useWindowSize } from '@vueuse/core'
 
+const { width } = useWindowSize()
 const cachedViewsStore=useCachedViewsStore()
 cachedViewsStore.removeCaches(-1)
 
@@ -32,6 +34,23 @@ function languageVersionChange(){
         language_version.value='zh'
     }
 }
+const topImg=computed(()=>{
+    let url=''
+    if(width.value>650){//大屏
+        if(language_version.value==='zh'){
+            url='https://hzstatic.hzinsights.com/static/ETA_mobile/tabbar_home_topimg_zh_big.png'
+        }else{
+            url='https://hzstatic.hzinsights.com/static/ETA_mobile/tabbar_home_topimg_en_big.png'
+        }
+    }else{
+        if(language_version.value==='zh'){
+            url='https://hzstatic.hzinsights.com/static/ETA_mobile/tabbar_home_topimg_zh.png'
+        }else{
+            url='https://hzstatic.hzinsights.com/static/ETA_mobile/tabbar_home_topimg_en.png'
+        }
+    }
+    return url
+})
 /**
  * name 显示的名称
  * key 对应接口中的 name
@@ -197,7 +216,7 @@ getMenuList()
     <div class="home-page">
         <img 
             class="top-img"
-            :src="language_version==='zh'?'https://hzstatic.hzinsights.com/static/ETA_mobile/tabbar_home_topimg_en.png':'https://hzstatic.hzinsights.com/static/ETA_mobile/tabbar_home_topimg_zh.png'" 
+            :src="topImg" 
             alt=""
             @click="languageVersionChange"
         >
@@ -228,6 +247,7 @@ getMenuList()
         display: block;
         width: 100%;
         margin-bottom: 40px;
+        cursor: pointer;
     }
     .list{
         display: flex;
@@ -241,6 +261,7 @@ getMenuList()
             justify-content: center;
             align-items: center;
             border-radius: 32px;
+            cursor: pointer;
             .icon{
                 width: 90px;
                 height: 90px;
@@ -275,18 +296,39 @@ getMenuList()
 @media screen and (min-width:$media-width){
     .home-page{
         padding: 30px 34px;
+        max-width: 1180px;
+        margin: 0 auto;
+        .top-img{
+            width: 100%;
+            margin-bottom: 20px;
+        }
         .list{
-            justify-content: center;
+            gap: 20px;
             .item-box{
-                width: 240px;
-                height: 240px;
-                margin: 0 20px 20px;
-                font-size: 20px;
+                width: 260px;
+                min-height: 161px;
                 border-radius: 32px;
-                img{
-                    width: 80px;
-                    height: 80px;
-                    margin-bottom: 30px;
+                padding: 36px 11px;
+                .icon{
+                    width: 70px;
+                    height: 70px;
+                    margin-right: 6px;
+                }
+                .content{
+                    .name{
+                        font-size: 32px;
+                    }
+                    .des{
+                        font-size: 20px;
+                        margin-top: 6px;
+                    }
+                }
+            }
+            .item-box_en{
+                .icon{
+                    width: 70px;
+                    height: 70px;
+                    margin-bottom: 6px;
                 }
             }
         }