Просмотр исходного кода

前端"客户端版本"页面完善

17491 20 часов назад
Родитель
Сommit
441c8c58d8

+ 2 - 2
src/main/resources/config/application.yml

@@ -54,8 +54,8 @@ jdbc:
   # Mysql 数据库配置
   # Mysql 数据库配置
   type: mysql
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_t09?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  url: jdbc:mysql://192.168.114.99:3306/mes_cloud_t09?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_t09?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  url: jdbc:mysql://192.168.114.99:3306/mes_cloud_t09?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://192.168.110.99:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://192.168.110.99:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 
 
   username: mes_cloud
   username: mes_cloud

+ 7 - 1
src/main/resources/views/modules/mesclient/mesClientVersionList.html

@@ -28,6 +28,12 @@
 </div>
 </div>
 </div></div></div></div>
 </div></div></div></div>
 <% } %>
 <% } %>
+<style>
+#dataGrid td,
+#runtimeGrid td {
+    text-align: center;
+}
+</style>
 <script>
 <script>
 var CLIENT_TYPE_NAME = {MANUAL:'手工位通用', QIMI:'气密通用', RIVETING:'拉铆通用'};
 var CLIENT_TYPE_NAME = {MANUAL:'手工位通用', QIMI:'气密通用', RIVETING:'拉铆通用'};
 function clientTypeName(v){ return CLIENT_TYPE_NAME[v] || v || '-'; }
 function clientTypeName(v){ return CLIENT_TYPE_NAME[v] || v || '-'; }
@@ -67,7 +73,7 @@ function heartbeatCell(v){
 
 
 $('#runtimeGrid').dataGrid({
 $('#runtimeGrid').dataGrid({
     url: '${ctx}/mes/clientRuntime/listData',
     url: '${ctx}/mes/clientRuntime/listData',
-    pager: '#runtimeGridPage',
+    // 与版本发布列表使用相同的分页配置,容器由 dataGrid 按表格 ID 自动匹配
     columnModel: [
     columnModel: [
         {header:'类型', name:'clientType', width:110, formatter:function(v){return clientTypeName(v);}},
         {header:'类型', name:'clientType', width:110, formatter:function(v){return clientTypeName(v);}},
         {header:'工位', name:'stationCode', width:100},
         {header:'工位', name:'stationCode', width:100},

+ 12 - 11
src/test/java/com/jeesite/test/InitData.java

@@ -13,24 +13,25 @@ import com.jeesite.modules.Application;
 
 
 /**
 /**
  * 初始化数据表
  * 初始化数据表
+ *
  * @author ThinkGem
  * @author ThinkGem
  * @version 2020-5-26
  * @version 2020-5-26
  */
  */
 @ActiveProfiles("test")
 @ActiveProfiles("test")
-@SpringBootTest(classes=Application.class)
+@SpringBootTest(classes = Application.class)
 public class InitData extends BaseInitDataTests {
 public class InitData extends BaseInitDataTests {
-	
-	@Test
-	public void initData01() throws Exception{
-		logger.info("数据库初始化完成。");
-	}
-
-	@Override
-	public void initProperty() {
+
+    @Test
+    public void initData01() throws Exception {
+        logger.info("数据库初始化完成。");
+    }
+
+    @Override
+    public void initProperty() {
 //		System.setProperty("jeesite.initdata", "true");
 //		System.setProperty("jeesite.initdata", "true");
 
 
 
 
+    }
+
 
 
-	}
-	
 }
 }