jwyu 1 year ago
parent
commit
85969a3210

+ 2 - 0
src/hooks/edb/useCopyEdbData.js

@@ -20,6 +20,8 @@ export function useCopyEdbData(){
             copyText(str,undefined,(error,event)=>{
             copyText(str,undefined,(error,event)=>{
                 if(error){
                 if(error){
                     showToast('复制失败')
                     showToast('复制失败')
+                    console.log('复制数据失败',error);
+                    throw new Error(error)
                 }else{
                 }else{
                     showToast('复制成功')
                     showToast('复制成功')
                 }
                 }

+ 1 - 1
src/views/dataEDB/Detail.vue

@@ -21,7 +21,7 @@ const {copyData} =useCopyEdbData()
 const route=useRoute()
 const route=useRoute()
 const router=useRouter()
 const router=useRouter()
 
 
-const activeType=ref('chart')
+const activeType=ref(route.query.showType||'chart')
 
 
 const chartDetailIns=ref(null)//图表组件实例
 const chartDetailIns=ref(null)//图表组件实例
 const dataDetailIns=ref(null)//数据详情组件实例
 const dataDetailIns=ref(null)//数据详情组件实例

+ 1 - 1
src/views/dataEDB/Index.vue

@@ -257,7 +257,7 @@ async function goSearch(){
                             :src="item.ChartImage"
                             :src="item.ChartImage"
                         />
                         />
                         <div>
                         <div>
-                            <span class="time">{{item.StartDate}}</span>
+                            <span class="time">{{item.CreateTime.substring(0,10)}}</span>
                             <svg 
                             <svg 
                                 class="opt-icon" 
                                 class="opt-icon" 
                                 xmlns="http://www.w3.org/2000/svg" 
                                 xmlns="http://www.w3.org/2000/svg" 

+ 19 - 8
src/views/dataEDB/RelationEDB.vue

@@ -50,6 +50,18 @@ function onLoad(){
 function handleCopyEDBData(e){
 function handleCopyEDBData(e){
     copyData({EdbInfoId:e.EdbInfoId})
     copyData({EdbInfoId:e.EdbInfoId})
 }
 }
+
+// 查看数据
+function goDetail(e){
+    router.push({
+        path:'/dataEDB/detail',
+        query:{
+            edbInfoId:e.EdbInfoId,
+            showType:'data'
+        }
+    })
+}
+
 </script>
 </script>
 
 
 <template>
 <template>
@@ -74,12 +86,12 @@ function handleCopyEDBData(e){
                             <li class="info-item">最新日期:{{item.LatestDate}}</li>
                             <li class="info-item">最新日期:{{item.LatestDate}}</li>
                             <li class="info-item">单位:{{item.Unit}}</li>
                             <li class="info-item">单位:{{item.Unit}}</li>
                             <li class="info-item">最新值:{{item.LatestValue}}</li>
                             <li class="info-item">最新值:{{item.LatestValue}}</li>
-                            <li class="info-item" style="width:100%">最近更新:{{item.ModifyTime}}</li>
-                            <li class="info-item" style="width:100%">数据来源:{{item.SourceName}}</li>
+                            <li class="info-item">最近更新:{{item.ModifyTime}}</li>
+                            <li class="info-item">数据来源:{{item.SourceName}}</li>
                         </ul>
                         </ul>
                         <div style="text-align:right">
                         <div style="text-align:right">
                             <van-button color="#F2F3FF" size="small" style="color:#0052D9;margin-right:10px" @click="handleCopyEDBData(item)">复制数据</van-button>
                             <van-button color="#F2F3FF" size="small" style="color:#0052D9;margin-right:10px" @click="handleCopyEDBData(item)">复制数据</van-button>
-                            <van-button color="#0052D9" size="small">查看数据</van-button>
+                            <van-button color="#0052D9" size="small" @click="goDetail(item)">查看数据</van-button>
                         </div>
                         </div>
                     </li>
                     </li>
                 </ul>
                 </ul>
@@ -107,13 +119,10 @@ function handleCopyEDBData(e){
             font-size: 32px;
             font-size: 32px;
         }
         }
         .info-list{
         .info-list{
-            display: flex;
-            flex-wrap: wrap;
-            gap: 10px 0;
             color: $font-grey;
             color: $font-grey;
             margin-bottom: 10px;
             margin-bottom: 10px;
             .info-item{
             .info-item{
-                width: 50%;
+                margin-bottom: 10px;
             }
             }
         }
         }
     }
     }
@@ -134,8 +143,10 @@ function handleCopyEDBData(e){
                 font-size: 16px;
                 font-size: 16px;
             }
             }
             .info-list{
             .info-list{
-                gap: 5px 0;
                 margin-bottom: 5px;
                 margin-bottom: 5px;
+                .info-item{
+                    margin-bottom: 5px;
+                }
             }
             }
         }
         }
     }
     }

