Merge branch 'master' of http://139.159.244.151:2900/laike/3DWeb

css/index.css

@@ -104,6 +104,44 @@ body {
   line-height: 32px;
 }
 
+.item_val_wrap{
+  display: flex;
+}
+
+.item_wrap_content{
+  margin-top: 20px;
+  flex: 1;
+  height: 170px;
+  text-align: center;
+  flex-wrap: wrap;
+}
+.item_wrap_content>div{
+  width: 96px;
+  height: 100%;
+  background: url(../imgs/numerical.png) no-repeat;
+  background-size: 100%;
+  overflow: hidden;
+}
+.item_wrap_content:nth-child(2)>div{
+  margin-top: 34px;
+}
+.val{
+  margin-top: 33px;
+  margin-bottom: 5px;
+  font-size: 19px;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #FB9931;
+  line-height: 1;
+}
+.name{
+  font-size: 12px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFEFE;
+  line-height: 1;
+}
+
 .item_img {
   width: 23px;
   height: 23px;

index.html

@@ -23,15 +23,33 @@
             <img class="item_img" src="./imgs/title@2x.png" alt="">
             <span class="item_title" >文本标题</span>
           </div>
-          <div class="item_wrap" ></div>
+          <div class="item_wrap item_val_wrap">
+            <div class="item_wrap_content">
+              <div>
+                <div class="val" id="pro_eff">0</div>
+                <div class="name">生产效率</div>
+              </div>
+            </div>
+            <div class="item_wrap_content">
+              <div>
+                <div class="val" id="per_eff">0</div>
+                <div class="name">合格率</div>
+              </div>
+            </div>
+            <div class="item_wrap_content">
+              <div>
+                <div class="val" id="act_eff">0</div>
+                <div class="name">稼动率</div>
+              </div>
+            </div>
+          </div>
         </div>
-
         <div class="item">
           <div class="item_header" >
             <img class="item_img" src="./imgs/title@2x.png" alt="">
             <span class="item_title" >文本标题</span>
           </div>
-          <div class="item_wrap" ></div>
+          <div class="item_wrap" id="act_torque"></div>
         </div>
 
         <div class="item">
@@ -39,33 +57,6 @@
             <img class="item_img" src="./imgs/title@2x.png" alt="">
             <span class="item_title" >文本标题</span>
           </div>
-          <div class="item_wrap" >
-            <div>
-              <div class="val" id="pro_eff">0</div>
-              <div class="name">生产效率</div>
-            </div>
-            <div>
-              <div class="val" id="per_eff">0</div>
-              <div class="name">合格率</div>
-            </div>
-            <div>
-              <div class="val" id="act_eff">0</div>
-              <div class="name">稼动率</div>
-            </div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="item_header" >
-            <img src="" alt="">
-            <span>文本标题</span>
-          </div>
-          <div class="item_wrap" id="act_torque"></div>
-        </div>
-        <div class="item">
-          <div class="item_header">
-            <img src="" alt="">
-            <span>文本标题</span>
-          </div>
           <div class="item_wrap" id="torque"></div>
         </div>
       </div>

js/index.js

@@ -192,7 +192,7 @@ function getTorque(){
     },
     series: [
       {
-        name: '转矩1',
+        name: '功率1',
         data: data1,
         type: 'bar',
         stack: '1',
@@ -208,7 +208,7 @@ function getTorque(){
         }
       },
       {
-        name: '转矩2',
+        name: '功率2',
         data: data2,
         type: 'bar',
         stack: '2',
@@ -266,7 +266,7 @@ function getTorque(){
       url : baseUrl + "/Base/PostRediusTest",
       dataType :"json",
       contentType: "application/json",
-      data: JSON.stringify( ["TORQUE1", "TORQUE2"]),
+      data: JSON.stringify( ["PROWER1", "PROWER2"]),
       success :function(res) {
         if(xAxis.length === 6){
           data1.shift()