From 9dcc346205e2c96b28f2f561f439a29bc6c2a6dc Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 16 四月 2026 15:34:06 +0800
Subject: [PATCH] 仅七天玉米价格,添加默认从粮食单价获取

---
 fzzy-igdss-web/src/main/resources/templates/main.html |  133 ++++++++++++++++++++++++++++++--------------
 1 files changed, 91 insertions(+), 42 deletions(-)

diff --git a/fzzy-igdss-web/src/main/resources/templates/main.html b/fzzy-igdss-web/src/main/resources/templates/main.html
index d7b7225..8ae77d8 100644
--- a/fzzy-igdss-web/src/main/resources/templates/main.html
+++ b/fzzy-igdss-web/src/main/resources/templates/main.html
@@ -129,16 +129,24 @@
     
     <!-- 缁熻鍥捐〃 -->
     <div class="layui-row layui-col-space15">
-        <div class="layui-col-md4 layui-col-sm6">
-            <div class="layui-card" style="overflow: hidden;">
-                <div class="layui-card-header">鏃ュ嚭鍏ュ簱缁熻</div>
-                <div class="layui-card-body">
-                    <div id="consoleChartsDay" style="height: 300px;"></div>
-                </div>
-            </div>
-        </div>
-        
-        <div class="layui-col-md4 layui-col-sm6">
+<!--        <div class="layui-col-md4 layui-col-sm6">-->
+<!--            <div class="layui-card" style="overflow: hidden;">-->
+<!--                <div class="layui-card-header">鏃ュ嚭鍏ュ簱缁熻</div>-->
+<!--                <div class="layui-card-body">-->
+<!--                    <div id="consoleChartsDay" style="height: 300px;"></div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        -->
+<!--        <div class="layui-col-md4 layui-col-sm6">-->
+<!--            <div class="layui-card" style="overflow: hidden;">-->
+<!--                <div class="layui-card-header">杩�7澶╁嚭鍏ュ簱缁熻</div>-->
+<!--                <div class="layui-card-body">-->
+<!--                    <div id="consoleChartsWeek" style="height: 300px;"></div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+        <div class="layui-col-md8">
             <div class="layui-card" style="overflow: hidden;">
                 <div class="layui-card-header">杩�7澶╁嚭鍏ュ簱缁熻</div>
                 <div class="layui-card-body">
@@ -164,7 +172,8 @@
         </div>
         <div class="layui-col-md6">
             <div class="layui-card">
-                <div class="layui-card-header">杩�7澶╂姄鎷嶇粺璁�</div>
+<!--                <div class="layui-card-header">杩�7澶╂姄鎷嶇粺璁�</div>-->
+                <div class="layui-card-header">杩�7澶╃帀绫冲嚭搴撴渶浣庡崟浠风粺璁�</div>
                 <div class="layui-card-body">
                     <div id="snapChartsWeek" style="height: 300px;"></div>
                 </div>
@@ -184,26 +193,26 @@
         var layer = layui.layer;
 
         /** 娓叉煋鏃ョ粺璁″浘琛� */
-        var myCharts1 = echarts.init(document.getElementById('consoleChartsDay'));
-        var options1 = {
-            title: {
-                text: '鍏ュ簱杞︽/鍑哄簱杞︽', x: 'center', y: '32%',
-                textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
-                subtextStyle: {fontSize: 56, color: '#10B4E8'}, itemGap: 20
-            },
-            color: ['#10B4E8', '#FFA800'],
-            tooltip: {trigger: 'item'},
-            legend: {
-                orient: 'vertical', right: '0px', top: '0px',
-                data: ['鍏ュ簱杞︽', '鍑哄簱杞︽'], textStyle: {color: '#595959'}
-            },
-            series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
-        };
-        myCharts1.setOption(options1);
-        // 璧嬪��
-        myCharts1.setOption({
-            title: {subtext: mainData.inNumDay + "/" + mainData.outNumDay}, series: [{data: [{name: '鍏ュ簱杞︽', value: mainData.inNumDay}, {name: '鍑哄簱杞︽', value: mainData.outNumDay}]}]
-        });
+        // var myCharts1 = echarts.init(document.getElementById('consoleChartsDay'));
+        // var options1 = {
+        //     title: {
+        //         text: '鍏ュ簱杞︽/鍑哄簱杞︽', x: 'center', y: '32%',
+        //         textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
+        //         subtextStyle: {fontSize: 56, color: '#10B4E8'}, itemGap: 20
+        //     },
+        //     color: ['#10B4E8', '#FFA800'],
+        //     tooltip: {trigger: 'item'},
+        //     legend: {
+        //         orient: 'vertical', right: '0px', top: '0px',
+        //         data: ['鍏ュ簱杞︽', '鍑哄簱杞︽'], textStyle: {color: '#595959'}
+        //     },
+        //     series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
+        // };
+        // myCharts1.setOption(options1);
+        // // 璧嬪��
+        // myCharts1.setOption({
+        //     title: {subtext: mainData.inNumDay + "/" + mainData.outNumDay}, series: [{data: [{name: '鍏ュ簱杞︽', value: mainData.inNumDay}, {name: '鍑哄簱杞︽', value: mainData.outNumDay}]}]
+        // });
 
         /** 娓叉煋鍛ㄧ粺璁″浘琛� */
         var myCharts2 = echarts.init(document.getElementById('consoleChartsWeek'));
@@ -342,26 +351,65 @@
         myCharts4.setOption({series: [{data: mainData.weekAiNumList}]});
 
         /** 娓叉煋鍛ㄧ粺璁″浘琛� */
-        var myCharts5 = echarts.init(document.getElementById('snapChartsWeek'));
-        var options5 = {
+        // var myCharts5 = echarts.init(document.getElementById('snapChartsWeek'));
+        // var options5 = {
+        //     tooltip: {trigger: 'axis', axisPointer: {lineStyle: {color: '#E0E0E0'}}},
+        //     color: ['#FFA800'],
+        //     legend: {
+        //         orient: 'vertical', right: '0px', top: '0px',
+        //         data: ['鎶撴媿鏁�'], textStyle: {color: '#595959'}
+        //     },
+        //     grid: {top: '75px', left: '35px', right: '55px', bottom: '40px'},
+        //     xAxis: {
+        //         name: '鏃ユ湡',
+        //         nameTextStyle: {color: '#595959'},
+        //         type: 'category',
+        //         data: mainData.weekSnapDateList,
+        //         axisLine: {lineStyle: {color: '#E0E0E0'}, symbol: ['none', 'arrow'], symbolOffset: [0, 10]},
+        //         axisLabel: {color: '#8c8c8c'},
+        //         axisTick: {alignWithLabel: true}
+        //     },
+        //     yAxis: {
+        //         name: '鏁伴噺',
+        //         nameTextStyle: {color: '#595959'},
+        //         type: 'value',
+        //         boundaryGap: ['0', '20%'],
+        //         axisTick: {show: false},
+        //         axisLine: {lineStyle: {color: '#E0E0E0'}, symbol: ['none', 'arrow'], symbolOffset: [0, 10]},
+        //         axisLabel: {color: '#8c8c8c'},
+        //         splitLine: {show: false},
+        //         splitArea: {show: false},
+        //         minInterval: 1
+        //     },
+        //     series: [{
+        //         name: '鎶撴媿淇℃伅', type: 'bar', stack: 'one', barMaxWidth: '30px',
+        //         label: {normal: {show: true, position: 'inside'}}
+        //     }]
+        // };
+        // myCharts5.setOption(options5);
+        // // 璧嬪��
+        // myCharts5.setOption({series: [{data: mainData.weekSnapNumList}]});
+         //娓叉煋鐜夌背7澶╁嚭搴撴渶浣庝环鏍�
+        var myCharts6 = echarts.init(document.getElementById('snapChartsWeek'));
+        var options6 = {
             tooltip: {trigger: 'axis', axisPointer: {lineStyle: {color: '#E0E0E0'}}},
             color: ['#FFA800'],
             legend: {
                 orient: 'vertical', right: '0px', top: '0px',
-                data: ['鎶撴媿鏁�'], textStyle: {color: '#595959'}
+                data: ['鍑哄簱鍗曚环'], textStyle: {color: '#595959'}
             },
-            grid: {top: '75px', left: '35px', right: '55px', bottom: '40px'},
+            grid: {top: '75px', left: '55px', right: '55px', bottom: '40px'},
             xAxis: {
                 name: '鏃ユ湡',
                 nameTextStyle: {color: '#595959'},
                 type: 'category',
-                data: mainData.weekSnapDateList,
+                data: mainData.weekMaizeDateList,
                 axisLine: {lineStyle: {color: '#E0E0E0'}, symbol: ['none', 'arrow'], symbolOffset: [0, 10]},
                 axisLabel: {color: '#8c8c8c'},
                 axisTick: {alignWithLabel: true}
             },
             yAxis: {
-                name: '鏁伴噺',
+                name: '浠锋牸锛堝厓/鍏枻锛�',
                 nameTextStyle: {color: '#595959'},
                 type: 'value',
                 boundaryGap: ['0', '20%'],
@@ -373,21 +421,22 @@
                 minInterval: 1
             },
             series: [{
-                name: '鎶撴媿淇℃伅', type: 'bar', stack: 'one', barMaxWidth: '30px',
+                name: '鏈�浣庡崟浠�', type: 'bar', stack: 'one', barMaxWidth: '30px',
                 label: {normal: {show: true, position: 'inside'}}
             }]
         };
-        myCharts5.setOption(options5);
+        myCharts6.setOption(options6);
         // 璧嬪��
-        myCharts5.setOption({series: [{data: mainData.weekSnapNumList}]});
+        myCharts6.setOption({series: [{data: mainData.weekMaizeNumList}]});
 
         /** 绐楀彛澶у皬鏀瑰彉浜嬩欢 */
         window.onresize = function () {
-            myCharts1.resize();
+            // myCharts1.resize();
             myCharts2.resize();
             myCharts3.resize();
             myCharts4.resize();
-            myCharts5.resize();
+            // myCharts5.resize();
+            myCharts6.resize();
         };
 
     });

--
Gitblit v1.9.3