From daeae185ddefda56ea629ce69ac780a196043e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B0=B4=E6=B7=BC?= <yangshuimiao@jsjd.cc>
Date: Thu, 10 Jul 2025 17:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E8=82=A1=E7=A5=A8=E5=92=8C=E6=8C=87=E6=95=B0=E8=B6=8B=E5=8A=BF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B5=81=E9=80=9A?=
 =?UTF-8?q?=E5=B8=82=E5=80=BC=E5=9B=BE=E8=A1=A8=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E4=B8=AD=E7=9A=84=E5=B0=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deprecated/index_mv_all.php | Bin 0 -> 8192 bytes
 index_mv_all.php            | 126 +++++++++++++++++++++++++++++++-----
 index_trend.php             |  43 ++++++++++--
 stock_trend.php             |  16 +++--
 4 files changed, 158 insertions(+), 27 deletions(-)
 create mode 100644 deprecated/index_mv_all.php

diff --git a/deprecated/index_mv_all.php b/deprecated/index_mv_all.php
new file mode 100644
index 0000000000000000000000000000000000000000..182c491b1ddf160504d3cd51b1922a52938e20dc
GIT binary patch
literal 8192
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
S-s*VUnwBuShmt)%V)+k6TU|x~

literal 0
HcmV?d00001

diff --git a/index_mv_all.php b/index_mv_all.php
index c8a44ec..cae341c 100644
--- a/index_mv_all.php
+++ b/index_mv_all.php
@@ -1,20 +1,24 @@
 <?php
-$_REQUEST['code']=$_REQUEST['code']?$_REQUEST['code']:'sh';  #code:sh sz zx cy
+$_REQUEST['code']=$_REQUEST['code']?$_REQUEST['code']:'000001.SH';  
 $_REQUEST['t_start']=$_REQUEST['t_start']?$_REQUEST['t_start']:'2015-01-01';
 $_REQUEST['t_end']=$_REQUEST['t_end']?$_REQUEST['t_end']:'';
 $title="指数VS两市总市值趋势";
 include_once "html/head.php";
 ?>
+<script src="js/renderCharts.js"></script>
 <form name="main" id="main" method="get"> <div style="width:100%;text-align:center">
 指数代码: 
 <select name='code' id='code'>
-    <option value='sh'>上证指数</option>
-    <option value='sz'>深圳成指</option>
-    <option value='zx'>中小板指</option>
-    <option value='cy'>创业板指</option>
+    <option value='000001.SH'>上证指数</option>
+    <option value='399001.SZ'>深圳成指</option>
+    <option value='399005.SZ'>中小板指</option>
+    <option value='399006.SZ'>创业板指</option>
+    <option value='000016.SH'>上证50</option>
+    <option value='399300.SZ'>沪深300</option>
+    <option value='399905.SZ'>中证500</option>
 </select>&nbsp;
 <script>
-    document.getElementById('code').value='<?=$_REQUEST['code']?>';
+    $('#code').val('<?=$_REQUEST['code']?>');
 </script>
 开始时间: <input type='date' name='t_start' id='t_start' width='30px' value='<?=$_REQUEST['t_start']?>' >
 结束时间: <input type='date' name='t_end' id='t_end' width='30px' value='<?=$_REQUEST['t_end']?>' >
@@ -25,14 +29,106 @@ include_once "html/head.php";
 </div> </form>
 <div >&nbsp;</div>
 
