1、横向表格时间不对的问题

2、新建报表点取消的问题

industry-admin/src/views/report/tableTemplate/index.vue

@@ -179,6 +179,7 @@
 				const json = event.data
 				if (json.cmd === 'close') {
 					//_this.$router.go(-1)
+          _this.isLoadingStatus = false;
 				} else if (json.cmd === 'newsave') {
           _this.getAllTableTemplate()
         } else if(json.cmd === 'complete'){
@@ -232,7 +233,6 @@
 						files
 					}
 				});
-        //_this.isLoadingStatus = false;
 				localStorage.setItem('IMPORT_FILES_JSON', '')
 			},
 			addEventListener() {

industry-system/industry-da/pom.xml

@@ -209,18 +209,6 @@
         </dependency>
         <!--opcDa读取依赖-->
 
-        <!--Test依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.cqcy.ei.data</groupId>
-            <artifactId>influxdb</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
@@ -255,7 +243,7 @@
             <id>dev</id>
             <activation>
                 <!--默认环境-->
-                <!--                <activeByDefault>true</activeByDefault>-->
+                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
                 <spring.profiles.active>dev</spring.profiles.active>
@@ -263,10 +251,6 @@
         </profile>
         <profile>
             <id>test</id>
-            <activation>
-                <!--默认环境-->
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
             </properties>

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/UserServiceImpl.java

@@ -226,10 +226,10 @@ public class UserServiceImpl implements UserService {
         }
         switch (isExistUser.getState()) {
             case ConstantStr.NORMAL_USE:
-                String oldToken = Convert.toStr(redisUtil.get(ConstantStr.BACK_USER_String + isExistUser.getUserId()));
-                if (Blank.isNotEmpty(oldToken)) {
-                    return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "此账号在其他地方登录,请勿重新登录");
-                }
+//                String oldToken = Convert.toStr(redisUtil.get(ConstantStr.BACK_USER_String + isExistUser.getUserId()));
+//                if (Blank.isNotEmpty(oldToken)) {
+//                    return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "此账号在其他地方登录,请勿重新登录");
+//                }
                 String tokenKey = ConstantStr.BACK_USER_String + isExistUser.getUserId();
                 List<Role> roleList = userDao.getRoleListByUserId(isExistUser.getUserId());
                 JSONObject json = new JSONObject();

industry-system/industry-da/src/main/java/com/example/opc_da/validate/reportTable/AutomaticReportTableValidate.java

@@ -168,6 +168,7 @@ public abstract class AutomaticReportTableValidate implements ReportTableValidat
                             String time = itemList.get(0).getTime();
                             rowCol.put("v", time);
                             rowCol.put("m", time);
+                            itemList.remove(0);
                         }
                     } catch (Exception e) {
                         log.error("自动报表解析数据出错",e);