Merge remote-tracking branch 'origin/master'

231ca1ca · sgjj · cb77002e · 0e366386 · 231ca1ca · 231ca1ca
Commit 231ca1ca authored Jun 30, 2020 by sgjj
10 changed files
--- a/doc/历史/5.0.0-to-5.0.1-mysql.sql
+++ b/doc/历史/5.0.0-to-5.0.1-mysql.sql
--- a/doc/mcms-5.1.sql
+++ b/doc/mcms-5.1.sql
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,11 @@
 			<artifactId>ms-upgrader</artifactId>
 			<version>1.0.17</version>
 		</dependency>
-
+		<dependency>
+			<groupId>com.github.stuxuhai</groupId>
+			<artifactId>jpinyin</artifactId>
+			<version>1.1.8</version>
+		</dependency>

 	</dependencies>
 	<build>

--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
 spring:
  datasource:
-    url: jdbc:mysql://localhost:3306/msopen?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
+    url: jdbc:mysql://192.168.0.8:3316/mcms-5.1-3000?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+    username: mcms
+    password: mcms
    filters: wall,mergeStat
    type: com.alibaba.druid.pool.DruidDataSource
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>造价管理系统</title>
+    <title>MCMS-OPEN</title>
    <#include '/include/head-file.ftl'/>
    <script src="${base}/static/plugins/sockjs/1.4.0/sockjs.min.js"></script>
    <script src="${base}/static/plugins/stomp/2.3.3/stomp.min.js"></script>
@@ -28,7 +28,7 @@
                        <img :src="ms.base+'/static/ms-admin/5.0.0/images/logo.png'"/>
                        <div class="class-1" v-show="!collapseMenu">
                            <div class="class-2">v</div>
-                            2.0
+                            5.1
                        </div>
                    </div>
                    <el-submenu :popper-class="['ms-admin-menu-aside-submenu',theme]" :index="menu.modelId+''"
@@ -192,12 +192,12 @@
            collapseMenu: false, //菜单折叠，false不折叠
            currentTab: '工作台', //当前激活tab的name
            tabIndex: 1,
-            // markList: ['项目管理', '组织管理', '客户管理', '合同管理', '印章管理', '绩效管理', '权限管理', '系统设置'],
+            // markList:
+            // ['项目管理', '组织管理', '客户管理', '合同管理', '印章管理', '绩效管理', '权限管理', '系统设置'],
            markList: [
                {title: "权限管理", icon: "icon-wode", hide: true},
                {title: "系统设置", icon: "icon-xitongguanli", hide: true},
                {title: "内容管理", icon: "icon-neirongguanli", hide: true},
-                {title: "印章管理", icon: "icon-huizhang", hide: true},
                {title: "会员中心", icon: "icon-huiyuanzhongxin", hide: true},
                {title: "自定义管理", icon: "icon-zidingyiguanli", hide: true},
            ],
@@ -310,18 +310,18 @@
                })

            },
