Home Explore Help
Sign In
hexiugang
/
iamberry-common-parent
Watch 3
Star 3
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

维修统计

wangxiaoming 5 years ago
parent
8498f83827
commit
44a1ba3507
3 changed files with 15 additions and 12 deletions
Unified View Show Diff Stats
  1. 8 8
      watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/detectStatisticMapper.xml
  2. 6 3
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_statistics.ftl
  3. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/order_desc.ftl

+ 8 - 8
watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/detectStatisticMapper.xml
View File 

@@ -96,14 +96,14 @@
 
 
 
     <select id="getDetectList" resultType="DetectStatistics" parameterType="DetectionConfig" >
 
     <select id="getDetectList" resultType="DetectStatistics" parameterType="DetectionConfig" >
 
         SELECT
 
         SELECT
 
-        t.detect_id,
 
-        IF(t.detect_production = '','未知',ifnull(t.detect_production,'未知')) AS detect_production,
 
-        t.detect_create_time,
 
-        cdc.config_id,
 
-        COUNT(cdc.config_id) AS configNumber,
 
-        cdc.config_detect_content,
 
-        cdc.config_type
 
-        FROM tb_rst_complaint_detect t
 
+            t.detect_id,
 
+            COUNT(DISTINCT t.detect_id) AS configNumber,
 
+            IF(t.detect_production = '','未知',ifnull(t.detect_production,'未知')) AS detect_production,
 
+            t.detect_create_time,
 
+            cdc.config_id,
 
+            cdc.config_detect_content,
 
+            cdc.config_type
 
+            FROM tb_rst_complaint_detect t
 
         LEFT JOIN tb_rst_complaint_detection_item cdi ON t.detect_id = cdi.detect_id
 
         LEFT JOIN tb_rst_complaint_detection_item cdi ON t.detect_id = cdi.detect_id
 
         LEFT JOIN tb_rst_complaint_detection_config cdc ON cdi.item_config_id = cdc.config_id
 
         LEFT JOIN tb_rst_complaint_detection_config cdc ON cdi.item_config_id = cdc.config_id
 
         <where>
 
         <where>

+ 6 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_statistics.ftl
View File 

@@ -31,6 +31,9 @@
 
         </style>
 
         </style>
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
+        <div class="input-box" style="height: 45px;" class="dataTableStatis">
 
+            <label class="form-label col-2 col-sm-2 huanhang" style="text-align: right;margin: 10px 0px;font-weight: bold;font-size: 23px;">本月故障机器</label>
 
+        </div>
 
     	<div id="main" style="width: 1400px;height:500px;"></div>
 
     	<div id="main" style="width: 1400px;height:500px;"></div>
 
 
 
 
 
@@ -161,14 +164,14 @@
 
                         }
 
                         }
 
                         var option = {
 
                         var option = {
 
                             title : {
 
                             title : {
 
-                                text: '本月故障机器',
 
+                                text: '',
 
                                 subtext: ''
 
                                 subtext: ''
 
                             },
 
                             },
 
                             tooltip : {
 
                             tooltip : {
 
                                 trigger: 'axis'
 
                                 trigger: 'axis'
 
                             },
 
                             },
 
                             legend: {
 
                             legend: {
 
-                                data:['返厂日期']
 
+                                data:['故障机器数量']
 
                             },
 
                             },
 
                             toolbox: {
 
                             toolbox: {
 
                                 show : true,
 
                                 show : true,
 
@@ -192,7 +195,7 @@
 
                                 }
 
                                 }
 
                             ],
 
                             ],
 
                             series : {
 
                             series : {
 
-                                name:'返厂日期',
 
+                                name:'故障机器数量',
 
                                 type:'bar',
 
                                 type:'bar',
 
                                 data:newNumArray
 
                                 data:newNumArray
 
 //								barWidth : 10%,
 
 //								barWidth : 10%,

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/order_desc.ftl
View File 

@@ -348,7 +348,7 @@
 
      */
 
      */
 
     function selectOrder(type) {
 
     function selectOrder(type) {
 
         isAddOrderType=type;
 
         isAddOrderType=type;
 
-        layer_show("搜索订单",url_path + "/admin/financial_receipt/to_select_order?salesStatus="+1,"1300","550");
 
+        layer_show("搜索订单",url_path + "/admin/financial_receipt/to_select_order?salesStatus="+1,"1200","550");
 
     }
 
     }
 
     
     
     function showSelectOrder(orderIds) {
 
     function showSelectOrder(orderIds) {