优化显示

platform-admin/src/main/resources/com/platform/dao/TbCfClassificationDao.xml

@@ -48,7 +48,7 @@
                 order by ${sidx} ${order}
             </when>
 			<otherwise>
-                order by id desc
+                order by sort
 			</otherwise>
         </choose>
 		<if test="offset != null and limit != null">

platform-admin/src/main/resources/com/platform/dao/TbCfPostersDao.xml

@@ -54,7 +54,7 @@
                 order by ${sidx} ${order}
             </when>
 			<otherwise>
-                order by id desc
+                order by sort
 			</otherwise>
         </choose>
 		<if test="offset != null and limit != null">

platform-admin/src/main/resources/com/platform/dao/TbCfSortDao.xml

@@ -51,7 +51,7 @@
 				order by ${sidx} ${order}
 			</when>
 			<otherwise>
-				order by id desc
+				order by type
 			</otherwise>
 		</choose>
 		<if test="offset != null and limit != null">

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfposters.html

@@ -36,8 +36,8 @@
             <Form-item label="标题" prop="postersTitle">
                 <i-input v-model="tbCfPosters.postersTitle" placeholder="标题"/>
             </Form-item>
-            <Form-item label="类型" prop="postersType">
-                <i-input v-model="tbCfPosters.postersType" placeholder="类型"/>
+            <Form-item label="排序" prop="sort">
+                <i-input v-model="tbCfPosters.sort" placeholder="类型"/>
             </Form-item>
             <!--<Form-item label="图片" prop="postersPicture">
                 <i-input v-model="tbCfPosters.postersPicture" placeholder="图片"/>
@@ -46,12 +46,12 @@
                 <img v-bind:src="tbCfPosters.postersPicture" v-show="!!tbCfPosters.postersPicture"/>
                 <input type="file" placeholder="图片" @change="tirggerFile($event)"/>
             </Form-item>
-            <Form-item label="是否展示" prop="isShow">
-                <i-input v-model="tbCfPosters.isShow" placeholder="是否展示"/>
-            </Form-item>
             <Form-item label="跳转链接" prop="redirectUrl">
                 <i-input v-model="tbCfPosters.redirectUrl" placeholder="跳转链接"/>
             </Form-item>
+            <Form-item label="是否展示" prop="isShow">
+                <i-input v-model="tbCfPosters.isShow" placeholder="是否展示"/>
+            </Form-item>
             <Form-item label="备注" prop="remark">
                 <i-input v-model="tbCfPosters.remark" placeholder="备注"/>
             </Form-item>

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfsort.html

@@ -33,21 +33,21 @@
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="tbCfSort" :rules="ruleValidate" :label-width="80">
-            <Form-item label="模块ID" prop="moduleId">
+            <!--<Form-item label="模块ID" prop="moduleId">
                 <i-input v-model="tbCfSort.moduleId" placeholder="模块ID"/>
-            </Form-item>
-            <Form-item label="序号" prop="sort">
+            </Form-item>-->
+            <Form-item label="排序" prop="sort">
                 <i-input v-model="tbCfSort.sort" placeholder="序号"/>
             </Form-item>
             <Form-item label="模块" prop="module">
                 <i-input v-model="tbCfSort.module" placeholder="模块"/>
             </Form-item>
-            <Form-item label="名称" prop="name">
+            <!--<Form-item label="名称" prop="name">
                 <i-input v-model="tbCfSort.name" placeholder="名称"/>
-            </Form-item>
-            <Form-item label="分类" prop="type">
+            </Form-item>-->
+            <!--<Form-item label="分类" prop="type">
                 <i-input v-model="tbCfSort.type" placeholder="1:分类导航栏 2.爬虫品牌 3.海报图"/>
-            </Form-item>
+            </Form-item>-->
             <Form-item label="备注" prop="remark">
                 <i-input v-model="tbCfSort.remark" placeholder="备注"/>
             </Form-item>

platform-admin/src/main/webapp/js/sys/tbcfclassification.js

@@ -5,8 +5,8 @@ $(function () {
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             /*{label: '一级分类ID', name: 'goodtypeId', index: 'goodtype_id', width: 80},*/
             {label: '标题', name: 'classTitle', index: 'class_title', width: 80},
-            {label: '图片', name: 'picture', index: 'picture', width: 80, formatter: imageFormat},
             {label: '排序', name: 'sort', index: 'sort', width: 80},
+            {label: '图片', name: 'picture', index: 'picture', width: 80, formatter: imageFormat},
             {label: '是否展示', name: 'isShow', index: 'is_show', width: 80, formatter: validFormat},
             {label: '创建时间', name: 'createTime', index: 'create_time', width: 80}]
     });

platform-admin/src/main/webapp/js/sys/tbcfposters.js

@@ -2,105 +2,105 @@ $(function () {
     $("#jqGrid").Grid({
         url: '../tbcfposters/list',
         colModel: [
-			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '标题', name: 'postersTitle', index: 'posters_title', width: 80},
-			{label: '类型', name: 'postersType', index: 'posters_type', width: 80},
-			{label: '图片', name: 'postersPicture', index: 'posters_picture', width: 80, formatter: imageFormat},
+            {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+            {label: '标题', name: 'postersTitle', index: 'posters_title', width: 80},
+            {label: '排序', name: 'sort', index: 'sort', width: 80},
+            {label: '图片', name: 'postersPicture', index: 'posters_picture', width: 80, formatter: imageFormat},
+            {label: '跳转链接', name: 'redirectUrl', index: 'redirect_url', width: 80},
 			{label: '是否展示', name: 'isShow', index: 'is_show', width: 80, formatter: validFormat},
-			{label: '跳转链接', name: 'redirectUrl', index: 'redirect_url', width: 80},
 			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '备注', name: 'remark', index: 'remark', width: 80}
-			]
+            {label: '备注', name: 'remark', index: 'remark', width: 80}
+        ]
     });
 });
 
 let vm = new Vue({
-	el: '#rrapp',
-	data: {
+    el: '#rrapp',
+    data: {
         showList: true,
         title: null,
-		tbCfPosters: {},
-		ruleValidate: {
-			name: [
-				{required: true, message: '名称不能为空', trigger: 'blur'}
-			]
-		},
-		q: {
-		    name: ''
-		}
-	},
-	methods: {
-		query: function () {
-			vm.reload();
-		},
-		add: function () {
-			vm.showList = false;
-			vm.title = "新增";
-			vm.tbCfPosters = {};
-		},
-		update: function (event) {
+        tbCfPosters: {},
+        ruleValidate: {
+            name: [
+                {required: true, message: '名称不能为空', trigger: 'blur'}
+            ]
+        },
+        q: {
+            name: ''
+        }
+    },
+    methods: {
+        query: function () {
+            vm.reload();
+        },
+        add: function () {
+            vm.showList = false;
+            vm.title = "新增";
+            vm.tbCfPosters = {};
+        },
+        update: function (event) {
             let id = getSelectedRow("#jqGrid");
-			if (id == null) {
-				return;
-			}
-			vm.showList = false;
+            if (id == null) {
+                return;
+            }
+            vm.showList = false;
             vm.title = "修改";
 
             vm.getInfo(id);
-		},
-		saveOrUpdate: function (event) {
+        },
+        saveOrUpdate: function (event) {
             let url = vm.tbCfPosters.id == null ? "../tbcfposters/save" : "../tbcfposters/update";
             Ajax.request({
-			    url: url,
+                url: url,
                 params: JSON.stringify(vm.tbCfPosters),
                 type: "POST",
-			    contentType: "application/json",
+                contentType: "application/json",
                 successCallback: function (r) {
                     alert('操作成功', function (index) {
                         vm.reload();
                     });
                 }
-			});
-		},
-		del: function (event) {
+            });
+        },
+        del: function (event) {
             let ids = getSelectedRows("#jqGrid");
-			if (ids == null){
-				return;
-			}
+            if (ids == null) {
+                return;
+            }
 
-			confirm('确定要删除选中的记录？', function () {
+            confirm('确定要删除选中的记录？', function () {
                 Ajax.request({
-				    url: "../tbcfposters/delete",
+                    url: "../tbcfposters/delete",
                     params: JSON.stringify(ids),
                     type: "POST",
-				    contentType: "application/json",
+                    contentType: "application/json",
                     successCallback: function () {
                         alert('操作成功', function (index) {
                             vm.reload();
                         });
-					}
-				});
-			});
-		},
-		getInfo: function(id){
+                    }
+                });
+            });
+        },
+        getInfo: function (id) {
             Ajax.request({
-                url: "../tbcfposters/info/"+id,
+                url: "../tbcfposters/info/" + id,
                 async: true,
                 successCallback: function (r) {
                     vm.tbCfPosters = r.tbCfPosters;
                 }
             });
-		},
-		reload: function (event) {
-			vm.showList = true;
+        },
+        reload: function (event) {
+            vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
-			$("#jqGrid").jqGrid('setGridParam', {
+            $("#jqGrid").jqGrid('setGridParam', {
                 postData: {'name': vm.q.name},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');
-		},
-        reloadSearch: function() {
+        },
+        reloadSearch: function () {
             vm.q = {
                 name: ''
             };
@@ -114,28 +114,28 @@ let vm = new Vue({
         handleReset: function (name) {
             handleResetForm(this, name);
         },
-		tirggerFile: function (event) {
-			var file = event.target.files[0];
-			var formData = new FormData();
-			formData.append("file", file);
-			$.ajax({
-				url: "../api/upload/image/",
-				type: "POST",
-				data: formData,
-				cache: false,         //不设置缓存
-				processData: false,  // 不处理数据
-				contentType: false,// 不设置内容类型
-				success: function (result) {
-					result = JSON.parse(result);
-					//console.log(result)
-					if (result.errno == 0) {//成功
-						vm.tbCfPosters.postersPicture = result.data;
-						vm.$forceUpdate();
-					} else {
-						iview.Message.error(result.errmsg);
-					}
-				}
-			});
-		}
-	}
+        tirggerFile: function (event) {
+            var file = event.target.files[0];
+            var formData = new FormData();
+            formData.append("file", file);
+            $.ajax({
+                url: "../api/upload/image/",
+                type: "POST",
+                data: formData,
+                cache: false,         //不设置缓存
+                processData: false,  // 不处理数据
+                contentType: false,// 不设置内容类型
+                success: function (result) {
+                    result = JSON.parse(result);
+                    //console.log(result)
+                    if (result.errno == 0) {//成功
+                        vm.tbCfPosters.postersPicture = result.data;
+                        vm.$forceUpdate();
+                    } else {
+                        iview.Message.error(result.errmsg);
+                    }
+                }
+            });
+        }
+    }
 });
\ No newline at end of file

platform-admin/src/main/webapp/js/sys/tbcfsort.js

@@ -3,11 +3,11 @@ $(function () {
         url: '../tbcfsort/list',
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '模块ID', name: 'moduleId', index: 'module_id', width: 80},
-			{label: '序号', name: 'sort', index: 'sort', width: 80},
+			/*{label: '模块ID', name: 'moduleId', index: 'module_id', width: 80},*/
 			{label: '模块', name: 'module', index: 'module', width: 80},
-			{label: '名称', name: 'name', index: 'name', width: 80},
-			{label: '分类', name: 'type', index: 'type', width: 80},
+			{label: '序号', name: 'sort', index: 'sort', width: 80},
+			/*{label: '名称', name: 'name', index: 'name', width: 80},*/
+			/*{label: '分类', name: 'type', index: 'type', width: 80},*/
 			{label: '备注', name: 'remark', index: 'remark', width: 80},
 			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80}
 			]