tips改成description

ede7696b · fengshuonan · 286004f7 · ede7696b · ede7696b · ede7696b
Commit ede7696b authored Dec 08, 2018 by fengshuonan
14 changed files
--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DeptDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DeptDict.java
@@ -32,7 +32,7 @@ public class DeptDict extends AbstractDictMap {
        put("pid", "上级名称");
        put("simplename", "部门简称");
        put("fullname", "部门全称");
-        put("tips", "备注");
+        put("description", "备注");
    }
    @Override

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/LogDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/LogDict.java
@@ -27,7 +27,7 @@ public class LogDict extends AbstractDictMap {
    @Override
    public void init() {
-        put("tips", "备注");
+        put("description", "备注");
    }
    @Override

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/MenuDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/MenuDict.java
@@ -36,7 +36,7 @@ public class MenuDict extends AbstractDictMap {
        put("url", "url地址");
        put("num", "菜单排序号");
        put("levels", "菜单层级");
-        put("tips", "备注");
+        put("description", "备注");
        put("status", "菜单状态");
        put("isopen", "是否打开");
        put("", "");

--- a/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
+++ b/src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
@@ -32,7 +32,7 @@ public class RoleDict extends AbstractDictMap {
        put("pid", "角色的父级");
        put("name", "角色名称");
        put("deptId", "部门名称");
-        put("tips", "备注");
+        put("description", "备注");
        put("ids", "资源名称");
    }

--- a/src/main/webapp/WEB-INF/login.html
+++ b/src/main/webapp/WEB-INF/login.html
@@ -28,8 +28,8 @@
                <form class="form-horizontal form-material" id="loginform" action="${ctxPath}/login" method="post">
                    <h3 class="box-title m-b-30">Guns管理系统</h3>
-                    @if(isNotEmpty(tips)){
+                    @if(isNotEmpty(description)){
-                        <h5 class="box-title m-b-30" style="color: red;">${tips}</h5>
+                        <h5 class="box-title m-b-30" style="color: red;">${description}</h5>
                    @}
                    <div class="form-group ">

--- a/src/main/webapp/WEB-INF/system/dept/dept_add.html
+++ b/src/main/webapp/WEB-INF/system/dept/dept_add.html
@@ -11,7 +11,7 @@
                    <#input id="fullname" name="部门全称" underline="true"/>
-                    <#input id="tips" name="备注" underline="true"/>
+                    <#input id="description" name="备注" underline="true"/>
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="排序" underline="true"/>

--- a/src/main/webapp/WEB-INF/system/dept/dept_edit.html
+++ b/src/main/webapp/WEB-INF/system/dept/dept_edit.html
@@ -11,7 +11,7 @@
                    <#input id="fullname" name="部门全称" underline="true" value="${dept.fullname}"/>
-                    <#input id="tips" name="备注" underline="true" value="${dept.tips}"/>
+                    <#input id="description" name="备注" underline="true" value="${dept.description}"/>
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="排序" underline="true" value="${dept.num}"/>

--- a/src/main/webapp/WEB-INF/system/dict/dict_edit.html
+++ b/src/main/webapp/WEB-INF/system/dict/dict_edit.html
@@ -28,7 +28,7 @@
                    <div class="form-group">
                        <label class="col-sm-2 control-label">备注</label>
                        <div class="col-sm-8">
-                            <input class="form-control" id="dictTips" type="text" value="${dict.tips}">
+                            <input class="form-control" id="dictTips" type="text" value="${dict.description}">
                        </div>
                    </div>
                    <div class="hr-line-dashed"></div>

--- a/src/main/webapp/WEB-INF/system/role/role_edit.html
+++ b/src/main/webapp/WEB-INF/system/role/role_edit.html
@@ -19,7 +19,7 @@
                <div class="form-group">
                    <h5>别名 <span class="text-danger">*</span></h5>
                    <div class="controls">
-                        <input v-model="tips" type="text" class="form-control">
+                        <input v-model="description" type="text" class="form-control">
                    </div>
                </div>
            </div>

--- a/src/main/webapp/assets/modular/system/dept/dept.js
+++ b/src/main/webapp/assets/modular/system/dept/dept.js
@@ -21,7 +21,7 @@ Dept.initColumn = function () {
        {title: '部门简称', field: 'simplename', align: 'center', valign: 'middle', sortable: true},
        {title: '部门全称', field: 'fullname', align: 'center', valign: 'middle', sortable: true},
        {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
-        {title: '备注', field: 'tips', align: 'center', valign: 'middle', sortable: true}];
+        {title: '备注', field: 'description', align: 'center', valign: 'middle', sortable: true}];
 };
 /**

--- a/src/main/webapp/assets/modular/system/dept/dept_info.js
+++ b/src/main/webapp/assets/modular/system/dept/dept_info.js
@@ -105,7 +105,7 @@ DeptInfoDlg.hideDeptSelectTree = function() {
 * 收集数据
 */
 DeptInfoDlg.collectData = function() {
-    this.set('id').set('simplename').set('fullname').set('tips').set('num').set('pid');
+    this.set('id').set('simplename').set('fullname').set('description').set('num').set('pid');
 }
 /**

--- a/src/main/webapp/assets/modular/system/dict/dict.js
+++ b/src/main/webapp/assets/modular/system/dict/dict.js
@@ -17,7 +17,7 @@ Dict.initColumn = function () {
        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {title: '名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
        {title: '详情', field: 'detail', align: 'center', valign: 'middle', sortable: true},
-        {title: '备注', field: 'tips', align: 'center', valign: 'middle', sortable: true}];
+        {title: '备注', field: 'description', align: 'center', valign: 'middle', sortable: true}];
 };
 /**

--- a/src/main/webapp/assets/modular/system/role/role_add.js
+++ b/src/main/webapp/assets/modular/system/role/role_add.js
@@ -6,7 +6,7 @@ var RoleAddDlg = {
        name: "",
        pName: "",
        pid: "",
-        tips: "",
+        description: "",
        deptName: "",
        deptId: "",
        num: ""
@@ -36,7 +36,7 @@ RoleAddDlg.validateForm = function () {
    if (!data.deptName) {
        return "请输入部门名称";
    }
-    if (!data.tips) {
+    if (!data.description) {
        return "请输入别名";
    }

--- a/src/main/webapp/assets/modular/system/role/role_edit.js
+++ b/src/main/webapp/assets/modular/system/role/role_edit.js
@@ -7,7 +7,7 @@ var RoleEditDlg = {
        name: "",
        pName: "",
        pid: "",
-        tips: "",
+        description: "",
        deptName: "",
        deptId: "",
        num: ""
@@ -37,7 +37,7 @@ RoleEditDlg.validateForm = function () {
    if (!data.deptName) {
        return "请输入部门名称";
    }
-    if (!data.tips) {
+    if (!data.description) {
        return "请输入别名";
    }