Acasă Explorează Ajutor
Înregistrare Autentificare
CQ_JD
/
read_opc
2
0
Bifurcare 0
Fisiere Probleme 0 Trageți solicitările 0 Wiki
Răsfoiți Sursa

Merge branch 'master' of http://116.63.33.55/git/read_opc

Zt 1 an în urmă
părinte
56d3b195dc 416f8b809d
comite
d84f63f26d
17 a modificat fișierele cu 34 adăugiri și 1 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 11 0
      chaunyi_opc/opc_da/src/main/java/com/example/opc_da/service/impl/ChartServiceImpl.java
  2. 1 1
      chaunyi_opc/opc_da/src/main/resources/static/app/index.html
  3. 22 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/echarts.min.js
  4. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/index.cc3e4145.js
  5. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/index.eed06d30.js
  6. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index.63398397.js
  7. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index.bf9b4041.js
  8. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index~pages-reportForm-index.17ceda57.js
  9. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index~pages-reportForm-index.c021865f.js
  10. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index~pages-reportForm-index~pages-user-auth-level-index~pages-user-index~pages-user-~15f3e891.99ea14ac.js
  11. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-login-index.832c3b2b.js
  12. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-reportForm-index.b8d0b428.js
  13. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-reportForm-index.ed63e9e8.js
  14. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-reportForm-index~pages-user-auth-level-index~pages-user-index~pages-user-system-info-index.58bc414f.js
  15. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-reportForm-index~pages-user-auth-level-index~pages-user-index~pages-user-system-info-index.59998dae.js
  16. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-user-index.5f4ae8f4.js
  17. 0 0
      chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-user-index.ade22012.js

+ 11 - 0
chaunyi_opc/opc_da/src/main/java/com/example/opc_da/service/impl/ChartServiceImpl.java
Vizualizați fișierul 

@@ -176,9 +176,20 @@ public class ChartServiceImpl implements ChartService {
 
                                 }
 
                                 for (int k = 0; k < rawTimeList.size(); k++) {
 
                                     long time = DateUtil.strYmdhmssChangeDate(rawTimeList.get(k)).getTime();
 
+                                    if (startTimeTime > time) {
 
+                                        rawTimeList.remove(k);
 
+                                        orgRawList.remove(k);
 
+                                        rawList.remove(k);
 
+                                        k--;
 
+                                        continue;
 
+                                    }
 
                                     if (startTimeTime <= time && time < endTimeTime) {
 
                                         orgList.add(orgRawList.get(k));
 
                                         list.add(rawList.get(k));
 
+                                        rawTimeList.remove(k);
 
+                                        orgRawList.remove(k);
 
+                                        rawList.remove(k);
 
+                                        k--;
 
                                     }
 
                                     if (time >= endTimeTime) {
 
                                         break;

+ 1 - 1
chaunyi_opc/opc_da/src/main/resources/static/app/index.html
Vizualizați fișierul 

@@ -2,4 +2,4 @@
 
 				.supports('top: constant(a)'))
 
 			document.write(
 
 				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
 
-				(coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.35954aaa.js></script><script src=./static/js/index.cc3e4145.js></script></body></html>
 
+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.35954aaa.js></script><script src=./static/js/index.eed06d30.js></script></body></html>

Fișier diff suprimat deoarece este prea mare
+ 22 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/echarts.min.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/index.cc3e4145.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/index.eed06d30.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index.63398397.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index.bf9b4041.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index~pages-reportForm-index.17ceda57.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index~pages-reportForm-index.c021865f.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-homePage-index~pages-reportForm-index~pages-user-auth-level-index~pages-user-index~pages-user-~15f3e891.99ea14ac.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-login-index.832c3b2b.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-reportForm-index.b8d0b428.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-reportForm-index.ed63e9e8.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-reportForm-index~pages-user-auth-level-index~pages-user-index~pages-user-system-info-index.58bc414f.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-reportForm-index~pages-user-auth-level-index~pages-user-index~pages-user-system-info-index.59998dae.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-user-index.5f4ae8f4.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
chaunyi_opc/opc_da/src/main/resources/static/app/static/js/pages-user-index.ade22012.js


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff