首页 发现 帮助
登录
eta_front
/
eta_chart_front
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

fix css

Karsa 3 年之前
父节点
99ff6801ee
当前提交
54711ba1ce
共有 5 个文件被更改，包括 8 次插入 和 22 次删除
合并视图 显示文件统计
  1. 0 1
      index.html
  2. 1 1
      src/components/chart.vue
  3. 0 13
      src/static/js/rem.js
  4. 3 3
      src/views/chartShow/index.less
  5. 4 4
      src/views/chartShow/index.vue

+ 0 - 1
index.html
查看文件 

@@ -8,7 +8,6 @@
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>
 
-    <script src="/src/static/js/rem.js"></script>
 
     <script type="module" src="/src/main.ts"></script>
 
     <script type="module" src="/src/main.ts"></script>
 
   </body>
 
   </body>
 
 </html>
 
 </html>

+ 1 - 1
src/components/chart.vue
查看文件 

@@ -5,7 +5,7 @@
 
 
 
 <script lang="ts">
 
 <script lang="ts">
 
 import { defineComponent, ref, watch,onMounted,PropType } from 'vue';
 
 import { defineComponent, ref, watch,onMounted,PropType } from 'vue';
 
-import Highcharts,{} from 'highcharts/highstock';
 
+import Highcharts from 'highcharts/highstock';
 
 import HighchartszhCN  from '@/utils/highcahrts-zh_CN';
 
 import HighchartszhCN  from '@/utils/highcahrts-zh_CN';
 
 import { defaultOpts } from '@/utils/chartOptions';
 
 import { defaultOpts } from '@/utils/chartOptions';
 
 import { IChart } from '@/types';
 
 import { IChart } from '@/types';

+ 0 - 13
src/static/js/rem.js
查看文件 

@@ -1,13 +0,0 @@
 
-! function () {
 
-	var timer,
 
-		rem = function rem() {
 
-			var w = window.innerWidth >= 1200 ? 1200 : window.innerWidth;
 
-			document.querySelector('html').style.fontSize = parseInt(w / 1200 * 100) + 'px';
 
-		};
 
-
 
-	window.addEventListener('resize', function () {
 
-		clearTimeout(timer);
 
-		timer = setTimeout(rem, 10);
 
-	});
 
-	rem();
 
-}();

+ 3 - 3
src/views/chartShow/index.less
查看文件 

@@ -38,7 +38,7 @@
 
 		}
 
 		}
 
 		.notfound {
 
 		.notfound {
 
 			padding: 2rem;
 
 			padding: 2rem;
 
-			font-size: 0.25rem;
 
+			font-size: 25px;
 
 			color: #777;
 
 			color: #777;
 
 			text-align: center;
 
 			text-align: center;
 
 			.el-icon-warning {
 
 			.el-icon-warning {
 
@@ -64,7 +64,7 @@
 
 	@media (max-width: 1200px) {
 
 	@media (max-width: 1200px) {
 
 		.chart-header {
 
 		.chart-header {
 
 			font-size: 16px;
 
 			font-size: 16px;
 
-			padding: 0.04rem 0.2rem;
 
+			padding: 4px 20px;
 
 		}
 
 		}
 
 		.chart-show {
 
 		.chart-show {
 
 			width: 100%;
 
 			width: 100%;
 
@@ -73,6 +73,6 @@
 
 			width: 100vw;
 
 			width: 100vw;
 
 			height: calc(100vh - 60px);
 
 			height: calc(100vh - 60px);
 
 			max-height: calc(100vw - 60px);
 
 			max-height: calc(100vw - 60px);
 
-			padding: 0 0.05rem 0.1rem;
 
+			padding: 0 5px 10px;
 
 		}
 
 		}
 
 	}
 
 	}

+ 4 - 4
src/views/chartShow/index.vue
查看文件 

@@ -11,7 +11,7 @@
 
         element-loading-spinner="el-icon-loading"
 
         element-loading-spinner="el-icon-loading"
 
         element-loading-text="加载中..."
 
         element-loading-text="加载中..."
 
       >
 
       >
 
-        <chart :options="options" :chartId="1" />
 
+        <chart :options="options" :chartId="chartInfo.ChartInfoId" />
 
       </div>
 
       </div>
 
     </template>
 
     </template>
 
     <div class="chart-wrapper notfound" v-else>
 
     <div class="chart-wrapper notfound" v-else>
 
@@ -347,9 +347,9 @@ export default defineComponent({
 
             };
 
             };
 
 
 
         //农历图调整顶部缩进
 
         //农历图调整顶部缩进
 
-        if (state.chartInfo.Calendar === '农历') chart = {
 
-          spacingTop: -24,
 
-        }
 
+        // if (state.chartInfo.Calendar === '农历') chart = {
 
+        //   spacingTop: -24,
 
+        // }
 
 
 
         state.options = {
 
         state.options = {
 
           colors:
 
           colors: