决策大屏调整

app/view/datacollect/index4GY18Y.ejs

@@ -256,8 +256,11 @@
         tooltip: {
             trigger: 'axis',
             axisPointer: {            // 坐标轴指示器，坐标轴触发有效
-                type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
+                type: 'shadow',        // 默认为直线，可选为：'line' | 'shadow'
             },
+            position: function (pos, params, dom, rect, size) {
+                return {top: pos[1], left: pos[0]};
+            }
         },
         dataZoom: [
             {
@@ -300,8 +303,8 @@
                     },
                     formatter: function(value) {
                         var res = value;
-                        if(res.length > 6) {
-                            res = res.substring(0, 5) + "..";
+                        if(res.length > 5) {
+                            res = res.substring(0, 4) + "..";
                         }
                         return res;
                     },
@@ -813,6 +816,11 @@
         dpgl_charts[d] = echarts.init(dpgl_chart[d], 'dark');
         const option = _.cloneDeep(dpglChartOption);
         option.title.text = dpCategory[d].value;
+        if (d == 0) {
+            option.tooltip.position = function (pos, params, dom, rect, size) {
+                return {top: pos[1], left: pos[0]};
+            }
+        }
         dpgl_charts[d].setOption(option);
     }
     let tenders = '';
@@ -965,12 +973,12 @@
             // 工程收入明细
             const gcsrmx_chart_option = gcsrmxChart.getOption();
             gcsrmx_chart_option.dataZoom[0].start = 0;
-            gcsrmx_chart_option.dataZoom[0].end = computedPosition(sr_tenders.length);
+            gcsrmx_chart_option.dataZoom[0].end = computedPosition(sr_tenders.length, 6);
             gcsrmx_chart_option.xAxis[0].data = srmx_chart_option_name;
             gcsrmx_chart_option.series[0].data = srmx_chart_option_data.end_gather_tp;
             gcsrmx_chart_option.series[1].data = srmx_chart_option_data.end_yf_tp;
             gcsrmx_chart_option.series[2].data = srmx_chart_option_data.end_sf_tp;
-            if (sr_tenders.length >= 8) {
+            if (sr_tenders.length >= 6) {
                 gcsrmx_chart_option.dataZoom[0].show = true;
             } else {
                 gcsrmx_chart_option.dataZoom[0].show = false;
@@ -1192,7 +1200,7 @@
                         }
                         oneCbgl.end_df_tp = ZhCalc.sub(oneCbgl.end_yf_tp, oneCbgl.end_sf_tp);
                         gccbglhz.push(oneCbgl);
-                        dpgl_option.dataZoom[0].end = computedPosition(cbgl_tenders.length, 6);
+                        dpgl_option.dataZoom[0].end = computedPosition(cbgl_tenders.length, 4);
                         dpgl_option.xAxis[0].data = dpgl_chart_option_name;
                         dpgl_option.series[0].data = dpgl_chart_option_data.end_gather_tp;
                         dpgl_option.series[1].data = dpgl_chart_option_data.end_sf_tp;