+ 1 - 1
src/views/dataEDB/components/EDBChartDetail.vue

@@ -511,7 +511,7 @@ const selectEndDate=ref('')
 function handleConfrimSelectDate(e){
 function handleConfrimSelectDate(e){
     selectStartDate.value=e[0].selectedValues.join('-')
     selectStartDate.value=e[0].selectedValues.join('-')
     selectEndDate.value=e[1].selectedValues.join('-')
     selectEndDate.value=e[1].selectedValues.join('-')
-    selectYear.value=''
+    selectYear.value=5
     if(chartType.value==='季节性图'){
     if(chartType.value==='季节性图'){
         getEDBSeasonChartData()
         getEDBSeasonChartData()
     }else{
     }else{

+ 2 - 2
src/views/dataEDB/components/EDBClassify.vue

@@ -96,7 +96,7 @@ watch(
 )
 )
 function handleAddLevel1(){
 function handleAddLevel1(){
     classifyState.title='添加一级目录'
     classifyState.title='添加一级目录'
-    classifyState.placeholderText='请输入一级分类名称'
+    classifyState.placeholderText='请输入一级目录名称'
     classifyState.show=true
     classifyState.show=true
 }
 }
 async function handleConfirmClassifyState(){
 async function handleConfirmClassifyState(){
@@ -143,7 +143,7 @@ watch(
 )
 )
 // 显示分类的具体操作选项
 // 显示分类的具体操作选项
 function handleShowClassifyOpt(level,level1,level2,level3){
 function handleShowClassifyOpt(level,level1,level2,level3){
-    const optArr=[
+    let optArr=[
         {name:'重命名',type:'edit'},
         {name:'重命名',type:'edit'},
         {name:'删除',type:'delete',color:"#C54322"}
         {name:'删除',type:'delete',color:"#C54322"}
     ]
     ]

+ 7 - 1
src/views/dataEDB/components/EDBDataDetail.vue

@@ -30,6 +30,7 @@ const listState=reactive({
     finished:false,
     finished:false,
     loading:false,
     loading:false,
     LatestDate:'',
     LatestDate:'',
+    insertDate:'',//插入的日期
     classifyVal:''
     classifyVal:''
 })
 })
 async function getEDBDataList(){
 async function getEDBDataList(){
@@ -44,6 +45,7 @@ async function getEDBDataList(){
         const arr=res.Data?.Item.DataList||[]
         const arr=res.Data?.Item.DataList||[]
         listState.list=[...listState.list,...arr]
         listState.list=[...listState.list,...arr]
         listState.LatestDate=res.Data?.Item.LatestDate
         listState.LatestDate=res.Data?.Item.LatestDate
+        listState.insertDate=res.Data?.Item.DataInsertConfig.Date
         listState.finished=res.Data.Paging.IsEnd
         listState.finished=res.Data.Paging.IsEnd
         const classifyNameArr=[]
         const classifyNameArr=[]
         res.Data.ClassifyList.forEach(e=>{
         res.Data.ClassifyList.forEach(e=>{
@@ -113,6 +115,7 @@ function refreshList(){
         </van-collapse>
         </van-collapse>
         <ul class="data-list-box">
         <ul class="data-list-box">
             <div class="label">数据信息</div>
             <div class="label">数据信息</div>
+            <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="">
             <van-list
             <van-list
                 v-model:loading="listState.loading"
                 v-model:loading="listState.loading"
                 :finished="listState.finished"
                 :finished="listState.finished"
@@ -122,7 +125,7 @@ function refreshList(){
             >
             >
                 <li class="data-item" v-for="item in listState.list" :key="item">
                 <li class="data-item" v-for="item in listState.list" :key="item">
                     <span :class="['time',listState.LatestDate===item.DataTime?'new-data':'']">{{item.DataTime}}</span>
                     <span :class="['time',listState.LatestDate===item.DataTime?'new-data':'']">{{item.DataTime}}</span>
-                    <span class="val">{{item.Value}}</span>
+                    <span :class="['val',listState.insertDate===item.DataTime?'insert-data':'']">{{item.Value}}</span>
                 </li>
                 </li>
             </van-list>
             </van-list>
             
             
@@ -199,6 +202,9 @@ function refreshList(){
             min-width: 60px;
             min-width: 60px;
             text-align: center;
             text-align: center;
         }
         }
+        .insert-data{
+            color: orange;
+        }
     }
     }
 }
 }
 @media screen and (min-width:$media-width){
 @media screen and (min-width:$media-width){

+ 1 - 1
src/views/dataEDB/components/SetEDBNewData.vue

@@ -162,7 +162,7 @@ async function handleSave(){
             display: flex;
             display: flex;
             align-items: center;
             align-items: center;
             padding: 12px 32px;
             padding: 12px 32px;
-            max-width: 280px;
+            max-width: 350px;
             border-radius: 12px;
             border-radius: 12px;
             svg{
             svg{
                 width: 32px;
                 width: 32px;