jwyu 2 years ago
parent
commit
307af28f8b

+ 11 - 0
src/views/hzyb/chart/Detail.vue

@@ -1544,6 +1544,9 @@ const posterParams=computed(()=>{
 <style lang="scss" scoped>
 ::v-deep(.highcharts-axis-title) {
     font-size: 20px;
+    @media (min-width: 768px){
+        font-size: 16px;
+    }
 }
 .chart-detail{
     .flex{
@@ -1555,6 +1558,10 @@ const posterParams=computed(()=>{
         font-weight: bold;
         color: #1F243A;
         letter-spacing: 2px;
+        @media (min-width: 768px){
+            padding: 0px 0 20px 0;
+            font-size: 18px;
+        }
     }
     .top-box{
         padding: 20px 34px 40px 34px;
@@ -1631,6 +1638,10 @@ const posterParams=computed(()=>{
                 background-color: #E3B377;
             }
         }
+        @media (min-width: 768px){
+            padding: 0;
+            font-size: 16px;
+        }
     }
 
     .date-type-box{

+ 15 - 0
src/views/hzyb/chart/component/chartBox.vue

@@ -233,6 +233,21 @@ watch(
 }
 @media (min-width: 768px){
 	.chart-wrap{
+		margin-top: 30px;
+		.chart-top-labels{
+			padding: 0;
+			max-height: 200px;
+			.item{
+				font-size: 16px;
+				margin-right: 30px;
+				margin-bottom: 10px;
+				cursor: pointer;
+				.color{
+					width: 30px;
+					height: 4px;
+				}
+			}
+		}
 		.chart-box{
 			height: 500px;
 		}

+ 23 - 5
src/views/hzyb/chart/component/collectBox.vue

@@ -69,7 +69,6 @@ async function collectChartCancel(){
 }
 
 let showTrans=ref(false)
-let showTransPc=ref(false)
 function handleShowTrans(type){
     if(!isCollect.value){
         Toast('您已经取消收藏,不可操作转移')
@@ -78,7 +77,12 @@ function handleShowTrans(type){
     if(type==='mobile'){
         showTrans.value=true
     }else{
-        showTransPc.value=true
+        // pc端转移
+        window.parent.postMessage({
+            opt:'pcShowTransClassify',
+            myChartId:props.myChartInfo.my_chart_id,
+            classifyId:props.myChartInfo.my_chart_classify_id||0
+        },"*")
     }
     transData.selectId=props.myChartInfo.my_chart_classify_id||0
     getClassify()
@@ -110,12 +114,18 @@ async function handleTrans(){
         Toast('转移成功')
         props.myChartInfo.my_chart_classify_id=transData.selectId
         showTrans.value=false
-        showTransPc.value=false
     }else{
         Toast(res.msg)
     }
 }
 
+window.addEventListener('message',e=>{
+    // 监听转移了分类
+    if(e.data.opt=="updateClassifyId"){
+        props.myChartInfo.my_chart_classify_id=e.data.id
+    }
+})
+
 
 </script>
 
@@ -175,6 +185,14 @@ async function handleTrans(){
     }
 }
 @media (min-width: 768px){
+    .collect-box{
+        padding: 0;
+        font-size: 16px;
+        span{
+            cursor: pointer;
+            margin-right: 30px;
+        }
+    }
     .trans{
         display: none;
     }
@@ -184,8 +202,8 @@ async function handleTrans(){
         &::before{
             content: '';
             display: inline-block;
-            width: 26px;
-            height: 26px;
+            width: 18px;
+            height: 18px;
             background-image: url('@/assets/hzyb/chart/transf.png');
             background-size: cover;
             vertical-align: middle;