-            connect: function () {
-                var that = this
-                var sockjs = new SockJS("/websocket");
-                var stompClient = Stomp.over(sockjs);
-                stompClient.connect({}, function (frame) {
-                    stompClient.subscribe('/topic/message/' +${Session.manager_session.managerId}, function (greeting) {
-                        if (greeting.body == "list") {
-                            that.getMessage()
-                        }
-                    });
-                });
-            },
+            <#--connect: function () {-->
+            <#--    var that = this-->
+            <#--    var sockjs = new SockJS("/websocket");-->
+            <#--    var stompClient = Stomp.over(sockjs);-->
+            <#--    stompClient.connect({}, function (frame) {-->
+            <#--        stompClient.subscribe('/topic/message/' +${Session.manager_session.managerId}, function (greeting) {-->
+            <#--            if (greeting.body == "list") {-->
+            <#--                that.getMessage()-->
+            <#--            }-->
+            <#--        });-->
+            <#--    });-->
+            <#--},-->
            markMenu: function (title, icon) {
                var menu = {
                    title: title,
@@ -571,7 +571,7 @@
            //setInterval(this.getMessage,3000)
            // 菜单列表
            this.list();
-            this.connect();
+            // this.connect();
            //获取登录用户信息
            this.managerGet();
            var that = this;

--- a/src/main/webapp/WEB-INF/manager/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/main.ftl
@@ -45,7 +45,7 @@
        </div>
        <div  class="class-7" >
          <div class="panel">
-            <div class="panel-title">
+            <div  v-if="alwaysList.length>0" class="panel-title">
              常用功能
            </div>
            <div class="v-space"></div>

--- a/src/main/webapp/static/ms-admin/5.0.0/css/app.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/css/app.css
@@ -129,4 +129,16 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
 }
 .ms-scrollbar .el-scrollbar__view{
    padding-right: 17px;
+}
+/**后台管理界面的el-menu通用样式**/
+.ms-index .el-menu {
+    border-right: none;
+    background-color: unset;
+    height: calc(100vh - 141px);
+}
+.ms-index .el-menu-item {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
 }
\ No newline at end of file
--- a/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.css
+++ b/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.css
-@font-face {
-  font-family: 'iconfont';
-  src: url('font_1421490211_4230533.eot'); /* IE9*/
-  src: url('font_1421490211_4230533.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('font_1421490211_4230533.woff') format('woff'), /* chrome、firefox */
-  url('font_1421490211_4230533.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
-  url('font_1421490211_4230533.svg#iconfont') format('svg'); /* iOS 4.1- */
+@font-face {font-family: "iconfont";
+  src: url('iconfont.eot?t=1575709121058'); /* IE9 */
+  src: url('iconfont.eot?t=1575709121058#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+  url('iconfont.woff?t=1575709121058') format('woff'),
+  url('iconfont.ttf?t=1575709121058') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('iconfont.svg?t=1575709121058#iconfont') format('svg'); /* iOS 4.1- */
 }

 .iconfont {
-  font-family:"iconfont" !important;
-  font-size:2rem;
-  font-style:normal;
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
  -webkit-font-smoothing: antialiased;
-  -webkit-text-stroke-width: 0.2px;
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-icon5:before {
+  content: "\e60e";
+}
+
+.icon-posts:before {
+  content: "\e617";
+}
+
+.icon-login-zhanghao:before {
+  content: "\e62a";
+}
+
+.icon-mima:before {
+  content: "\e65b";
+}
+
+.icon-tongzhi:before {
+  content: "\e618";
+}
+
+.icon-quanxianguanli:before {
+  content: "\e610";
+}
+
+.icon-dianhua1:before {
+  content: "\e633";
+}
+
+.icon-finish:before {
+  content: "\e6f3";
+}
+
+.icon-zanwujilu:before {
+  content: "\e606";
+}
+
+.icon-wenjianjia:before {
+  content: "\e682";
+}
+
+.icon-up:before {
+  content: "\e60f";
+}
+
+.icon-shouji:before {
+  content: "\e628";
+}
+
+.icon-tishi:before {
+  content: "\e7fe";
+}
+
+.icon-fanhui1:before {
+  content: "\e66a";
+}
+
+.icon-youjian:before {
+  content: "\e6c9";
+}
+
+.icon-shenpijinduchaxun:before {
+  content: "\e6d4";
+}
+
+.icon-tick:before {
+  content: "\e608";
+}
+
+.icon-qianbifuhao:before {
+  content: "\e627";
+}
+
+.icon-wenbenx:before {
+  content: "\e737";
+}
+
+.icon-kefu:before {
+  content: "\e647";
+}
+
+.icon-Mac:before {
+  content: "\e623";
+}
+
+.icon-zixun:before {
+  content: "\e67a";
+}
+
+.icon-weibo:before {
+  content: "\e639";
+}
+
+.icon-shaixuan1:before {
+  content: "\e76f";
+}
+
+.icon-sousuo:before {
+  content: "\e63c";
+}
+
+.icon-jindu:before {
+  content: "\e7b0";
+}
+
+.icon-fasongfapiao:before {
+  content: "\e605";
+}
+
+.icon-canshu:before {
+  content: "\e655";
+}
+
+.icon-wechat-copy-copy-copy:before {
+  content: "\e600";
+}
+
+.icon-quanxianguanli1:before {
+  content: "\e607";
+}
+
+.icon--:before {
+  content: "\e636";
+}
+
+.icon-morentouxiang:before {
+  content: "\e679";
+}
+
+.icon-dianzan:before {
+  content: "\e668";
+}
+
+.icon-jindu1:before {
+  content: "\e60c";
+}
+
+.icon-baidu:before {
+  content: "\e601";
+}
+
+.icon-cuowu1:before {
+  content: "\e60b";
+}
+
+.icon-shanchu:before {
+  content: "\e609";
+}
+
+.icon-hetongshenpi:before {
+  content: "\e81f";
+}
+
+.icon-Excel:before {
+  content: "\e622";
+}
+
+.icon-ppt:before {
+  content: "\e624";
+}
+
+.icon-jiazai:before {
+  content: "\e603";
+}
+
+.icon-anquan:before {
+  content: "\e751";
+}

+.icon-xia:before {
+  content: "\e619";
+}
+
+.icon-canshupeizhi:before {
+  content: "\e604";
+}
+
+.icon-xiangmuguanli:before {
+  content: "\e621";
+}
+
+.icon-liucheng:before {
+  content: "\e97c";
+}
+
+.icon-shuangsechangyongtubiao-:before {
+  content: "\e602";
+}
+
+.icon-zhibiaoku:before {
+  content: "\e6aa";
+}
+
+.icon-shenhebaobiao_h:before {
+  content: "\e62d";
+}
+
+.icon-dianhua:before {
+  content: "\e61b";
+}
+
+.icon-shuangsechangyongtubiao-1:before {
+  content: "\e686";
+}
+
+.icon-yinzhang:before {
+  content: "\e63b";
+}
+
+.icon-xiangmu:before {
+  content: "\e718";
+}

-.icon_lists li{
-  float:left;
-  width: 100px;
-  height:150px;
-  text-align: center;
-} 
-.icon_lists .icon{
-  font-size: 42px;
-  line-height: 100px;
-  margin: 10px 0;
-  color:#333;
-  -webkit-transition: font-size 0.25s ease-out 0s;
-  -moz-transition: font-size 0.25s ease-out 0s;
-  transition: font-size 0.25s ease-out 0s;
+.icon-moxingcanshu_:before {
+  content: "\e66b";
+}
+
+.icon-shangchuan1:before {
+  content: "\e64c";
+}
+
+.icon-tongzhi1:before {
+  content: "\e77e";
+}
+
+.icon-rizhi:before {
+  content: "\e61f";
+}
+
+.icon-doc1:before {
+  content: "\e60a";
+}
+
+.icon-jindu2:before {
+  content: "\e799";
+}
+
+.icon-yasuobao:before {
+  content: "\e6f6";
+}
+
+.icon-swap:before {
+  content: "\e669";
+}
+
+.icon-riqi:before {
+  content: "\e62b";
+}
+
+.icon-shezhiyemian-youjiankehuduan-:before {
+  content: "\e6c3";
+}
+
+.icon-zhuyi:before {
+  content: "\e629";
+}

+.icon-vip:before {
+  content: "\e62e";
 }
+
+.icon-kehu:before {
+  content: "\e620";
+}
+
+.icon-shishicanshutuijian:before {
+  content: "\e62f";
+}
+
+.icon-shourumingxi:before {
+  content: "\e9ce";
+}
+
+.icon-morentouxiang1:before {
+  content: "\e616";
+}
+
+.icon-tupian1:before {
+  content: "\e643";
+}
+
+.icon-word1:before {
+  content: "\e646";
+}
+
+.icon-gengduo:before {
+  content: "\e6b2";
+}
+
+.icon-peizhiguanli:before {
+  content: "\e672";
+}
+
+.icon-canshupeizhi_:before {
+  content: "\e69d";
+}
+
+.icon-PPT:before {
+  content: "\e611";
+}
+
+.icon-gaizhang:before {
+  content: "\e61a";
+}
+
+.icon-gonganbusanjidengbaojpeg:before {
+  content: "\e612";
+}
+
+.icon-dui:before {
+  content: "\ee7a";
+}
+
+.icon-hetong:before {
+  content: "\e62c";
+}
+
+.icon-QQ4:before {
+  content: "\e780";
+}
+
+.icon-yinzhangshenpi:before {
+  content: "\e6f1";
+}
+
+.icon-isoicon:before {
+  content: "\e60d";
+}
+
+.icon-yinzhang2:before {
+  content: "\e613";
+}
+
+.icon-VIP1:before {
+  content: "\e77d";
+}
+
+.icon-shaixuan:before {
+  content: "\e6e8";
+}
+
--- a/src/main/webapp/static/plugins/ms/1.0.0/compatible.js
+++ b/src/main/webapp/static/plugins/ms/1.0.0/compatible.js
-//ie的兼容
-
-//Object.assign 对ie对支持
 if (typeof Object.assign != 'function') {
    Object.assign = function(target) {
        'use strict';
@@ -20,4 +17,4 @@ if (typeof Object.assign != 'function') {
        }
        return target;
    };
-}
\ No newline at end of file
+}
--- a/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js
+++ b/src/main/webapp/static/plugins/ms/1.0.0/ms.util.js
@@ -21,127 +21,6 @@
        }
    }

-
-    /**
-     *
-     *
-     * @param dom dom 数据对象
-     * @param fileName 文件名
-     * @param data 数据
-     * @param format
-     * var tableNead = {
-                    column:[
-                        {filed: "projectName",label:"项目名称",width:50},
-                        {filed: "managerNickName",label:"成员名称",width:50},
-                        {filed: "pdmType",label:"种类",width:50,dictDataOptions: []},
-                        {filed: "pdmMoney",label:"收入金额",width:50},
-                    ],
-                    countFiled:["pdmMoney"],
-                };
-     * @returns {*}
-     */
-     function exportTable(dom, fileName, data,format) {
-        /* 从表生成工作簿对象 */
-        var wb = XLSX.utils.table_to_book(dom);
-        var columnWidth = [];
-        var table = [];
-        var tableHead = [];
-        //初始化头部字段
-        format.column.forEach(function (value) {
-            tableHead.push(value.label);
-            columnWidth.push({
-                "wpx": value.width
-            });
-        });
-        table.push(tableHead);
-        var tableFoot = new Array(format.column.length);
-
-        //遍历，将数据整理重新返回
-        data.map(function (x) {
-            var a = [];
-
-            //遍历中设定需要的那些字段数据
-            format.column.forEach(function (value) {
-                if (x.hasOwnProperty(value.filed)){
-                    //替换字典数据
-                    if (value.dictDataOptions != undefined && value.dictDataOptions.length > 0){
-                        //遍历字典数据，有就替换
-                       var dict = value.dictDataOptions.find(function (val) {
-                            return x[value.filed] == val.dictValue;
-                        })
-                        a.push(dict?dict.dictLabel:"");
-                    }else {
-                        a.push(x[value.filed]);
-                        if (format.countFiled != undefined && format.countFiled.indexOf(value.filed) >= 0) {
-                            tableFoot[0] = '总计';
-                            format.column.findIndex(function (value1, index) {
-                                if (value1.filed == value.filed){
-                                    tableFoot[index] = tableFoot[index] == undefined ? x[value.filed] : tableFoot[index] + x[value.filed];
-                                }
-                            });
-                        }
-                    }
-                }else {
-                    a.push("");
-                }
-            });
-            return a
-        }).forEach(function (v, i) {
-            // 遍历整理后的数据加入table
-            table.push(v)
-        });
-        table.push(tableFoot);
-        var sheet = XLSX2.utils.aoa_to_sheet(table);
-        wb.Sheets.Sheet1 = sheet;
-        wb.Sheets.Sheet1['!cols'] = columnWidth;
-        /* 获取二进制字符串作为输出 */
-        var wbout = XLSX.write(wb, {
-            bookType: 'xlsx',
-            bookSST: true,
-            type: "array"
-        });
-
-        try {
-            //保存文件
-            saveAs(
-                //Blob 对象表示一个不可变、原始数据的类文件对象。
-                //Blob 表示的不一定是JavaScript原生格式的数据。
-                //File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
-                //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
-                new Blob([wbout], {type: "application/octet-stream"}),
-                //设置导出文件名称
-                fileName + '.xlsx'
-            );
-        } catch (e) {
-            if (typeof console !== "undefined") console.log(e, wbout);
-        }
-        return wbout;
-    };
-
-    /**
-     * 打印方法
-     * @param name 模板的名字
-     * @param data 需要绑定的数据
-     */
-    function printFile(name,data){
-        if (name != "" && name != null && name != undefined){
-            ms.http.get(ms.manager+ "/mprint/printTemplate/get.do", {
-                name: name
-            }).then(function (res) {
-                if(data != null && data != undefined && res.data != null){
-                    printVue.open(res.data,data);
-                }else {
-                    console.error("未定义数据,或没有模板数据");
-                }
-            }).catch(function (err) {
-                console.log(err);
-            });
-        }else {
-            console.error("未定义模板名称");
-        }
-    };
-
-
    /**
     * 列表数据转化为树形结构的列表
     * @param source 数据源list
@@ -162,9 +41,8 @@
            branchArr.length > 0 ? father[children] = branchArr : '';
            return !father[parentId] || father[parentId] == '0' ||  father[parentId] == null ;
        });
-    } //验证是否为子集
-
-
+    }
+    //验证是否为子集
    function childValidate(sourceList, id, parentId, key, parentKey) {
        var data = sourceList.find(function (x) {
            return x[key] == parentId;
@@ -178,26 +56,6 @@
        return true;
    }

-    /**
-     * 科学计数改成普通计数
-     * @param num
-     * @returns {string|*}
-     */
-    function getFullNum(num){
-        //处理非数字
-        if(isNaN(num)){return num};
-        //处理不需要转换的数字
-        var str = ''+num;
-        if(!/e/i.test(str)){return num;};
-        return (num).toFixed(18).replace(/\.?0+$/, "");
-    }
-
-    /**
-     * 数字转金额
-     * */
-    function moneyFormatter(cellValue) {
-        return accounting.formatMoney(cellValue, '¥',2)
-    }
    //日期处理
    var date = {
        //格式化时间
@@ -367,14 +225,10 @@
        getParameter: getParameter,
        treeData:treeData,
        childValidate:childValidate,
-        moneyFormatter:moneyFormatter,
-        exportTable:exportTable,
-        printFile:printFile,
        date: date,
        array: array,
        log: log,
        convert: convert,
-        getFullNum: getFullNum,
        store: store,
    }