-<div style="width:100%; text-align:center; " id='total_mv'>
-<iframe src="https://echart.doorcome.cn/chartFive.php?s=<?=$_REQUEST['t_start']?>&item=total_mv_all&code=<?=$_REQUEST['code']?>&e=<?=$_REQUEST['t_end']?>"
-height="400px" width="1000px"></iframe>
-</div>
-<div >&nbsp;</div>
-<div style="width:100%; text-align:center; " id='circ_mv'>
-<iframe src="https://echart.doorcome.cn/chartFive.php?s=<?=$_REQUEST['t_start']?>&item=circ_mv_all&code=<?=$_REQUEST['code']?>&e=<?=$_REQUEST['t_end']?>"
-height="400px" width="1000px"></iframe>
-</div>
+<!-- 图表容器 -->
+<div id="total_mv" style="width: 1000px; height:400px; margin: 0 auto 20px;"></div>
+
+<div id="float_mv" style="width: 1000px; height:400px; margin: 0 auto 20px;"></div>
+
+<script>
+    let t_start = $('#t_start').val();
+    let t_end = $('#t_end').val();
+    let code = $("#code").val();
+    let codeName=convertIndexCode(code);
+    url =   "https://api.doorcome.cn/api/indexDatas/?tscode="+code;
+    url +=  "&start_date="+t_start+"&end_date="+t_end;
+    url1 =   "https://api.doorcome.cn/api/indexDatas/?tscode=000001.SH";
+    url1 +=  "&start_date="+t_start+"&end_date="+t_end;
+    url2 =   "https://api.doorcome.cn/api/indexDatas/?tscode=399001.SZ";
+    url2 +=  "&start_date="+t_start+"&end_date="+t_end;
+    Promise.all([
+        fetch(url),
+        fetch(url1),
+        fetch(url2)
+        ])
+        .then(responses => Promise.all(responses.map(r => r.json())))
+        .then(([searchData,SHData,SZData]) => {
+            let dataMain=pickData(searchData, 'trade_date', 'close');
+            let totalMVSH=pickData(SHData, 'trade_date', 'total_mv');
+            let floatMVSH=pickData(SHData, 'trade_date', 'float_mv');
+            let totalMVSZ=pickData(SZData, 'trade_date', 'total_mv');
+            let floatMVSZ=pickData(SZData, 'trade_date', 'float_mv');
+            let data_TotalMV=mergeAndSumArrays(totalMVSH,totalMVSZ);
+            let data_folatMV=mergeAndSumArrays(floatMVSH,floatMVSZ);
+            
+            // 图表配置:total_mv
+            params = {};
+            params.chartid='total_mv';
+            params.legend = [codeName,'总市值-万亿'];
+            params.text = params.legend[0]+' V.S '+params.legend[1];
+            params.data1 = dataMain;
+            params.data2 = data_TotalMV;
+            params.data2 = params.data2.map(item => {
+                return {
+                    value: [
+                        item.value[0], 
+                        parseFloat((parseFloat(item.value[1]) / 10000 / 10000 / 10000).toFixed(2))
+                    ]
+                };
+            });
+            dataCal = calculateStats(params.data2);
+            params.sub_text = "总市值  Max:"+dataCal['max'];
+            params.sub_text += ",  Min:"+dataCal['min'];
+            params.sub_text += ",  Average:"+dataCal['avg'];
+            params.sub_text += ",  Recent:"+dataCal['last'];
+            doubleLineChart(params);
+
+            // 图表配置:float_mv
+            params = {};
+            params.chartid='float_mv';
+            params.legend = [codeName,'流通市值-万亿'];
+            params.text = params.legend[0]+' V.S '+params.legend[1];
+            params.data1 = dataMain;
+            params.data2 = data_folatMV;
+            params.data2 = params.data2.map(item => {
+                return {
+                    value: [
+                        item.value[0], 
+                        parseFloat((parseFloat(item.value[1]) / 10000 / 10000 / 10000).toFixed(2))
+                    ]
+                };
+            });
+            dataCal = calculateStats(params.data2);
+            params.sub_text = "流通市值  Max:"+dataCal['max'];
+            params.sub_text += ",  Min:"+dataCal['min'];
+            params.sub_text += ",  Average:"+dataCal['avg'];
+            params.sub_text += ",  Recent:"+dataCal['last'];
+            doubleLineChart(params);
+        })
+        .catch(error => console.error('数据加载失败:', error));
+// 函数：合并两个数组，日期相同则数字相加
+function mergeAndSumArrays(arr1, arr2) {
+    // 创建一个 Map 来存储日期和对应的数字总和
+    const resultMap = new Map();
+
+    // 处理第一个数组
+    arr1.forEach(item => {
+        const [date, value] = item.value;
+        resultMap.set(date, (resultMap.get(date) || 0) + parseFloat(value));
+    });
+
+    // 处理第二个数组
+    arr2.forEach(item => {
+        const [date, value] = item.value;
+        resultMap.set(date, (resultMap.get(date) || 0) + parseFloat(value));
+    });
+
+    // 将 Map 转换为数组格式
+    const resultArray = Array.from(resultMap, ([date, totalValue]) => ({
+        value: [date, totalValue]
+    }));
+
+    return resultArray;
+}
+</script>
 <?php include_once("html/footer.php"); ?>
 
