From fbc70017e087f5ff0a3e21790cdd75ec2067e0d9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 04 十二月 2023 13:21:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/system/controller/AppVersionController.java | 3 ++-
src/main/webapp/static/js/appVersion/appVersion.js | 14 +++++++-------
src/main/webapp/views/appVersion/appVersion.html | 4 ++--
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/system/controller/AppVersionController.java b/src/main/java/com/zy/crm/system/controller/AppVersionController.java
index fbbe5fe..8427f99 100644
--- a/src/main/java/com/zy/crm/system/controller/AppVersionController.java
+++ b/src/main/java/com/zy/crm/system/controller/AppVersionController.java
@@ -56,7 +56,8 @@
excludeTrash(param);
convert(param, wrapper);
allLike(AppVersion.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("id", false);
return R.ok(appVersionService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/webapp/static/js/appVersion/appVersion.js b/src/main/webapp/static/js/appVersion/appVersion.js
index be8531c..31c15aa 100644
--- a/src/main/webapp/static/js/appVersion/appVersion.js
+++ b/src/main/webapp/static/js/appVersion/appVersion.js
@@ -23,19 +23,19 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: ''}
- ,{field: 'version', align: 'center',title: '鐗堟湰鍙�'}
- ,{field: 'path', align: 'center',title: 'app璺緞'}
- ,{field: 'latest$', align: 'center',title: '鏄惁涓烘渶鏂扮増鏈�', templet:function (d){
+ // {type: 'checkbox'},
+ {field: 'id', align: 'center',title: '',hide :true}
+ ,{field: 'version', align: 'center',title: '鐗堟湰鍙�',hide :false}
+ ,{field: 'path', align: 'center',title: 'app鍚嶇О',hide :false}
+ ,{field: 'latest$', align: 'center',title: '鏄惁涓烘渶鏂扮増鏈�',hide :false, templet:function (d){
if(d.latest == 0){
return '<span class="layui-badge layui-bg-gray">鍚�</span>';
}else{
return '<span class="layui-badge layui-bg-green">鏄�</span>'
}
}}
- ,{field: 'type$', align: 'center',title: 'app绫诲瀷'}
-
+ ,{field: 'type$', align: 'center',title: 'app绫诲瀷',hide :false}
+ ,{field: 'userName', align: 'center',title: '鍒涘缓浜哄憳',hide :true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:400}
]],
request: {
diff --git a/src/main/webapp/views/appVersion/appVersion.html b/src/main/webapp/views/appVersion/appVersion.html
index 5f22df0..f2bc475 100644
--- a/src/main/webapp/views/appVersion/appVersion.html
+++ b/src/main/webapp/views/appVersion/appVersion.html
@@ -50,7 +50,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
</div>
</script>
@@ -58,7 +58,7 @@
<div style="padding: 10px">
<div class="layui-upload">
<button type="button" class="layui-btn layui-btn-normal" id="data-btn-file2">閫夋嫨鏂囦欢</button><input id="data-btn-upload" class="layui-upload-file" type="file" accept="" name="file" multiple="">
- <div class="layui-upload-list" style="max-width: 1000px;height:400px;overflow: scroll">
+ <div class="layui-upload-list">
<table class="layui-table">
<colgroup>
<col>
--
Gitblit v1.9.1