liling 4 ماه پیش
والد
کامیت
4b80e97c7b
2فایلهای تغییر یافته به همراه24 افزوده شده و 5 حذف شده
  1. 1 0
      main.html
  2. 23 5
      stock_trend.html

+ 1 - 0
main.html

@@ -2879,6 +2879,7 @@
     //获取全厂统计数据
     function GetFacData() {
         //"/static/3d/data.json"
+        //
         $.getJSON(SERVER_URL + "/stock", {}, function (res) {
             setTimeout(function () {
                 //每1分钟主动查询一次数据

+ 23 - 5
stock_trend.html

@@ -23,6 +23,20 @@
         .trend-title{
             width: 100%;height:20%;text-align: center;line-height: 40px;font-weight: bold;font-size: 20px;
         }
+        #totalStock{
+            position: absolute;
+            left: 50%;
+            top: -10%;
+            width: 85px;
+            height: 78px;
+            line-height: 57px;
+            text-align: center;
+            border: 1px solid #ccc;
+            border-radius: 50%;
+            background: #008000;
+            margin-left: -42px;
+        }
+        }
     </style>
 </head>
 <body onclick="clearEle();" style="background-color: rgba(41,85,137,0.7);height: 724px;">
@@ -31,14 +45,15 @@
         <div class="trend-title">出入库趋势-最近1月</div>
         <div style="width: 100%;height:80%;"></div>
     </div>
-    <div style="height: 60%;">
+    <div style="height: 53%;position: relative;margin-top: 4%;background: #ffffff3d;">
+        <div style="position: absolute;" id="totalStock"><b></b><div style="line-height: 0px;font-size: 12px;">当前库存</div></div>
         <div id="inlist">
-            <div class="trend-title" style="height: 15%">当日入库明细</div>
-            <div style="width: 100%;height:85%;overflow-y: auto;"></div>
+            <div class="trend-title" style="height: 18%"><span>当日入库明细</span><div style="line-height: 18px;    text-align: left;font-size: 16px;">当日总入库库存:<b>-</b></div></div>
+            <div style="width: 100%;height:79%;overflow-y: auto;"></div>
         </div>
         <div id="outlist">
-            <div class="trend-title" style="height: 15%">当日出库明细</div>
-            <div style="width: 100%;height:85%;overflow-y: auto;"></div>
+            <div class="trend-title" style="height: 18%"><span>当日出库明细</span><div style="line-height: 18px;    text-align: right;font-size: 16px;">当日总出库库存:<b>-</b></div></div>
+            <div style="width: 100%;height:79%;overflow-y: auto;"></div>
         </div>
     </div>
 </div>
@@ -83,6 +98,9 @@
         var outhtml = template('detail_tpl',{data:outdatalst,unitname:unit});
         $("#inlist>div:last").html(inhtml);
         $("#outlist>div:last").html(outhtml);
+        $("#inlist .trend-title b").html(parent.FacStockData[type]['d-in']);
+        $("#outlist .trend-title b").html(parent.FacStockData[type]['d-out']);
+        $("#totalStock b").html(parent.FacStockData[type]['curr']);
     });
     function showTrend(data){
             var t = $("#echartTrend>div:last");