diff --git a/index_trend.php b/index_trend.php
index 0ecd054..fa7b389 100644
--- a/index_trend.php
+++ b/index_trend.php
@@ -1,4 +1,12 @@
 <?php
+/*
+ * @Author: 杨水淼 yangshuimiao@jsjd.cc
+ * @Date: 2025-07-08 08:16:01
+ * @LastEditors: 杨水淼 yangshuimiao@jsjd.cc
+ * @LastEditTime: 2025-07-09 16:02:10
+ * @FilePath: \echarts\index_trend.php
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 $title="指数VS PE/PB/PS/市值 趋势";
 include_once "html/head.php";
 
@@ -29,6 +37,7 @@ $ts_code    =   $_REQUEST['code'];
 <input type='checkbox' id='cb_pe' onclick="hideSwitch(this.id,'pe_ttm')" checked> PE_TTM 市盈率
 <input type='checkbox' id='cb_pb' onclick="hideSwitch(this.id,'pb')" checked> PB 市净率
 <input type='checkbox' id='cb_total_mv' onclick="hideSwitch(this.id,'total_mv')" checked> 总市值
+<input type='checkbox' id='cb_float_mv' onclick="hideSwitch(this.id,'float_mv')" checked> 流通市值
 </div> </form>
 <div >&nbsp;</div>
  <!-- 图表容器 -->
@@ -36,13 +45,13 @@ $ts_code    =   $_REQUEST['code'];
 <div id="pb" style="width: 1000px; height:400px; margin: 0 auto 20px;"></div>
 <div id="total_mv" style="width: 1000px; height:400px; margin: 0 auto 20px;"></div>
 
+<div id="float_mv" style="width: 1000px; height:400px; margin: 0 auto 20px;"></div>
+
 <script>
     let t_start = $('#t_start').val();
     let t_end = $('#t_end').val();
     let code = $("#code").val();
-    let codeName=convertIndexCode("<?=$_REQUEST['code'] ?>");
-    //let start_date=formatDateToYYYYMMDD("<?=$_REQUEST['t_start'] ?>");
-    //let end_date=formatDateToYYYYMMDD("<?=$_REQUEST['t_end'] ?>");
+    let codeName=convertIndexCode(code);
     url =   "https://api.doorcome.cn/api/indexDatas/?tscode="+code;
     url +=  "&start_date="+t_start+"&end_date="+t_end;
     fetch(url)
@@ -54,7 +63,7 @@ $ts_code    =   $_REQUEST['code'];
             params.legend = [codeName,'pe_ttm'];
             params.text = params.legend[0]+' V.S '+params.legend[1];
             params.data1 = pickData(parsedData, 'trade_date', 'close');
-            params.data2 = pickData(parsedData, 'trade_date', 'pe_ttm')
+            params.data2 = pickData(parsedData, 'trade_date', 'pe_ttm');
             dataCal = calculateStats(params.data2);
             params.sub_text = "TTM PE Max:"+dataCal['max'];
             params.sub_text += ",  Min:"+dataCal['min'];
@@ -67,7 +76,7 @@ $ts_code    =   $_REQUEST['code'];
             params.legend = [codeName,'pb'];
             params.text = params.legend[0]+' V.S '+params.legend[1];
             params.data1 = pickData(parsedData, 'trade_date', 'close');
-            params.data2 = pickData(parsedData, 'trade_date', 'pb')
+            params.data2 = pickData(parsedData, 'trade_date', 'pb');
             dataCal = calculateStats(params.data2);
             params.sub_text = "PB Max:"+dataCal['max'];
             params.sub_text += ",  Min:"+dataCal['min'];
@@ -81,7 +90,7 @@ $ts_code    =   $_REQUEST['code'];
             params.legend = [codeName,'总市值-万亿'];
             params.text = params.legend[0]+' V.S '+params.legend[1];
             params.data1 = pickData(parsedData, 'trade_date', 'close');
-            params.data2 = pickData(parsedData, 'trade_date', 'total_mv')
+            params.data2 = pickData(parsedData, 'trade_date', 'total_mv');
             params.data2 = params.data2.map(item => {
                 return {
                     value: [
@@ -96,6 +105,28 @@ $ts_code    =   $_REQUEST['code'];
             params.sub_text += ",  Average:"+dataCal['avg'];
             params.sub_text += ",  Recent:"+dataCal['last'];
             doubleLineChart(params);
+
+            // 图表配置:float_mv
+            params = {};
+            params.chartid='float_mv';
+            params.legend = [codeName,'流通市值-万亿'];
+            params.text = params.legend[0]+' V.S '+params.legend[1];
+            params.data1 = pickData(parsedData, 'trade_date', 'close');
+            params.data2 = pickData(parsedData, 'trade_date', 'float_mv');
+            params.data2 = params.data2.map(item => {
+                return {
+                    value: [
+                        item.value[0], 
+                        parseFloat((parseFloat(item.value[1]) / 10000 / 10000 / 10000).toFixed(2))
+                    ]
+                };
+            });
+            dataCal = calculateStats(params.data2);
+            params.sub_text = "流通市值  Max:"+dataCal['max'];
+            params.sub_text += ",  Min:"+dataCal['min'];
+            params.sub_text += ",  Average:"+dataCal['avg'];
+            params.sub_text += ",  Recent:"+dataCal['last'];
+            doubleLineChart(params);
         })
         .catch(error => console.error('数据加载失败:', error));
 
diff --git a/stock_trend.php b/stock_trend.php
index 96247c0..1a211b2 100644
--- a/stock_trend.php
+++ b/stock_trend.php
@@ -1,9 +1,7 @@
 <?php
-include_once "inc/getBasic.inc.php";
 $_REQUEST['ts_code']=$_REQUEST['ts_code']?$_REQUEST['ts_code']:'000001';
 $_REQUEST['t_start']=$_REQUEST['t_start']?$_REQUEST['t_start']:'2015-01-01';
 $_REQUEST['t_end']=$_REQUEST['t_end']?$_REQUEST['t_end']:'';
-$ts_name = tscodeToName(ts_code_conv($_REQUEST['ts_code']));
 $title="股价VS PE/PB/PS 趋势:".$ts_name.'('.$_REQUEST['ts_code'].')';
 include_once "html/head.php";
 ?>
@@ -33,14 +31,20 @@ include_once "html/head.php";
     let t_start = $('#t_start').val();
     let t_end = $('#t_end').val();
     let ts_code = $("#ts_code").val();
-    let codeName ="<?=$ts_name?>";
 
     url =   "https://api.doorcome.cn/api/stockparam/?tscode="+ts_code;
     url +=  "&start_date="+t_start+"&end_date="+t_end;
-    fetch(url)
-        .then(httpresponse => httpresponse.json())
-        .then(parsedData => {
+    url2 = "https://api.doorcome.cn/api/stockinfo/?tscode="+ts_code;
+    Promise.all([
+    fetch(url),
+    fetch(url2)
+    ])
+        .then(responses => Promise.all(responses.map(r => r.json())))
+        //.then(httpresponse => httpresponse.json())
+        //.then(parsedData => {
+        .then(([parsedData,stockInfo]) => {
             // 图表配置:pe_ttm
+            let codeName = stockInfo[0].name;
             var params = {};
             params.chartid='pe_ttm';
             params.legend = [codeName,'pe_ttm'];