[功能]隆庆气体

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 苦糖果MES-软件开发记录
+VUE_APP_TITLE = 企业协同运营平台
 
 # 开发环境配置
 ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 苦糖果MES-软件开发记录
+VUE_APP_TITLE = 企业协同运营平台
 
 # 生产环境配置
 ENV = 'production'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 苦糖果MES-软件开发记录
+VUE_APP_TITLE = 企业协同运营平台
 
 NODE_ENV = production
 

package.json

@@ -1,13 +1,13 @@
 {
   "name": "ktg-mes-ui",
   "version": "3.8.2",
-  "description": "苦糖果MES",
+  "description": "企业协同运营平台",
   "author": "YinJinLu",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "build:stage": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },
@@ -62,7 +62,8 @@
     "vue-plugin-hiprint": "^0.0.54-fix",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
+    "vuex": "3.6.0",
+    "less-loader": "^5.0.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

public/daping/css/comon0.css

@@ -0,0 +1,200 @@
+@charset "utf-8";
+/* CSS Document */
+*{
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box}
+*,body{padding:0px;	margin:0px;color: #222;font-family: "微软雅黑";}
+@font-face{font-family:electronicFont;src:url(../font/DS-DIGIT.TTF)}
+body{ background:#000d4a url(../images/bg.jpg) center top; background-size:cover;color:#666;font-size: .1rem;}
+li{ list-style-type:none;}
+table{}
+i{ margin:0px; padding:0px; text-indent:0px;}
+img{ border:none; max-width: 100%;}
+a{ text-decoration:none; color:#399bff;}
+a.active,a:focus{ outline:none!important; text-decoration:none;}
+ol,ul,p,h1,h2,h3,h4,h5,h6{ padding:0; margin:0}
+a:hover{ color:#06c; text-decoration: none!important}
+
+
+.clearfix:after, .clearfix:before {
+	display: table;
+	content: " "
+}
+ .clearfix:after {
+	clear: both
+}
+.pulll_left{float:left;}
+.pulll_right{float:right;}
+/*谷哥滚动条样式*/
+
+  ::-webkit-scrollbar {width:5px;height:5px;position:absolute}
+  ::-webkit-scrollbar-thumb {background-color:#5bc0de}
+  ::-webkit-scrollbar-track {background-color:#ddd}
+
+/***/
+.canvas{position: absolute; width:100%; left: 0; top: 0; height: 99%; z-index: 1;}
+
+.allnav{height: calc(100% - 30px);}
+.loading{position:fixed; left:0; top:0; font-size:18px; z-index:100000000;width:100%; height:100%; background:#1a1a1c; text-align:center;}
+.loadbox{position:absolute; width:160px;height:150px; color: #aaa; left:50%; top:50%; margin-top:-100px; margin-left:-75px;}
+.loadbox img{ margin:10px auto; display:block; width:40px;}
+
+.copyright{ background:rgba(19,31,64,.32); border: 1px solid rgba(255,255,255,.05); line-height:.5rem; text-align: center; padding-right: 15px; bottom: 0; color:rgba(255,255,255,.7); font-size: .16rem; }
+
+.head{ height:1.05rem; background: url(../images/head_bg.png) no-repeat center center; background-size: 100% 100%; position: relative; z-index: 100;}
+.head h1{ color:#fff; text-align: center; font-size: .4rem; line-height:.8rem;}
+.head h1 img{ width:1.5rem; display: inline-block; vertical-align: middle; margin-right: .2rem}
+.weather{ position:absolute; right:.3rem; top:0; line-height: .75rem;}
+.weather img{ width:.37rem; display: inline-block; vertical-align: middle;}
+.weather span{color:rgba(255,255,255,.7); font-size: .18rem; padding-right: .1rem;}
+.mainbox{ padding:.1rem .1rem 0rem .1rem;}
+.mainbox>ul{}
+.mainbox>ul>li{ float: left; padding: 0 .1rem}
+
+.mainbox>ul>li{ width: 30%}
+.mainbox>ul>li:nth-child(2){ width: 40%;padding: 0}
+
+.boxall{ border: 1px solid rgba(25,186,139,.17); padding:0 .2rem .4rem .15rem;  background: rgba(255,255,255,.04) url(../images/line.png); background-size: 100% auto; position: relative; margin-bottom: .15rem; z-index: 10;}
+.boxall:before,
+.boxall:after{ position:absolute; width: .1rem; height: .1rem; content: "";  border-top: 2px solid #02a6b5; top: 0;}
+.boxall:before,.boxfoot:before{border-left: 2px solid #02a6b5;left: 0;}
+.boxall:after,.boxfoot:after{border-right: 2px solid #02a6b5; right: 0;}
+.alltitle{ font-size:.2rem; color:#fff; text-align: center; line-height: .5rem;}
+
+.boxfoot{ position:absolute; bottom: 0; width: 100%; left: 0;}
+.boxfoot:before,
+.boxfoot:after{ position:absolute; width: .1rem; height: .1rem;  content: "";border-bottom: 2px solid #02a6b5; bottom: 0;}
+
+.bar{background:rgba(101,132,226,.1); padding: .15rem;}
+.barbox li,.barbox2 li{ width:50%; text-align: center; position: relative; z-index: 100;}
+.barbox:before,
+.barbox:after{ position:absolute; width: .3rem; height: .1rem; content: ""; }
+.barbox:before{border-left: 2px solid #02a6b5;left: 0;border-top: 2px solid #02a6b5; }
+.barbox:after{border-right: 2px solid #02a6b5; right: 0; bottom: 0;border-bottom: 2px solid #02a6b5; }
+
+.barbox li:first-child:before{ position:absolute; content: ""; height:50%; width: 1px; background: rgba(255,255,255,.2); right: 0; top: 25%;}
+
+.barbox{  border: 1px solid rgba(25,186,139,.17); position: relative;}
+.barbox li{ font-size: .7rem; color: #ffeb7b; padding: .05rem 0;  font-family:electronicFont; font-weight: bold;}
+.barbox2 li{ font-size: .19rem; color:rgba(255,255,255,.7); padding-top: .1rem;}
+
+.map{  position:relative; height: 7.2rem; z-index: 9;}
+.map4{ width: 200%; height:7rem;  position: relative; left: -50%; top: 4%; margin-top: .2rem; z-index: 5;}
+.map1,.map2,.map3{ position:absolute; opacity: .5}
+.map1{ width:6.43rem; z-index: 2;top:.45rem; left: .7rem;  animation: myfirst2 15s infinite linear;}
+.map2{ width:5.66rem; top:.85rem; left:1.2rem; z-index: 3; opacity: 0.2; animation: myfirst 10s infinite linear;}
+.map3{ width:5.18rem; top:1.07rem; left: 1.4rem; z-index: 1;}
+
+
+
+
+
+.tabs { text-align: center; padding: .1rem 0 0 0;}
+.tabs a {
+    position: relative;
+    display: inline-block;
+    margin-left: 1px;
+    padding:.05rem .2rem;
+    color: #898989;
+    transition: all .3s ease-out 0s;
+    font-size: 14px;
+}
+.tabs li{ display:inline-block;}
+.tabs a:after {
+    position: absolute;
+    width: 1px;
+    height: 10px;
+    background-color: rgba(255,255,255,.1);
+    content: '';
+	 margin-left:0; right:-1px;    margin-top: 7px;
+	
+	
+}
+.tabs li a.active {border: 1px solid rgba(25,186,139,.17); background: rgba(255,255,255,.05); color:#fff;}
+
+.tit02{ text-align:center; margin: .1rem 0; position: relative}
+.tit02 span{border: 1px solid rgba(25,186,139,.17); letter-spacing: 2px; padding: .01rem .2rem; background: rgba(255,255,255,.05);  font-size: .18rem;  color: #49bcf7;}
+.tit02:before,.tit02:after{ position:absolute; width:26%; height: 1px;background: rgba(25,186,139,.2);  content: ""; top: .12rem;}
+.tit02:after{ right:0;}
+.tit02:before{ left:0;}
+
+.wrap{ height:2.54rem; overflow: hidden;}
+.wrap li{  line-height:.42rem; height:.42rem; font-size: .18rem; text-indent: .24rem; margin-bottom: .1rem; }
+.wrap li p{border: 1px solid rgba(25,186,139,.17);color: rgba(255,255,255,.6); }
+.sy{ float:left; width: 33%; height:95%; margin-top: .25rem;}
+
+
+.adduser{ height:1.5rem; overflow: hidden;}
+.adduser li{height:.5rem;}
+.adduser img{ width: .40rem; border-radius: .5rem; margin-right: .1rem; display: inline-block; vertical-align: middle;}
+.adduser span{  line-height:.5rem; font-size: .18rem;color: rgba(255,255,255,.6); }
+
+.sycm ul{ margin-left:-.5rem;margin-right:-.5rem;  padding: .16rem 0;}
+.sycm li{ float: left; width: 33.33%; text-align: center; position: relative}
+.sycm li:before{ position:absolute; content: ""; height:30%; width: 1px; background: rgba(255,255,255,.1); right: 0; top: 15%;}
+.sycm li:last-child:before{ width: 0;}
+
+.sycm li h2{ font-size:.3rem; color: #c5ccff;}
+.sycm li span{ font-size:.18rem; color: #fff; opacity: .5;}
+
+@keyframes myfirst2
+{
+from {transform: rotate(0deg);}
+to {transform: rotate(359deg);}
+}
+
+@keyframes myfirst
+{
+from {transform: rotate(0deg);}
+to {transform: rotate(-359deg);}
+}
+
+
+/*Plugin CSS*/
+.str_wrap {
+	overflow:hidden;
+	width:100%;
+	position:relative;
+	-moz-user-select: none;
+	-khtml-user-select: none;
+	user-select: none;  
+	white-space:nowrap;
+}
+
+
+.str_move { 
+	white-space:nowrap;
+	position:absolute; 
+	top:0; 
+	left:0;
+	cursor:move;
+}
+.str_move_clone {
+	display:inline-block;
+	vertical-align:top;
+	position:absolute; 
+	left:100%;
+	top:0;
+}
+.str_vertical .str_move_clone {
+	left:0;
+	top:100%;
+}
+.str_down .str_move_clone {
+	left:0;
+	bottom:100%;
+}
+.str_vertical .str_move,
+.str_down .str_move {
+	white-space:normal;
+	width:100%;
+}
+.str_static .str_move,
+.no_drag .str_move,
+.noStop .str_move{
+	cursor:inherit;
+}
+.str_wrap img {
+	max-width:none !important;	
+}

public/daping/index.html

@@ -0,0 +1,127 @@
+<!doctype html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>企业协同运营平台大数据可视化</title>
+  <script type="text/javascript" src="js/jquery.js"></script>
+  <link rel="stylesheet" href="css/comon0.css">
+</head>
+<script>
+  $(window).load(function () {
+    $(".loading").fadeOut()
+  })
+
+  /****/
+  $(document).ready(function () {
+    var whei = $(window).width()
+    $("html").css({ fontSize: whei / 20 })
+    $(window).resize(function () {
+      var whei = $(window).width()
+      $("html").css({ fontSize: whei / 20 })
+    });
+  });
+</script>
+<script type="text/javascript" src="js/echarts.min.js"></script>
+<script language="JavaScript" src="js/js.js"></script>
+
+<body>
+  <div class="canvas" style="opacity: .2">
+    <iframe frameborder="0" src="js/index.html" style="width: 100%; height: 100%"></iframe>
+  </div>
+  <div class="loading">
+    <div class="loadbox"> <img src="picture/loading.gif"> 页面加载中... </div>
+  </div>
+  <div class="head">
+    <h1>企业协同运营平台大数据可视化</h1>
+    <div class="weather"><img src="picture/weather.png"><span>多云转小雨</span><span id="showTime"></span></div>
+    <script>
+      var t = null;
+      t = setTimeout(time, 1000);//開始运行
+      function time() {
+        clearTimeout(t);//清除定时器
+        dt = new Date();
+        var y = dt.getFullYear();
+        var mt = dt.getMonth() + 1;
+        var day = dt.getDate();
+        var h = dt.getHours();//获取时
+        var m = dt.getMinutes();//获取分
+        var s = dt.getSeconds();//获取秒
+        document.getElementById("showTime").innerHTML = y + "年" + mt + "月" + day + "-" + h + "时" + m + "分" + s + "秒";
+        t = setTimeout(time, 1000); //设定定时器，循环运行     
+      }
+    </script>
+  </div>
+  <div class="mainbox">
+    <ul class="clearfix">
+      <li>
+        <div class="boxall" style="height: 3.2rem">
+          <div class="alltitle">本月单据量</div>
+          <div class="allnav" id="echart1"></div>
+          <div class="boxfoot"></div>
+        </div>
+        <div class="boxall" style="height: 3.2rem">
+          <div class="alltitle">钢瓶总数量</div>
+          <div class="allnav" id="echart2"></div>
+          <div class="boxfoot"></div>
+        </div>
+        <div class="boxall" style="height: 3.2rem">
+          <div style="height:100%; width: 100%;">
+            <div class="sy" id="fb1"></div>
+            <div class="sy" id="fb2"></div>
+            <div class="sy" id="fb3"></div>
+          </div>
+          <div class="boxfoot">
+
+          </div>
+        </div>
+      </li>
+      <li>
+        <div class="bar">
+          <div class="barbox">
+            <ul class="clearfix">
+              <li class="pulll_left counter">123</li>
+              <li class="pulll_left counter">456</li>
+            </ul>
+          </div>
+          <div class="barbox2">
+            <ul class="clearfix">
+              <li class="pulll_left">今日单据量</li>
+              <li class="pulll_left">本月单据量</li>
+            </ul>
+          </div>
+        </div>
+        <div class="map">
+          <div class="map1"><img src="picture/lbx.png"></div>
+          <div class="map2"><img src="picture/jt.png"></div>
+          <div class="map3"><img src="picture/map.png"></div>
+          <div class="map4" id="map_1"></div>
+        </div>
+      </li>
+      <li>
+        <div class="boxall" style="height:3.4rem">
+          <div class="alltitle">今日收入</div>
+          <div class="allnav" id="echart4"></div>
+          <div class="boxfoot"></div>
+        </div>
+        <div class="boxall" style="height: 3.2rem">
+          <div class="alltitle">本月收入</div>
+          <div class="allnav" id="echart5"></div>
+          <div class="boxfoot"></div>
+        </div>
+        <div class="boxall" style="height: 3rem">
+          <div class="alltitle">本年收入</div>
+          <div class="allnav" id="echart6"></div>
+          <div class="boxfoot"></div>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div class="back"></div>
+
+
+  <script type="text/javascript" src="js/china.js"></script>
+  <script type="text/javascript" src="js/area_echarts.js"></script>
+</body>
+
+</html>

public/daping/js/area_echarts.js

@@ -0,0 +1,515 @@
+
+$(function () {
+    map();
+    function map() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('map_1'));
+var data = [
+     {name: '海门', value: 69},
+     {name: '鄂尔多斯', value: 12},
+     {name: '招远', value: 12},
+     {name: '舟山', value: 12},
+     {name: '齐齐哈尔', value: 14},
+     {name: '盐城', value: 15},
+     {name: '赤峰', value: 16},
+     {name: '青岛', value: 18},
+     {name: '乳山', value: 18},
+     {name: '金昌', value: 19},
+     {name: '泉州', value: 21},
+     {name: '莱西', value: 21},
+     {name: '日照', value: 21},
+     {name: '胶南', value: 22},
+     {name: '南通', value: 23},
+     {name: '拉萨', value: 24},
+     {name: '云浮', value: 24},
+     {name: '梅州', value: 25},
+     {name: '文登', value: 25},
+     {name: '上海', value: 25},
+     {name: '攀枝花', value: 25},
+     {name: '威海', value: 25},
+     {name: '承德', value: 25},
+     {name: '厦门', value: 26},
+     {name: '汕尾', value: 26},
+     {name: '潮州', value: 26},
+     {name: '丹东', value: 27},
+     {name: '太仓', value: 27},
+     {name: '曲靖', value: 27},
+     {name: '烟台', value: 28},
+     {name: '福州', value: 29},
+     {name: '瓦房店', value: 30},
+     {name: '即墨', value: 30},
+     {name: '抚顺', value: 31},
+     {name: '玉溪', value: 31},
+     {name: '张家口', value: 31},
+     {name: '阳泉', value: 31},
+     {name: '莱州', value: 32},
+     {name: '湖州', value: 32},
+     {name: '汕头', value: 32},
+     {name: '昆山', value: 33},
+     {name: '宁波', value: 33},
+     {name: '湛江', value: 33},
+     {name: '揭阳', value: 34},
+     {name: '荣成', value: 34},
+     {name: '连云港', value: 35},
+     {name: '葫芦岛', value: 35},
+     {name: '常熟', value: 36},
+     {name: '东莞', value: 36},
+     {name: '河源', value: 36},
+     {name: '淮安', value: 36},
+     {name: '泰州', value: 36},
+     {name: '南宁', value: 37},
+     {name: '营口', value: 37},
+     {name: '惠州', value: 37},
+     {name: '江阴', value: 37},
+     {name: '蓬莱', value: 37},
+     {name: '韶关', value: 38},
+     {name: '嘉峪关', value: 38},
+     {name: '广州', value: 38},
+     {name: '延安', value: 38},
+     {name: '太原', value: 39},
+     {name: '清远', value: 39},
+     {name: '中山', value: 39},
+     {name: '昆明', value: 39},
+     {name: '寿光', value: 40},
+     {name: '盘锦', value: 40},
+     {name: '长治', value: 41},
+     {name: '深圳', value: 41},
+     {name: '珠海', value: 42},
+     {name: '宿迁', value: 43},
+     {name: '咸阳', value: 43},
+     {name: '铜川', value: 44},
+     {name: '平度', value: 44},
+     {name: '佛山', value: 44},
+     {name: '海口', value: 44},
+     {name: '江门', value: 45},
+     {name: '章丘', value: 45},
+     {name: '肇庆', value: 46},
+     {name: '大连', value: 47},
+     {name: '临汾', value: 47},
+     {name: '吴江', value: 47},
+     {name: '石嘴山', value: 49},
+     {name: '沈阳', value: 50},
+     {name: '苏州', value: 50},
+     {name: '茂名', value: 50},
+     {name: '嘉兴', value: 51},
+     {name: '长春', value: 51},
+     {name: '胶州', value: 52},
+     {name: '银川', value: 52},
+     {name: '张家港', value: 52},
+     {name: '三门峡', value: 53},
+     {name: '锦州', value: 54},
+     {name: '南昌', value: 54},
+     {name: '柳州', value: 54},
+     {name: '三亚', value: 54},
+     {name: '自贡', value: 56},
+     {name: '吉林', value: 56},
+     {name: '阳江', value: 57},
+     {name: '泸州', value: 57},
+     {name: '西宁', value: 57},
+     {name: '宜宾', value: 58},
+     {name: '呼和浩特', value: 58},
+     {name: '成都', value: 58},
+     {name: '大同', value: 58},
+     {name: '镇江', value: 59},
+     {name: '桂林', value: 59},
+     {name: '张家界', value: 59},
+     {name: '宜兴', value: 59},
+     {name: '北海', value: 60},
+     {name: '西安', value: 61},
+     {name: '金坛', value: 62},
+     {name: '东营', value: 62},
+     {name: '牡丹江', value: 63},
+     {name: '遵义', value: 63},
+     {name: '绍兴', value: 63},
+     {name: '扬州', value: 64},
+     {name: '常州', value: 64},
+     {name: '潍坊', value: 65},
+     {name: '重庆', value: 66},
+     {name: '台州', value: 67},
+     {name: '南京', value: 67},
+     {name: '滨州', value: 70},
+     {name: '贵阳', value: 71},
+     {name: '无锡', value: 71},
+     {name: '本溪', value: 71},
+     {name: '克拉玛依', value: 72},
+     {name: '渭南', value: 72},
+     {name: '马鞍山', value: 72},
+     {name: '宝鸡', value: 72},
+     {name: '焦作', value: 75},
+     {name: '句容', value: 75},
+     {name: '北京', value: 79},
+     {name: '徐州', value: 79},
+     {name: '衡水', value: 80},
+     {name: '包头', value: 80},
+     {name: '绵阳', value: 80},
+     {name: '乌鲁木齐', value: 84},
+     {name: '枣庄', value: 84},
+     {name: '杭州', value: 84},
+     {name: '淄博', value: 85},
+     {name: '鞍山', value: 86},
+     {name: '溧阳', value: 86},
+     {name: '库尔勒', value: 86},
+     {name: '安阳', value: 90},
+     {name: '开封', value: 90},
+     {name: '济南', value: 92},
+     {name: '德阳', value: 93},
+     {name: '温州', value: 95},
+     {name: '九江', value: 96},
+     {name: '邯郸', value: 98},
+     {name: '临安', value: 99},
+     {name: '兰州', value: 99},
+     {name: '沧州', value: 100},
+     {name: '临沂', value: 103},
+     {name: '南充', value: 104},
+     {name: '天津', value: 105},
+     {name: '富阳', value: 106},
+     {name: '泰安', value: 112},
+     {name: '诸暨', value: 112},
+     {name: '郑州', value: 313},
+     {name: '哈尔滨', value: 114},
+     {name: '聊城', value: 116},
+     {name: '芜湖', value: 117},
+     {name: '唐山', value: 119},
+     {name: '平顶山', value: 119},
+     {name: '邢台', value: 119},
+     {name: '德州', value: 120},
+     {name: '济宁', value: 120},
+     {name: '荆州', value: 127},
+     {name: '宜昌', value: 130},
+     {name: '义乌', value: 132},
+     {name: '丽水', value: 133},
+     {name: '洛阳', value: 134},
+     {name: '秦皇岛', value: 136},
+     {name: '株洲', value: 143},
+     {name: '石家庄', value: 147},
+     {name: '莱芜', value: 148},
+     {name: '常德', value: 152},
+     {name: '保定', value: 153},
+     {name: '湘潭', value: 154},
+     {name: '金华', value: 157},
+     {name: '岳阳', value: 169},
+     {name: '长沙', value: 175},
+     {name: '衢州', value: 177},
+     {name: '廊坊', value: 193},
+     {name: '菏泽', value: 194},
+     {name: '合肥', value: 229},
+     {name: '武汉', value: 273},
+     {name: '大庆', value: 279}
+];
+var geoCoordMap = {
+    '海门':[121.15,31.89],
+    '鄂尔多斯':[109.781327,39.608266],
+    '招远':[120.38,37.35],
+    '舟山':[122.207216,29.985295],
+    '齐齐哈尔':[123.97,47.33],
+    '盐城':[120.13,33.38],
+    '赤峰':[118.87,42.28],
+    '青岛':[120.33,36.07],
+    '乳山':[121.52,36.89],
+    '金昌':[102.188043,38.520089],
+    '泉州':[118.58,24.93],
+    '莱西':[120.53,36.86],
+    '日照':[119.46,35.42],
+    '胶南':[119.97,35.88],
+    '南通':[121.05,32.08],
+    '拉萨':[91.11,29.97],
+    '云浮':[112.02,22.93],
+    '梅州':[116.1,24.55],
+    '文登':[122.05,37.2],
+    '上海':[121.48,31.22],
+    '攀枝花':[101.718637,26.582347],
+    '威海':[122.1,37.5],
+    '承德':[117.93,40.97],
+    '厦门':[118.1,24.46],
+    '汕尾':[115.375279,22.786211],
+    '潮州':[116.63,23.68],
+    '丹东':[124.37,40.13],
+    '太仓':[121.1,31.45],
+    '曲靖':[103.79,25.51],
+    '烟台':[121.39,37.52],
+    '福州':[119.3,26.08],
+    '瓦房店':[121.979603,39.627114],
+    '即墨':[120.45,36.38],
+    '抚顺':[123.97,41.97],
+    '玉溪':[102.52,24.35],
+    '张家口':[114.87,40.82],
+    '阳泉':[113.57,37.85],
+    '莱州':[119.942327,37.177017],
+    '湖州':[120.1,30.86],
+    '汕头':[116.69,23.39],
+    '昆山':[120.95,31.39],
+    '宁波':[121.56,29.86],
+    '湛江':[110.359377,21.270708],
+    '揭阳':[116.35,23.55],
+    '荣成':[122.41,37.16],
+    '连云港':[119.16,34.59],
+    '葫芦岛':[120.836932,40.711052],
+    '常熟':[120.74,31.64],
+    '东莞':[113.75,23.04],
+    '河源':[114.68,23.73],
+    '淮安':[119.15,33.5],
+    '泰州':[119.9,32.49],
+    '南宁':[108.33,22.84],
+    '营口':[122.18,40.65],
+    '惠州':[114.4,23.09],
+    '江阴':[120.26,31.91],
+    '蓬莱':[120.75,37.8],
+    '韶关':[113.62,24.84],
+    '嘉峪关':[98.289152,39.77313],
+    '广州':[113.23,23.16],
+    '延安':[109.47,36.6],
+    '太原':[112.53,37.87],
+    '清远':[113.01,23.7],
+    '中山':[113.38,22.52],
+    '昆明':[102.73,25.04],
+    '寿光':[118.73,36.86],
+    '盘锦':[122.070714,41.119997],
+    '长治':[113.08,36.18],
+    '深圳':[114.07,22.62],
+    '珠海':[113.52,22.3],
+    '宿迁':[118.3,33.96],
+    '咸阳':[108.72,34.36],
+    '铜川':[109.11,35.09],
+    '平度':[119.97,36.77],
+    '佛山':[113.11,23.05],
+    '海口':[110.35,20.02],
+    '江门':[113.06,22.61],
+    '章丘':[117.53,36.72],
+    '肇庆':[112.44,23.05],
+    '大连':[121.62,38.92],
+    '临汾':[111.5,36.08],
+    '吴江':[120.63,31.16],
+    '石嘴山':[106.39,39.04],
+    '沈阳':[123.38,41.8],
+    '苏州':[120.62,31.32],
+    '茂名':[110.88,21.68],
+    '嘉兴':[120.76,30.77],
+    '长春':[125.35,43.88],
+    '胶州':[120.03336,36.264622],
+    '银川':[106.27,38.47],
+    '张家港':[120.555821,31.875428],
+    '三门峡':[111.19,34.76],
+    '锦州':[121.15,41.13],
+    '南昌':[115.89,28.68],
+    '柳州':[109.4,24.33],
+    '三亚':[109.511909,18.252847],
+    '自贡':[104.778442,29.33903],
+    '吉林':[126.57,43.87],
+    '阳江':[111.95,21.85],
+    '泸州':[105.39,28.91],
+    '西宁':[101.74,36.56],
+    '宜宾':[104.56,29.77],
+    '呼和浩特':[111.65,40.82],
+    '成都':[104.06,30.67],
+    '大同':[113.3,40.12],
+    '镇江':[119.44,32.2],
+    '桂林':[110.28,25.29],
+    '张家界':[110.479191,29.117096],
+    '宜兴':[119.82,31.36],
+    '北海':[109.12,21.49],
+    '西安':[108.95,34.27],
+    '金坛':[119.56,31.74],
+    '东营':[118.49,37.46],
+    '牡丹江':[129.58,44.6],
+    '遵义':[106.9,27.7],
+    '绍兴':[120.58,30.01],
+    '扬州':[119.42,32.39],
+    '常州':[119.95,31.79],
+    '潍坊':[119.1,36.62],
+    '重庆':[106.54,29.59],
+    '台州':[121.420757,28.656386],
+    '南京':[118.78,32.04],
+    '滨州':[118.03,37.36],
+    '贵阳':[106.71,26.57],
+    '无锡':[120.29,31.59],
+    '本溪':[123.73,41.3],
+    '克拉玛依':[84.77,45.59],
+    '渭南':[109.5,34.52],
+    '马鞍山':[118.48,31.56],
+    '宝鸡':[107.15,34.38],
+    '焦作':[113.21,35.24],
+    '句容':[119.16,31.95],
+    '北京':[116.46,39.92],
+    '徐州':[117.2,34.26],
+    '衡水':[115.72,37.72],
+    '包头':[110,40.58],
+    '绵阳':[104.73,31.48],
+    '乌鲁木齐':[87.68,43.77],
+    '枣庄':[117.57,34.86],
+    '杭州':[120.19,30.26],
+    '淄博':[118.05,36.78],
+    '鞍山':[122.85,41.12],
+    '溧阳':[119.48,31.43],
+    '库尔勒':[86.06,41.68],
+    '安阳':[114.35,36.1],
+    '开封':[114.35,34.79],
+    '济南':[117,36.65],
+    '德阳':[104.37,31.13],
+    '温州':[120.65,28.01],
+    '九江':[115.97,29.71],
+    '邯郸':[114.47,36.6],
+    '临安':[119.72,30.23],
+    '兰州':[103.73,36.03],
+    '沧州':[116.83,38.33],
+    '临沂':[118.35,35.05],
+    '南充':[106.110698,30.837793],
+    '天津':[117.2,39.13],
+    '富阳':[119.95,30.07],
+    '泰安':[117.13,36.18],
+    '诸暨':[120.23,29.71],
+    '郑州':[113.65,34.76],
+    '哈尔滨':[126.63,45.75],
+    '聊城':[115.97,36.45],
+    '芜湖':[118.38,31.33],
+    '唐山':[118.02,39.63],
+    '平顶山':[113.29,33.75],
+    '邢台':[114.48,37.05],
+    '德州':[116.29,37.45],
+    '济宁':[116.59,35.38],
+    '荆州':[112.239741,30.335165],
+    '宜昌':[111.3,30.7],
+    '义乌':[120.06,29.32],
+    '丽水':[119.92,28.45],
+    '洛阳':[112.44,34.7],
+    '秦皇岛':[119.57,39.95],
+    '株洲':[113.16,27.83],
+    '石家庄':[114.48,38.03],
+    '莱芜':[117.67,36.19],
+    '常德':[111.69,29.05],
+    '保定':[115.48,38.85],
+    '湘潭':[112.91,27.87],
+    '金华':[119.64,29.12],
+    '岳阳':[113.09,29.37],
+    '长沙':[113,28.21],
+    '衢州':[118.88,28.97],
+    '廊坊':[116.7,39.53],
+    '菏泽':[115.480656,35.23375],
+    '合肥':[117.27,31.86],
+    '武汉':[114.31,30.52],
+    '大庆':[125.03,46.58]
+};
+var convertData = function (data) {
+    var res = [];
+    for (var i = 0; i < data.length; i++) {
+        var geoCoord = geoCoordMap[data[i].name];
+        if (geoCoord) {
+            res.push({
+                name: data[i].name,
+                value: geoCoord.concat(data[i].value)
+            });
+        }
+    }
+    return res;
+};
+
+option = {
+   // backgroundColor: '#404a59',
+  /***  title: {
+        text: '实时行驶车辆',
+        subtext: 'data from PM25.in',
+        sublink: 'http://www.pm25.in',
+        left: 'center',
+        textStyle: {
+            color: '#fff'
+        }
+    },**/
+    tooltip : {
+        trigger: 'item',
+		formatter: function (params) {
+              if(typeof(params.value)[2] == "undefined"){
+              	return params.name + ' : ' + params.value;
+              }else{
+              	return params.name + ' : ' + params.value[2];
+              }
+            }
+    },
+  
+    geo: {
+        map: 'china',
+        label: {
+            emphasis: {
+                show: false
+            }
+        },
+        roam: false,//禁止其放大缩小
+        itemStyle: {
+            normal: {
+                areaColor: '#4c60ff',
+                borderColor: '#002097'
+            },
+            emphasis: {
+                areaColor: '#293fff'
+            }
+        }
+    },
+    series : [
+        {
+            name: '消费金额',
+            type: 'scatter',
+            coordinateSystem: 'geo',
+            data: convertData(data),
+            symbolSize: function (val) {
+                return val[2] / 15;
+            },
+            label: {
+                normal: {
+                    formatter: '{b}',
+                    position: 'right',
+                    show: false
+                },
+                emphasis: {
+                    show: true
+                }
+            },
+            itemStyle: {
+                normal: {
+                    color: '#ffeb7b'
+                }
+            }
+        }
+		
+		/**
+		,
+        {
+            name: 'Top 5',
+            type: 'effectScatter',
+            coordinateSystem: 'geo',
+            data: convertData(data.sort(function (a, b) {
+                return b.value - a.value;
+            }).slice(0, 6)),
+            symbolSize: function (val) {
+                return val[2] / 20;
+            },
+            showEffectOn: 'render',
+            rippleEffect: {
+                brushType: 'stroke'
+            },
+            hoverAnimation: true,
+            label: {
+                normal: {
+                    formatter: '{b}',
+                    position: 'right',
+                    show: true
+                }
+            },
+            itemStyle: {
+                normal: {
+                    color: '#ffd800',
+                    shadowBlur: 10,
+                    shadowColor: 'rgba(0,0,0,.3)'
+                }
+            },
+            zlevel: 1
+        }
+		**/
+    ]
+};
+		
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+
+})
+

public/daping/js/index.html

@@ -0,0 +1,353 @@
+<html><head>
+<meta charset="utf-8">
+<title>www.husonghe.com</title>
+<style>
+html {
+  height: 100%;
+  background-image: -webkit-radial-gradient(ellipse farthest-corner at center center, #1b44e4 0%, #020f3a 100%);
+  background-image: radial-gradient(ellipse farthest-corner at center center, #1b44e4 0%, #020f3a 100%);
+  cursor: move;
+}
+
+body {
+  width: 100%;
+  margin: 0;
+  overflow: hidden;
+}
+</style>
+</head>
+
+<body>
+
+
+<canvas id="canv" width="1920" height="572"></canvas>
+<script>
+var num = 200;
+var w = window.innerWidth;
+var h = window.innerHeight;
+var max = 100;
+var _x = 0;
+var _y = 0;
+var _z = 150;
+var dtr = function(d) {
+  return d * Math.PI / 180;
+};
+
+var rnd = function() {
+  return Math.sin(Math.floor(Math.random() * 360) * Math.PI / 180);
+};
+var dist = function(p1, p2, p3) {
+  return Math.sqrt(Math.pow(p2.x - p1.x, 2) + Math.pow(p2.y - p1.y, 2) + Math.pow(p2.z - p1.z, 2));
+};
+
+var cam = {
+  obj: {
+    x: _x,
+    y: _y,
+    z: _z
+  },
+  dest: {
+    x: 0,
+    y: 0,
+    z: 1
+  },
+  dist: {
+    x: 0,
+    y: 0,
+    z: 200
+  },
+  ang: {
+    cplane: 0,
+    splane: 0,
+    ctheta: 0,
+    stheta: 0
+  },
+  zoom: 1,
+  disp: {
+    x: w / 2,
+    y: h / 2,
+    z: 0
+  },
+  upd: function() {
+    cam.dist.x = cam.dest.x - cam.obj.x;
+    cam.dist.y = cam.dest.y - cam.obj.y;
+    cam.dist.z = cam.dest.z - cam.obj.z;
+    cam.ang.cplane = -cam.dist.z / Math.sqrt(cam.dist.x * cam.dist.x + cam.dist.z * cam.dist.z);
+    cam.ang.splane = cam.dist.x / Math.sqrt(cam.dist.x * cam.dist.x + cam.dist.z * cam.dist.z);
+    cam.ang.ctheta = Math.sqrt(cam.dist.x * cam.dist.x + cam.dist.z * cam.dist.z) / Math.sqrt(cam.dist.x * cam.dist.x + cam.dist.y * cam.dist.y + cam.dist.z * cam.dist.z);
+    cam.ang.stheta = -cam.dist.y / Math.sqrt(cam.dist.x * cam.dist.x + cam.dist.y * cam.dist.y + cam.dist.z * cam.dist.z);
+  }
+};
+
+var trans = {
+  parts: {
+    sz: function(p, sz) {
+      return {
+        x: p.x * sz.x,
+        y: p.y * sz.y,
+        z: p.z * sz.z
+      };
+    },
+    rot: {
+      x: function(p, rot) {
+        return {
+          x: p.x,
+          y: p.y * Math.cos(dtr(rot.x)) - p.z * Math.sin(dtr(rot.x)),
+          z: p.y * Math.sin(dtr(rot.x)) + p.z * Math.cos(dtr(rot.x))
+        };
+      },
+      y: function(p, rot) {
+        return {
+          x: p.x * Math.cos(dtr(rot.y)) + p.z * Math.sin(dtr(rot.y)),
+          y: p.y,
+          z: -p.x * Math.sin(dtr(rot.y)) + p.z * Math.cos(dtr(rot.y))
+        };
+      },
+      z: function(p, rot) {
+        return {
+          x: p.x * Math.cos(dtr(rot.z)) - p.y * Math.sin(dtr(rot.z)),
+          y: p.x * Math.sin(dtr(rot.z)) + p.y * Math.cos(dtr(rot.z)),
+          z: p.z
+        };
+      }
+    },
+    pos: function(p, pos) {
+      return {
+        x: p.x + pos.x,
+        y: p.y + pos.y,
+        z: p.z + pos.z
+      };
+    }
+  },
+  pov: {
+    plane: function(p) {
+      return {
+        x: p.x * cam.ang.cplane + p.z * cam.ang.splane,
+        y: p.y,
+        z: p.x * -cam.ang.splane + p.z * cam.ang.cplane
+      };
+    },
+    theta: function(p) {
+      return {
+        x: p.x,
+        y: p.y * cam.ang.ctheta - p.z * cam.ang.stheta,
+        z: p.y * cam.ang.stheta + p.z * cam.ang.ctheta
+      };
+    },
+    set: function(p) {
+      return {
+        x: p.x - cam.obj.x,
+        y: p.y - cam.obj.y,
+        z: p.z - cam.obj.z
+      };
+    }
+  },
+  persp: function(p) {
+    return {
+      x: p.x * cam.dist.z / p.z * cam.zoom,
+      y: p.y * cam.dist.z / p.z * cam.zoom,
+      z: p.z * cam.zoom,
+      p: cam.dist.z / p.z
+    };
+  },
+  disp: function(p, disp) {
+    return {
+      x: p.x + disp.x,
+      y: -p.y + disp.y,
+      z: p.z + disp.z,
+      p: p.p
+    };
+  },
+  steps: function(_obj_, sz, rot, pos, disp) {
+    var _args = trans.parts.sz(_obj_, sz);
+    _args = trans.parts.rot.x(_args, rot);
+    _args = trans.parts.rot.y(_args, rot);
+    _args = trans.parts.rot.z(_args, rot);
+    _args = trans.parts.pos(_args, pos);
+    _args = trans.pov.plane(_args);
+    _args = trans.pov.theta(_args);
+    _args = trans.pov.set(_args);
+    _args = trans.persp(_args);
+    _args = trans.disp(_args, disp);
+    return _args;
+  }
+};
+
+(function() {
+  "use strict";
+  var threeD = function(param) {
+    this.transIn = {};
+    this.transOut = {};
+    this.transIn.vtx = (param.vtx);
+    this.transIn.sz = (param.sz);
+    this.transIn.rot = (param.rot);
+    this.transIn.pos = (param.pos);
+  };
+
+  threeD.prototype.vupd = function() {
+    this.transOut = trans.steps(
+
+      this.transIn.vtx,
+      this.transIn.sz,
+      this.transIn.rot,
+      this.transIn.pos,
+      cam.disp
+    );
+  };
+
+  var Build = function() {
+    this.vel = 0.04;
+    this.lim = 360;
+    this.diff = 200;
+    this.initPos = 100;
+    this.toX = _x;
+    this.toY = _y;
+    this.go();
+  };
+
+  Build.prototype.go = function() {
+    this.canvas = document.getElementById("canv");
+    this.canvas.width = window.innerWidth;
+    this.canvas.height = window.innerHeight;
+    this.$ = canv.getContext("2d");
+    this.$.globalCompositeOperation = 'source-over';
+    this.varr = [];
+    this.dist = [];
+    this.calc = [];
+
+    for (var i = 0, len = num; i < len; i++) {
+      this.add();
+    }
+
+    this.rotObj = {
+      x: 0,
+      y: 0,
+      z: 0
+    };
+    this.objSz = {
+      x: w / 5,
+      y: h / 5,
+      z: w / 5
+    };
+  };
+
+  Build.prototype.add = function() {
+    this.varr.push(new threeD({
+      vtx: {
+        x: rnd(),
+        y: rnd(),
+        z: rnd()
+      },
+      sz: {
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      rot: {
+        x: 20,
+        y: -20,
+        z: 0
+      },
+      pos: {
+        x: this.diff * Math.sin(360 * Math.random() * Math.PI / 180),
+        y: this.diff * Math.sin(360 * Math.random() * Math.PI / 180),
+        z: this.diff * Math.sin(360 * Math.random() * Math.PI / 180)
+      }
+    }));
+    this.calc.push({
+      x: 360 * Math.random(),
+      y: 360 * Math.random(),
+      z: 360 * Math.random()
+    });
+  };
+
+  Build.prototype.upd = function() {
+    cam.obj.x += (this.toX - cam.obj.x) * 0.05;
+    cam.obj.y += (this.toY - cam.obj.y) * 0.05;
+  };
+
+  Build.prototype.draw = function() {
+    this.$.clearRect(0, 0, this.canvas.width, this.canvas.height);
+    cam.upd();
+    this.rotObj.x += 0.1;
+    this.rotObj.y += 0.1;
+    this.rotObj.z += 0.1;
+
+    for (var i = 0; i < this.varr.length; i++) {
+      for (var val in this.calc[i]) {
+        if (this.calc[i].hasOwnProperty(val)) {
+          this.calc[i][val] += this.vel;
+          if (this.calc[i][val] > this.lim) this.calc[i][val] = 0;
+        }
+      }
+
+      this.varr[i].transIn.pos = {
+        x: this.diff * Math.cos(this.calc[i].x * Math.PI / 180),
+        y: this.diff * Math.sin(this.calc[i].y * Math.PI / 180),
+        z: this.diff * Math.sin(this.calc[i].z * Math.PI / 180)
+      };
+      this.varr[i].transIn.rot = this.rotObj;
+      this.varr[i].transIn.sz = this.objSz;
+      this.varr[i].vupd();
+      if (this.varr[i].transOut.p < 0) continue;
+      var g = this.$.createRadialGradient(this.varr[i].transOut.x, this.varr[i].transOut.y, this.varr[i].transOut.p, this.varr[i].transOut.x, this.varr[i].transOut.y, this.varr[i].transOut.p * 2);
+      this.$.globalCompositeOperation = 'lighter';
+      g.addColorStop(0, 'hsla(255, 255%, 255%, 1)');
+      g.addColorStop(.5, 'hsla(' + (i + 2) + ',85%, 40%,1)');
+      g.addColorStop(1, 'hsla(' + (i) + ',85%, 40%,.5)');
+      this.$.fillStyle = g;
+      this.$.beginPath();
+      this.$.arc(this.varr[i].transOut.x, this.varr[i].transOut.y, this.varr[i].transOut.p * 2, 0, Math.PI * 2, false);
+      this.$.fill();
+      this.$.closePath();
+    }
+  };
+  Build.prototype.anim = function() {
+    window.requestAnimationFrame = (function() {
+      return window.requestAnimationFrame ||
+        function(callback, element) {
+          window.setTimeout(callback, 1000 / 60);
+        };
+    })();
+    var anim = function() {
+      this.upd();
+      this.draw();
+      window.requestAnimationFrame(anim);
+
+    }.bind(this);
+    window.requestAnimationFrame(anim);
+  };
+
+  Build.prototype.run = function() {
+    this.anim();
+
+    window.addEventListener('mousemove', function(e) {
+      this.toX = (e.clientX - this.canvas.width / 2) * -0.8;
+      this.toY = (e.clientY - this.canvas.height / 2) * 0.8;
+    }.bind(this));
+    window.addEventListener('touchmove', function(e) {
+      e.preventDefault();
+      this.toX = (e.touches[0].clientX - this.canvas.width / 2) * -0.8;
+      this.toY = (e.touches[0].clientY - this.canvas.height / 2) * 0.8;
+    }.bind(this));
+    window.addEventListener('mousedown', function(e) {
+      for (var i = 0; i < 100; i++) {
+        this.add();
+      }
+    }.bind(this));
+    window.addEventListener('touchstart', function(e) {
+      e.preventDefault();
+      for (var i = 0; i < 100; i++) {
+        this.add();
+      }
+    }.bind(this));
+  };
+  var app = new Build();
+  app.run();
+})();
+window.addEventListener('resize', function() {
+  canvas.width = w = window.innerWidth;
+  canvas.height = h = window.innerHeight;
+}, false);
+</script>
+</body></html>

public/daping/js/js.js

@@ -0,0 +1,796 @@
+
+$(function () {
+echarts_1();
+echarts_2();
+echarts_4();
+echarts_31();
+echarts_32();
+echarts_33();
+echarts_5();
+echarts_6();
+function echarts_1() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('echart1'));
+
+       option = {
+  //  backgroundColor: '#00265f',
+    tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+            type: 'shadow'
+        }
+    },
+    grid: {
+        left: '0%',
+		top:'10px',
+        right: '0%',
+        bottom: '4%',
+       containLabel: true
+    },
+    xAxis: [{
+        type: 'category',
+      		data: ['浙江', '上海', '江苏', '广东', '北京', '深圳', '安徽'],
+        axisLine: {
+            show: true,
+         lineStyle: {
+                color: "rgba(255,255,255,.1)",
+                width: 1,
+                type: "solid"
+            },
+        },
+		
+        axisTick: {
+            show: false,
+        },
+		axisLabel:  {
+                interval: 0,
+               // rotate:50,
+                show: true,
+                splitNumber: 15,
+                textStyle: {
+ 					color: "rgba(255,255,255,.6)",
+                    fontSize: '12',
+                },
+            },
+    }],
+    yAxis: [{
+        type: 'value',
+        axisLabel: {
+           //formatter: '{value} %'
+			show:true,
+			 textStyle: {
+ 					color: "rgba(255,255,255,.6)",
+                    fontSize: '12',
+                },
+        },
+        axisTick: {
+            show: false,
+        },
+        axisLine: {
+            show: true,
+            lineStyle: {
+                color: "rgba(255,255,255,.1	)",
+                width: 1,
+                type: "solid"
+            },
+        },
+        splitLine: {
+            lineStyle: {
+               color: "rgba(255,255,255,.1)",
+            }
+        }
+    }],
+    series: [
+		{
+        type: 'bar',
+        data: [200, 300, 300, 900, 1500, 1200, 600],
+        barWidth:'35%', //柱子宽度
+       // barGap: 1, //柱子之间间距
+        itemStyle: {
+            normal: {
+                color:'#2f89cf',
+                opacity: 1,
+				barBorderRadius: 5,
+            }
+        }
+    }
+		
+	]
+};
+      
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+function echarts_2() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('echart2'));
+
+       option = {
+  //  backgroundColor: '#00265f',
+    tooltip: {
+        trigger: 'axis',
+        axisPointer: { type: 'shadow'}
+    },
+    grid: {
+        left: '0%',
+		top:'10px',
+        right: '0%',
+        bottom: '4%',
+       containLabel: true
+    },
+    xAxis: [{
+        type: 'category',
+      		data: ['浙江', '上海', '江苏', '广东', '北京', '深圳', '安徽'],
+        axisLine: {
+            show: true,
+         lineStyle: {
+                color: "rgba(255,255,255,.1)",
+                width: 1,
+                type: "solid"
+            },
+        },
+		
+        axisTick: {
+            show: false,
+        },
+		axisLabel:  {
+                interval: 0,
+               // rotate:50,
+                show: true,
+                splitNumber: 15,
+                textStyle: {
+ 					color: "rgba(255,255,255,.6)",
+                    fontSize: '12',
+                },
+            },
+    }],
+    yAxis: [{
+        type: 'value',
+        axisLabel: {
+           //formatter: '{value} %'
+			show:true,
+			 textStyle: {
+ 					color: "rgba(255,255,255,.6)",
+                    fontSize: '12',
+                },
+        },
+        axisTick: {
+            show: false,
+        },
+        axisLine: {
+            show: true,
+            lineStyle: {
+                color: "rgba(255,255,255,.1	)",
+                width: 1,
+                type: "solid"
+            },
+        },
+        splitLine: {
+            lineStyle: {
+               color: "rgba(255,255,255,.1)",
+            }
+        }
+    }],
+    series: [
+		{
+       
+        type: 'bar',
+        data: [1500, 1200, 600, 200, 300, 300, 900],
+        barWidth:'35%', //柱子宽度
+       // barGap: 1, //柱子之间间距
+        itemStyle: {
+            normal: {
+                color:'#27d08a',
+                opacity: 1,
+				barBorderRadius: 5,
+            }
+        }
+    }
+		
+	]
+};
+      
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+function echarts_5() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('echart5'));
+
+       option = {
+  //  backgroundColor: '#00265f',
+    tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+            type: 'shadow'
+        }
+    },
+    
+    grid: {
+        left: '0%',
+		top:'10px',
+        right: '0%',
+        bottom: '2%',
+       containLabel: true
+    },
+    xAxis: [{
+        type: 'category',
+      		data: ['浙江', '上海', '江苏', '广东', '北京', '深圳', '安徽', '四川'],
+        axisLine: {
+            show: true,
+         lineStyle: {
+                color: "rgba(255,255,255,.1)",
+                width: 1,
+                type: "solid"
+            },
+        },
+		
+        axisTick: {
+            show: false,
+        },
+		axisLabel:  {
+                interval: 0,
+               // rotate:50,
+                show: true,
+                splitNumber: 15,
+                textStyle: {
+ 					color: "rgba(255,255,255,.6)",
+                    fontSize: '12',
+                },
+            },
+    }],
+    yAxis: [{
+        type: 'value',
+        axisLabel: {
+           //formatter: '{value} %'
+			show:true,
+			 textStyle: {
+ 					color: "rgba(255,255,255,.6)",
+                    fontSize: '12',
+                },
+        },
+        axisTick: {
+            show: false,
+        },
+        axisLine: {
+            show: true,
+            lineStyle: {
+                color: "rgba(255,255,255,.1	)",
+                width: 1,
+                type: "solid"
+            },
+        },
+        splitLine: {
+            lineStyle: {
+               color: "rgba(255,255,255,.1)",
+            }
+        }
+    }],
+    series: [{
+        type: 'bar',
+        data: [2, 3, 3, 9, 15, 12, 6, 4, 6, 7, 4, 10],
+        barWidth:'35%', //柱子宽度
+       // barGap: 1, //柱子之间间距
+        itemStyle: {
+            normal: {
+                color:'#2f89cf',
+                opacity: 1,
+				barBorderRadius: 5,
+            }
+        }
+    }
+	]
+};
+      
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+	
+function echarts_4() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('echart4'));
+
+    option = {
+	    tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+            lineStyle: {
+                color: '#dddc6b'
+            }
+        }
+    },
+		    legend: {
+    top:'0%',
+        data:['上海','浙江'],
+                textStyle: {
+           color: 'rgba(255,255,255,.5)',
+			fontSize:'12',
+        }
+    },
+    grid: {
+        left: '10',
+		top: '30',
+        right: '10',
+        bottom: '10',
+        containLabel: true
+    },
+
+    xAxis: [{
+        type: 'category',
+        boundaryGap: false,
+axisLabel:  {
+                textStyle: {
+ 					color: "rgba(255,255,255,.6)",
+					fontSize:12,
+                },
+            },
+        axisLine: {
+			lineStyle: { 
+				color: 'rgba(255,255,255,.2)'
+			}
+
+        },
+
+   data: ['01', '02', '03', '04', '05', '06', '07', '08', '09', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24']
+
+    }, {
+
+        axisPointer: {show: false},
+        axisLine: {  show: false},
+        position: 'bottom',
+        offset: 20,
+
+       
+
+    }],
+
+    yAxis: [{
+        type: 'value',
+        axisTick: {show: false},
+        axisLine: {
+            lineStyle: {
+                color: 'rgba(255,255,255,.1)'
+            }
+        },
+       axisLabel:  {
+                textStyle: {
+ 					color: "rgba(255,255,255,.6)",
+					fontSize:12,
+                },
+            },
+
+        splitLine: {
+            lineStyle: {
+                 color: 'rgba(255,255,255,.1)'
+            }
+        }
+    }],
+    series: [
+		{
+        name: '浙江',
+        type: 'line',
+         smooth: true,
+        symbol: 'circle',
+        symbolSize: 5,
+        showSymbol: false,
+        lineStyle: {
+			
+            normal: {
+				color: '#0184d5',
+                width: 2
+            }
+        },
+        areaStyle: {
+            normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                    offset: 0,
+                    color: 'rgba(1, 132, 213, 0.4)'
+                }, {
+                    offset: 0.8,
+                    color: 'rgba(1, 132, 213, 0.1)'
+                }], false),
+                shadowColor: 'rgba(0, 0, 0, 0.1)',
+            }
+        },
+			itemStyle: {
+			normal: {
+				color: '#0184d5',
+				borderColor: 'rgba(221, 220, 107, .1)',
+				borderWidth: 12
+			}
+		},
+        data: [3, 4, 3, 4, 3, 4, 3, 6, 2, 4, 2, 4,3, 4, 3, 4, 3, 4, 3, 6, 2, 4, 2, 4]
+
+    }, 
+{
+        name: '上海',
+        type: 'line',
+        smooth: true,
+        symbol: 'circle',
+        symbolSize: 5,
+        showSymbol: false,
+        lineStyle: {
+			
+            normal: {
+				color: '#00d887',
+                width: 2
+            }
+        },
+        areaStyle: {
+            normal: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                    offset: 0,
+                    color: 'rgba(0, 216, 135, 0.4)'
+                }, {
+                    offset: 0.8,
+                    color: 'rgba(0, 216, 135, 0.1)'
+                }], false),
+                shadowColor: 'rgba(0, 0, 0, 0.1)',
+            }
+        },
+			itemStyle: {
+			normal: {
+				color: '#00d887',
+				borderColor: 'rgba(221, 220, 107, .1)',
+				borderWidth: 12
+			}
+		},
+        data: [5, 3, 5, 6, 1, 5, 3, 5, 6, 4, 6, 4, 8, 3, 5, 6, 1, 5, 3, 7, 2, 5, 1, 4]
+
+    }, 
+	
+		 ]
+
+};
+      
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+function echarts_6() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('echart6'));
+
+        var dataStyle = {
+	normal: {
+		label: {
+			show: false
+		},
+		labelLine: {
+			show: false
+		},
+		//shadowBlur: 40,
+		//shadowColor: 'rgba(40, 40, 40, 1)',
+	}
+};
+var placeHolderStyle = {
+	normal: {
+		color: 'rgba(255,255,255,.05)',
+		label: {show: false,},
+		labelLine: {show: false}
+	},
+	emphasis: {
+		color: 'rgba(0,0,0,0)'
+	}
+};
+option = {
+	color: ['#0f63d6', '#0f78d6', '#0f8cd6', '#0fa0d6', '#0fb4d6'],
+	tooltip: {
+		show: true,
+		formatter: "{a} : {c} "
+	},
+	legend: {
+		itemWidth: 10,
+        itemHeight: 10,
+		itemGap: 12,
+		bottom: '3%',
+		
+		data: ['浙江', '上海', '广东', '北京', '深圳'],
+		textStyle: {
+                    color: 'rgba(255,255,255,.6)',
+                }
+	},
+	
+	series: [
+		{
+		name: '浙江',
+		type: 'pie',
+		clockWise: false,
+		center: ['50%', '42%'],
+		radius: ['59%', '70%'],
+		itemStyle: dataStyle,
+		hoverAnimation: false,
+		data: [{
+			value: 80,
+			name: '01'
+		}, {
+			value: 20,
+			name: 'invisible',
+			tooltip: {show: false},
+			itemStyle: placeHolderStyle
+		}]
+	},
+		{
+		name: '上海',
+		type: 'pie',
+		clockWise: false,
+		center: ['50%', '42%'],
+		radius: ['49%', '60%'],
+		itemStyle: dataStyle,
+		hoverAnimation: false,
+		data: [{
+			value: 70,
+			name: '02'
+		}, {
+			value: 30,
+			name: 'invisible',
+			tooltip: {show: false},
+			itemStyle: placeHolderStyle
+		}]
+	}, 
+		{
+		name: '广东',
+		type: 'pie',
+		clockWise: false,
+		hoverAnimation: false,
+		center: ['50%', '42%'],
+		radius: ['39%', '50%'],
+		itemStyle: dataStyle,
+		data: [{
+			value: 65,
+			name: '03'
+		}, {
+			value: 35,
+			name: 'invisible',
+			tooltip: {show: false},
+			itemStyle: placeHolderStyle
+		}]
+	},
+		{
+		name: '北京',
+		type: 'pie',
+		clockWise: false,
+		hoverAnimation: false,
+		center: ['50%', '42%'],
+		radius: ['29%', '40%'],
+		itemStyle: dataStyle,
+		data: [{
+			value: 60,
+			name: '04'
+		}, {
+			value: 40,
+			name: 'invisible',
+			tooltip: {show: false},
+			itemStyle: placeHolderStyle
+		}]
+	}, 
+		{
+		name: '深圳',
+		type: 'pie',
+		clockWise: false,
+		hoverAnimation: false,
+		center: ['50%', '42%'],
+		radius: ['20%', '30%'],
+		itemStyle: dataStyle,
+		data: [{
+			value: 50,
+			name: '05'
+		}, {
+			value: 50,
+			name: 'invisible',
+			tooltip: {show: false},
+			itemStyle: placeHolderStyle
+		}]
+	}, ]
+};
+      
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+function echarts_31() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('fb1')); 
+option = {
+   
+	    title: [{
+        text: '收入分布',
+        left: 'center',
+        textStyle: {
+            color: '#fff',
+			fontSize:'16'
+        }
+
+    }],
+    tooltip: {
+        trigger: 'item',
+        formatter: "{a} <br/>{b}: {c} ({d}%)",
+position:function(p){   //其中p为当前鼠标的位置
+            return [p[0] + 10, p[1] - 10];
+        }
+    },
+    legend: {
+        
+top:'70%',
+       itemWidth: 10,
+        itemHeight: 10,
+        data:['浙江', '上海', '江苏', '广东', '北京'],
+                textStyle: {
+            color: 'rgba(255,255,255,.5)',
+			fontSize:'12',
+        }
+    },
+    series: [
+        {
+        	name:'收入分布',
+            type:'pie',
+			center: ['50%', '42%'],
+            radius: ['40%', '60%'],
+                  color: ['#065aab', '#066eab', '#0682ab', '#0696ab', '#06a0ab','#06b4ab','#06c8ab','#06dcab','#06f0ab'],	
+            label: {show:false},
+			labelLine: {show:false},
+            data:[
+                {value:1, name:'浙江'},
+                {value:4, name:'上海'},
+                {value:2, name:'江苏'},
+                {value:2, name:'广东'},
+                {value:1, name:'北京'},
+            ]
+        }
+    ]
+};
+      
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+function echarts_32() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('fb2'));
+option = {
+   
+	    title: [{
+        text: '销售分布',
+        left: 'center',
+        textStyle: {
+            color: '#fff',
+			fontSize:'16'
+        }
+
+    }],
+    tooltip: {
+        trigger: 'item',
+        formatter: "{a} <br/>{b}: {c} ({d}%)",
+position:function(p){   //其中p为当前鼠标的位置
+            return [p[0] + 10, p[1] - 10];
+        }
+    },
+    legend: {
+        
+    top:'70%',
+       itemWidth: 10,
+        itemHeight: 10,
+        data:['浙江', '上海', '江苏', '广东', '北京'],
+                textStyle: {
+           color: 'rgba(255,255,255,.5)',
+			fontSize:'12',
+        }
+    },
+    series: [
+        {
+        	name:'销售分布',
+            type:'pie',
+			center: ['50%', '42%'],
+            radius: ['40%', '60%'],
+            color: ['#065aab', '#066eab', '#0682ab', '#0696ab', '#06a0ab','#06b4ab','#06c8ab','#06dcab','#06f0ab'],	
+            label: {show:false},
+			labelLine: {show:false},
+            data:[
+                {value:5, name:'浙江'},
+                {value:1, name:'上海'},
+                {value:6, name:'江苏'},
+                {value:2, name:'广东'},
+                {value:1, name:'北京'},
+            ]
+        }
+    ]
+};
+      
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+function echarts_33() {
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('fb3'));
+option = {
+	    title: [{
+        text: '库存分布',
+        left: 'center',
+        textStyle: {
+            color: '#fff',
+			fontSize:'16'
+        }
+
+    }],
+    tooltip: {
+        trigger: 'item',
+        formatter: "{a} <br/>{b}: {c} ({d}%)",
+position:function(p){   //其中p为当前鼠标的位置
+            return [p[0] + 10, p[1] - 10];
+        }
+    },
+    legend: {
+    top:'70%',
+       itemWidth: 10,
+        itemHeight: 10,
+        data:['浙江', '上海', '江苏', '广东', '北京'],
+                textStyle: {
+            color: 'rgba(255,255,255,.5)',
+			fontSize:'12',
+        }
+    },
+    series: [
+        {
+        	name:'库存分布',
+            type:'pie',
+			center: ['50%', '42%'],
+            radius: ['40%', '60%'],
+                   color: ['#065aab', '#066eab', '#0682ab', '#0696ab', '#06a0ab','#06b4ab','#06c8ab','#06dcab','#06f0ab'],	
+            label: {show:false},
+			labelLine: {show:false},
+            data:[
+                {value:2, name:'浙江'},
+                {value:3, name:'上海'},
+                {value:1, name:'江苏'},
+                {value:4, name:'广东'},
+                {value:8, name:'北京'},
+            ]
+        }
+    ]
+};
+      
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+    }
+				
+	
+})
+
+
+
+		
+		
+		
+
+
+		
+
+
+
+
+
+
+
+
+

src/api/md/baoxiao.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询报销列表
+export function listBaoxiao(query) {
+  return request({
+    url: '/md/baoxiao/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询报销详细
+export function getBaoxiao(id) {
+  return request({
+    url: '/md/baoxiao/' + id,
+    method: 'get'
+  })
+}
+
+// 新增报销
+export function addBaoxiao(data) {
+  return request({
+    url: '/md/baoxiao',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改报销
+export function updateBaoxiao(data) {
+  return request({
+    url: '/md/baoxiao',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除报销
+export function delBaoxiao(id) {
+  return request({
+    url: '/md/baoxiao/' + id,
+    method: 'delete'
+  })
+}

src/api/md/ggl.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询公告栏列表
+export function listGgl(query) {
+  return request({
+    url: '/md/ggl/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公告栏详细
+export function getGgl(id) {
+  return request({
+    url: '/md/ggl/' + id,
+    method: 'get'
+  })
+}
+
+// 新增公告栏
+export function addGgl(data) {
+  return request({
+    url: '/md/ggl',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公告栏
+export function updateGgl(data) {
+  return request({
+    url: '/md/ggl',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公告栏
+export function delGgl(id) {
+  return request({
+    url: '/md/ggl/' + id,
+    method: 'delete'
+  })
+}

src/api/md/hetong.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询合同管理列表
+export function listHetong(query) {
+  return request({
+    url: '/md/hetong/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询合同管理详细
+export function getHetong(id) {
+  return request({
+    url: '/md/hetong/' + id,
+    method: 'get'
+  })
+}
+
+// 新增合同管理
+export function addHetong(data) {
+  return request({
+    url: '/md/hetong',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改合同管理
+export function updateHetong(data) {
+  return request({
+    url: '/md/hetong',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除合同管理
+export function delHetong(id) {
+  return request({
+    url: '/md/hetong/' + id,
+    method: 'delete'
+  })
+}

src/api/md/kehutongji.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询客户统计报列表
+export function listKehutongji(query) {
+  return request({
+    url: '/md/kehutongji/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询客户统计报详细
+export function getKehutongji(id) {
+  return request({
+    url: '/md/kehutongji/' + id,
+    method: 'get'
+  })
+}
+
+// 新增客户统计报
+export function addKehutongji(data) {
+  return request({
+    url: '/md/kehutongji',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改客户统计报
+export function updateKehutongji(data) {
+  return request({
+    url: '/md/kehutongji',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户统计报
+export function delKehutongji(id) {
+  return request({
+    url: '/md/kehutongji/' + id,
+    method: 'delete'
+  })
+}

src/api/md/kucuntongji.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询库存统计报列表
+export function listKucuntongji(query) {
+  return request({
+    url: '/md/kucuntongji/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询库存统计报详细
+export function getKucuntongji(id) {
+  return request({
+    url: '/md/kucuntongji/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存统计报
+export function addKucuntongji(data) {
+  return request({
+    url: '/md/kucuntongji',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存统计报
+export function updateKucuntongji(data) {
+  return request({
+    url: '/md/kucuntongji',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存统计报
+export function delKucuntongji(id) {
+  return request({
+    url: '/md/kucuntongji/' + id,
+    method: 'delete'
+  })
+}

src/api/md/qingjia.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询请假列表
+export function listQingjia(query) {
+  return request({
+    url: '/md/qingjia/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询请假详细
+export function getQingjia(id) {
+  return request({
+    url: '/md/qingjia/' + id,
+    method: 'get'
+  })
+}
+
+// 新增请假
+export function addQingjia(data) {
+  return request({
+    url: '/md/qingjia',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改请假
+export function updateQingjia(data) {
+  return request({
+    url: '/md/qingjia',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除请假
+export function delQingjia(id) {
+  return request({
+    url: '/md/qingjia/' + id,
+    method: 'delete'
+  })
+}

src/api/md/qipingtongji.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询气瓶统计报列表
+export function listQipingtongji(query) {
+  return request({
+    url: '/md/qipingtongji/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询气瓶统计报详细
+export function getQipingtongji(id) {
+  return request({
+    url: '/md/qipingtongji/' + id,
+    method: 'get'
+  })
+}
+
+// 新增气瓶统计报
+export function addQipingtongji(data) {
+  return request({
+    url: '/md/qipingtongji',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改气瓶统计报
+export function updateQipingtongji(data) {
+  return request({
+    url: '/md/qipingtongji',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除气瓶统计报
+export function delQipingtongji(id) {
+  return request({
+    url: '/md/qipingtongji/' + id,
+    method: 'delete'
+  })
+}

src/api/md/weipan.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询微盘管理列表
+export function listWeipan(query) {
+  return request({
+    url: '/md/weipan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询微盘管理详细
+export function getWeipan(id) {
+  return request({
+    url: '/md/weipan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增微盘管理
+export function addWeipan(data) {
+  return request({
+    url: '/md/weipan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改微盘管理
+export function updateWeipan(data) {
+  return request({
+    url: '/md/weipan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除微盘管理
+export function delWeipan(id) {
+  return request({
+    url: '/md/weipan/' + id,
+    method: 'delete'
+  })
+}

src/api/md/xiaoshoutongji.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询销售统计报列表
+export function listXiaoshoutongji(query) {
+  return request({
+    url: '/md/xiaoshoutongji/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询销售统计报详细
+export function getXiaoshoutongji(id) {
+  return request({
+    url: '/md/xiaoshoutongji/' + id,
+    method: 'get'
+  })
+}
+
+// 新增销售统计报
+export function addXiaoshoutongji(data) {
+  return request({
+    url: '/md/xiaoshoutongji',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改销售统计报
+export function updateXiaoshoutongji(data) {
+  return request({
+    url: '/md/xiaoshoutongji',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除销售统计报
+export function delXiaoshoutongji(id) {
+  return request({
+    url: '/md/xiaoshoutongji/' + id,
+    method: 'delete'
+  })
+}

src/api/md/zhiliangfenxi.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询数据统计与分析列表
+export function listZhiliangfenxi(query) {
+  return request({
+    url: '/md/zhiliangfenxi/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询数据统计与分析详细
+export function getZhiliangfenxi(id) {
+  return request({
+    url: '/md/zhiliangfenxi/' + id,
+    method: 'get'
+  })
+}
+
+// 新增数据统计与分析
+export function addZhiliangfenxi(data) {
+  return request({
+    url: '/md/zhiliangfenxi',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改数据统计与分析
+export function updateZhiliangfenxi(data) {
+  return request({
+    url: '/md/zhiliangfenxi',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除数据统计与分析
+export function delZhiliangfenxi(id) {
+  return request({
+    url: '/md/zhiliangfenxi/' + id,
+    method: 'delete'
+  })
+}

src/api/mes/cal/teammember.js

@@ -33,3 +33,14 @@ export function delTeammember(memberId) {
     method: 'delete'
   })
 }
+
+// 根据班组IDS查询班组成员列表
+export function getListByTeamId(ids) {
+  return request({
+    url: '/mes/cal/teammember/getListByTeamId',
+    method: 'get',
+    params: {
+      ids
+    }
+  })
+}

src/api/mes/dv/checkplan.js

@@ -42,3 +42,12 @@ export function delCheckplan(planId) {
     method: 'delete'
   })
 }
+
+// 根据设备编码和计划类型查询设备点检计划头列表
+export function getCheckPlan(query) {
+  return request({
+    url: '/mes/dv/checkplan/getCheckPlan',
+    method: 'get',
+    params: query
+  })
+}

src/api/mes/dv/checkrecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备点检记录列表
+export function listCheckrecord(query) {
+  return request({
+    url: '/mes/dv/checkrecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备点检记录详细
+export function getCheckrecord(recordId) {
+  return request({
+    url: '/mes/dv/checkrecord/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增设备点检记录
+export function addCheckrecord(data) {
+  return request({
+    url: '/mes/dv/checkrecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备点检记录
+export function updateCheckrecord(data) {
+  return request({
+    url: '/mes/dv/checkrecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备点检记录
+export function delCheckrecord(recordId) {
+  return request({
+    url: '/mes/dv/checkrecord/' + recordId,
+    method: 'delete'
+  })
+}

src/api/mes/dv/checkrecordline.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备点检记录行列表
+export function listCheckrecordline(query) {
+  return request({
+    url: '/mes/dv/checkrecordline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备点检记录行详细
+export function getCheckrecordline(lineId) {
+  return request({
+    url: '/mes/dv/checkrecordline/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增设备点检记录行
+export function addCheckrecordline(data) {
+  return request({
+    url: '/mes/dv/checkrecordline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备点检记录行
+export function updateCheckrecordline(data) {
+  return request({
+    url: '/mes/dv/checkrecordline',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备点检记录行
+export function delCheckrecordline(lineId) {
+  return request({
+    url: '/mes/dv/checkrecordline/' + lineId,
+    method: 'delete'
+  })
+}

src/api/mes/dv/maintenrecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备保养记录列表
+export function listMaintenrecord(query) {
+  return request({
+    url: '/mes/dv/maintenrecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备保养记录详细
+export function getMaintenrecord(recordId) {
+  return request({
+    url: '/mes/dv/maintenrecord/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增设备保养记录
+export function addMaintenrecord(data) {
+  return request({
+    url: '/mes/dv/maintenrecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备保养记录
+export function updateMaintenrecord(data) {
+  return request({
+    url: '/mes/dv/maintenrecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备保养记录
+export function delMaintenrecord(recordId) {
+  return request({
+    url: '/mes/dv/maintenrecord/' + recordId,
+    method: 'delete'
+  })
+}

src/api/mes/dv/maintenrecordline.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备保养记录行列表
+export function listMaintenrecordline(query) {
+  return request({
+    url: '/mes/dv/maintenrecordline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备保养记录行详细
+export function getMaintenrecordline(lineId) {
+  return request({
+    url: '/mes/dv/maintenrecordline/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增设备保养记录行
+export function addMaintenrecordline(data) {
+  return request({
+    url: '/mes/dv/maintenrecordline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备保养记录行
+export function updateMaintenrecordline(data) {
+  return request({
+    url: '/mes/dv/maintenrecordline',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备保养记录行
+export function delMaintenrecordline(lineId) {
+  return request({
+    url: '/mes/dv/maintenrecordline/' + lineId,
+    method: 'delete'
+  })
+}

src/api/mes/dv/repair.js

@@ -42,3 +42,12 @@ export function delRepair(repairId) {
     method: 'delete'
   })
 }
+
+// 根据设备编码查询设备维修单列表
+export function getRepairList(query) {
+  return request({
+    url: '/mes/dv/repair/getRepairList',
+    method: 'get',
+    params: query
+  })
+}

src/api/mes/md/batchconfig.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物料批次属性配置列表
+export function listBatchconfig(query) {
+  return request({
+    url: '/mes/md/batchconfig/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物料批次属性配置详细
+export function getBatchconfig(itemId) {
+  return request({
+    url: '/mes/md/batchconfig/' + itemId,
+    method: 'get'
+  })
+}
+
+// 新增物料批次属性配置
+export function addBatchconfig(data) {
+  return request({
+    url: '/mes/md/batchconfig',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物料批次属性配置
+export function updateBatchconfig(data) {
+  return request({
+    url: '/mes/md/batchconfig',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物料批次属性配置
+export function delBatchconfig(configId) {
+  return request({
+    url: '/mes/md/batchconfig/' + configId,
+    method: 'delete'
+  })
+}

src/api/mes/pro/workorder.js

@@ -66,4 +66,13 @@ export function dofinish(workorderId){
     url: '/mes/pro/workorder/'+workorderId,
     method: 'put'
   })
-}
+}
+
+// 首页查询生产工单列表
+export function getHomeList(query) {
+  return request({
+    url: '/mes/pro/workorder/getHomeList',
+    method: 'get',
+    params: query
+  })
+}

src/api/mes/wm/itemrecpt.js

@@ -60,3 +60,19 @@ export function delItemrecpt(recptId) {
     method: 'delete'
   })
 }
+
+// 根据供应商Id查询物料数据
+export function getItem(vendorId) {
+  return request({
+    url: '/mes/wm/itemrecpt/getItem/' + vendorId,
+    method: 'get'
+  })
+}
+
+// 根据供应商Id查询采购记录
+export function getProcurementRecord(vendorId) {
+  return request({
+    url: '/mes/wm/itemrecpt/getProcurementRecord/' + vendorId,
+    method: 'get'
+  })
+}

src/api/mes/wm/location.js

@@ -43,6 +43,30 @@ export function delLocation(locationId) {
   })
 }
 
+// 设置库区下所有库位是否允许产品混放
+export function setProductMixing(locationId, flag){
+  return request({
+    url: '/mes/wm/location/setProductMixing',
+    method: 'post',
+    params: {
+      'locationId': locationId,
+      'flag': flag
+    }
+  })
+}
+
+// 设置库区下所有库位是否允许批次混放
+export function setBatchMixing(locationId, flag){
+  return request({
+    url: '/mes/wm/location/setBatchMixing',
+    method: 'post',
+    params: {
+      'locationId': locationId,
+      'flag': flag
+    }
+  })
+}
+
 //更改库区的冻结状态
 export function changeFrozenState(locationId, status) {
   const data = {

src/api/mes/wm/mrnotice.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询备料通知单列表
+export function listMrnotice(query) {
+  return request({
+    url: '/mes/wm/mrnotice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询备料通知单详细
+export function getMrnotice(noticeId) {
+  return request({
+    url: '/mes/wm/mrnotice/' + noticeId,
+    method: 'get'
+  })
+}
+
+// 新增备料通知单
+export function addMrnotice(data) {
+  return request({
+    url: '/mes/wm/mrnotice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改备料通知单
+export function updateMrnotice(data) {
+  return request({
+    url: '/mes/wm/mrnotice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除备料通知单
+export function delMrnotice(noticeId) {
+  return request({
+    url: '/mes/wm/mrnotice/' + noticeId,
+    method: 'delete'
+  })
+}

src/api/mes/wm/mrnoticeline.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询备料通知单明细列表
+export function listMrnoticeline(query) {
+  return request({
+    url: '/mes/wm/mrnoticeline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询备料通知单明细详细
+export function getMrnoticeline(lineId) {
+  return request({
+    url: '/mes/wm/mrnoticeline/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增备料通知单明细
+export function addMrnoticeline(data) {
+  return request({
+    url: '/mes/wm/mrnoticeline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改备料通知单明细
+export function updateMrnoticeline(data) {
+  return request({
+    url: '/mes/wm/mrnoticeline',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除备料通知单明细
+export function delMrnoticeline(lineId) {
+  return request({
+    url: '/mes/wm/mrnoticeline/' + lineId,
+    method: 'delete'
+  })
+}

src/api/mes/wm/productsalse.js

@@ -50,3 +50,19 @@ export function execute(salseId) {
     method: 'put'
   })
 }
+
+// 根据客户 id 查询销售产品信息
+export function getItem(clientId) {
+  return request({
+    url: '/mes/wm/productsalse/getItem/' + clientId,
+    method: 'get'
+  })
+}
+
+// 根据客户 id 查询销售订单信息
+export function getSaleRecord(clientId) {
+  return request({
+    url: '/mes/wm/productsalse/getSaleRecord/' + clientId,
+    method: 'get'
+  })
+}

src/api/mes/wm/sn.js

@@ -44,9 +44,12 @@ export function updateSn(data) {
 }
 
 // 删除SN码
-export function delSn(snId) {
+export function delSn(ids) {
   return request({
-    url: '/mes/wm/sn/' + snId,
-    method: 'delete'
+    url: '/mes/wm/sn/remove',
+    method: 'get',
+    params: {
+      ids
+    }
   })
 }

src/api/system/message.js

@@ -42,3 +42,11 @@ export function delMessage(messageId) {
     method: 'delete'
   })
 }
+
+// 全部已读
+export function allRead() {
+  return request({
+    url: '/system/message/read',
+    method: 'get'
+  })
+}

src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 250px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

src/components/FileUpload/index.vue

@@ -73,7 +73,7 @@ export default {
       number: 0,
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/uploadMinio", // 上传的图片服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/components/TaskSelect/taskSelectSingle.vue

@@ -41,7 +41,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>       
+      <el-row>
         <el-col :span="8">
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -50,17 +50,17 @@
         </el-col>
       </el-row>
     </el-form>
-  
+
       <el-table v-loading="loading" :data="protaskList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
         <el-table-column  width="55" align="center" >
           <template v-slot="scope">
             <el-radio v-model="selectedTaskId" :label="scope.row.taskId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
           </template>
-        </el-table-column>  
+        </el-table-column>
         <el-table-column label="任务编号" align="center" width="100px" prop="taskCode" :show-overflow-tooltip="true"/>
         <el-table-column label="任务名称" align="center" width="120px" prop="taskName" :show-overflow-tooltip="true"/>
         <el-table-column label="工作站编号" align="center" width="150px" prop="workstationCode" :show-overflow-tooltip="true"/>
-        <el-table-column label="工作站名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/>      
+        <el-table-column label="工作站名称" align="center" width="150px" prop="workstationName" :show-overflow-tooltip="true"/>
         <el-table-column label="排产数量" align="center" prop="quantity" />
         <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
         <el-table-column label="开始生产时间" align="center" prop="startTime" width="180">
@@ -111,7 +111,7 @@
     </div>
     </el-dialog>
   </template>
-  
+
   <script>
   import { listProtask, getProtask, delProtask, addProtask, updateProtask } from "@/api/mes/pro/protask";
   import {listAllProcess} from "@/api/mes/pro/process";
@@ -213,6 +213,10 @@
       this.getProcess();
     },
     methods: {
+      handleOpen(id) {
+        this.showFlag = true
+        this.selectedTaskId = id
+      },
       /** 查询生产任务列表 */
       getList() {
         this.loading = true;
@@ -229,7 +233,7 @@
           this.processOptions = response.data;
         });
       },
-     
+
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
@@ -237,10 +241,12 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.resetForm("queryForm");
+        this.queryParams.processName = ''
+        this.queryParams.workstationCode = ''
+        this.queryParams.taskCode = ''
         this.handleQuery();
       },
-     
+
       handleCurrent(row){
         if(row){
             this.selectedRow = row;
@@ -277,4 +283,3 @@
     }
   };
   </script>
-  

src/components/clientSelect/single.vue

@@ -95,7 +95,7 @@
       <el-table-column label="联系人" align="center" prop="contact1" />
       <el-table-column label="联系人-电话" align="center" prop="contact1Tel" />
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -159,13 +159,17 @@ export default {
         contact2Email: null,
         creditCode: null,
         enableFlag: null,
-      }      
+      }
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    handleOpen(id) {
+      this.showFlag = true
+      this.selectedClientId = id
+    },
     /** 查询客户列表 */
     getList() {
       this.loading = true;

src/components/dvplanSelect/index.vue

@@ -0,0 +1,226 @@
+<template>
+      <el-dialog title="设备选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="计划编号" prop="planCode">
+          <el-input
+            v-model="queryParams.planCode"
+            placeholder="请输入计划编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="计划名称" prop="planName">
+          <el-input
+            v-model="queryParams.planName"
+            placeholder="请输入计划名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="checkplanList"  @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+        <el-table-column  width="55" align="center" >
+            <template v-slot="scope">
+                <el-radio v-model="selectedPlanId" :label="scope.row.planId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+            </template>
+        </el-table-column>
+        <el-table-column label="计划编码" align="center" prop="planCode" >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click="handleView(scope.row)"
+              v-hasPermi="['mes:dv:checkplan:query']"
+            >{{scope.row.planCode}}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划名称" align="center" width="200px" prop="planName" />
+        <el-table-column label="计划类型" align="center" width="120px" prop="planType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.dv_plan_type" :value="scope.row.planType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="开始日期" align="center" prop="startDate" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束日期" align="center" prop="endDate" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="频率" align="center" prop="cycleType" width="120px">
+          <template slot-scope="scope">
+            {{scope.row.cycleCount}}<dict-tag :options="dict.type.mes_cycle_type" :value="scope.row.cycleType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="130px" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.status =='PREPARE'"
+              v-hasPermi="['mes:dv:checkplan:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-if="scope.row.status =='PREPARE'"
+              v-hasPermi="['mes:dv:checkplan:remove']"
+            >删除</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.status =='FINISHED'"
+              v-hasPermi="['mes:dv:checkplan:edit']"
+            >停用</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+
+      <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="confirmSelect">确 定</el-button>
+      <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+</el-dialog>
+  </template>
+  
+  <script>
+  import { listCheckplan } from "@/api/mes/dv/checkplan";
+
+  export default {
+    name: "CheckplanSelect",
+    dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'],
+    props: {
+        planType: {
+            type: String,
+            default: 'CHECK'
+        }
+    },
+    data() {
+      return {
+        showFlag: false,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        selectedPlanId: undefined,
+        selectedRow: undefined,
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 设备点检计划头表格数据
+        checkplanList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          planCode: null,
+          planName: null,
+          planType: this.planType,
+          startDate: null,
+          endDate: null,
+          cycleType: null,
+          cycleCount: null,
+          status: 'FINISHED'
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+        /** 查询设备点检计划头列表 */
+        getList() {
+            this.loading = true;
+            listCheckplan(this.queryParams).then(response => {
+            this.checkplanList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+            });
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+
+        handleCurrent(row){
+            if(row){
+                this.selectedRow = row;
+            }
+        },
+        //行双击选中
+        handleRowDbClick(row){
+        if(row){
+            this.selectedRow = row;
+            this.$emit('onSelected',this.selectedRow);
+            this.showFlag = false;
+        }
+        },
+        // 单选选中数据
+        handleRowChange(row) {
+        if(row){
+            this.selectedRow = row;
+        }
+        },
+        //确定选中
+        confirmSelect(){
+            if(this.selectedPlanId ==null || this.selectedPlanId==0){
+                this.$notify({
+                    title:'提示',
+                    type:'warning',
+                    message: '请至少选择一条数据!'
+                });
+                return;
+            }
+            this.$emit('onSelected',this.selectedRow);
+            this.showFlag = false;
+        }
+    }
+  };
+  </script>
+  

src/components/dvsubjectSelect/multi.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="设备选择"
+  <el-dialog title="项目选择"
     v-if="showFlag"
     :visible.sync="showFlag"
     :modal= false
@@ -23,16 +23,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="项目类型" prop="subjectType">
-        <el-select v-model="queryParams.subjectType" placeholder="请选择项目类型" clearable>
-          <el-option
-            v-for="dict in dict.type.mes_dvsubject_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -56,7 +46,7 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -68,7 +58,7 @@
         <el-button type="primary" @click="confirmSelect">确 定</el-button>
         <el-button @click="showFlag=false">取 消</el-button>
     </div>
-  </el-dialog>  
+  </el-dialog>
 </template>
 
 <script>
@@ -81,7 +71,7 @@ export default {
   },
   data() {
     return {
-      showFlag:false,      
+      showFlag:false,
       // 遮罩层
       loading: true,
       // 选中数组s
@@ -128,9 +118,18 @@ export default {
         this.loading = false;
       });
     },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {}
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.queryParams.subjectType = this.subjectType
+      this.getList();
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
       this.getList();
     },
     // 多选框选中数据

src/components/dvsubjectSelect/single.vue

@@ -0,0 +1,168 @@
+<template>
+    <el-dialog title="设备点检保养项目选择"
+      v-if="showFlag"
+      :visible.sync="showFlag"
+      :modal= false
+      width="80%"
+      center
+    >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="项目编码" prop="subjectCode">
+          <el-input
+            v-model="queryParams.subjectCode"
+            placeholder="请输入项目编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="项目名称" prop="subjectName">
+          <el-input
+            v-model="queryParams.subjectName"
+            placeholder="请输入项目名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-table v-loading="loading" :data="dvsubjectList"  @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+        <el-table-column  width="55" align="center" >
+            <template v-slot="scope">
+                <el-radio v-model="selectedId" :label="scope.row.subjectId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+            </template>
+        </el-table-column>
+        <el-table-column label="项目编码" align="center" prop="subjectCode" />
+        <el-table-column label="项目名称" align="center" prop="subjectName" />
+        <el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
+        <el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/>
+        <el-table-column label="备注" align="center" prop="remark" />
+      </el-table>
+  
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="confirmSelect">确 定</el-button>
+          <el-button @click="showFlag=false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </template>
+  
+  <script>
+  import { listDvsubject} from "@/api/mes/dv/dvsubject";
+  export default {
+    name: "DvsubjectSelect",
+    dicts: ['sys_yes_no', 'mes_dvsubject_type'],
+    props:{
+        subjectType: null,
+    },
+    data() {
+      return {
+        showFlag:false,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        selectedId: undefined,
+        selectedRow: undefined,
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 设备点检保养项目表格数据
+        dvsubjectList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          subjectCode: null,
+          subjectName: null,
+          subjectType: this.subjectType,
+          subjectContent: null,
+          subjectStandard: null,
+          enableFlag: null,
+        },
+        // 表单参数
+        form: {}
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询设备点检保养项目列表 */
+      getList() {
+        this.loading = true;
+        listDvsubject(this.queryParams).then(response => {
+          this.dvsubjectList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {}
+        this.queryParams.pageNum = 1;
+        this.queryParams.pageSize = 10;
+        this.queryParams.subjectType = this.subjectType
+        this.getList();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.queryParams.pageSize = 10;
+        this.getList();
+      },
+
+        handleCurrent(row){
+            if(row){
+                this.selectedRow = row;
+            }
+        },
+        //行双击选中
+        handleRowDbClick(row){
+            if(row){
+                this.selectedRow = row;
+                this.$emit('onSelected',this.selectedRow);
+                this.showFlag = false;
+            }
+        },
+        // 单选选中数据
+        handleRowChange(row) {
+            if(row){
+                this.selectedRow = row;
+            }
+        },
+
+      //确定选中
+      confirmSelect(){
+          if(this.selectedId == null || this.selectedId == 0){
+              this.$notify({
+                  title:'提示',
+                  type:'warning',
+                  message: '请选择一条数据!'
+              });
+              return;
+          }
+          this.$emit('onSelected',this.selectedRow);
+          this.showFlag = false;
+      }
+    }
+  };
+  </script>
+  

src/components/itemSelect/single.vue

@@ -165,6 +165,10 @@ export default {
     this.getTreeselect();
   },
   methods: {
+    handleOpen(id) {
+      this.showFlag = true
+      this.selectedItemId = id
+    },
     /** 查询物料编码列表 */
     getList() {
       this.loading = true;
@@ -235,4 +239,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/components/machinerySelect/single.vue

@@ -52,6 +52,15 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="所属车间" prop="workshopName">
+            <el-input
+              v-model="queryParams.workshopName"
+              placeholder="请输入所属车间"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -68,7 +77,7 @@
           <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
           <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
           <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
-          <el-table-column label="所属车间" align="center" key="machineryTypeName" prop="machineryTypeName"  :show-overflow-tooltip="true" />
+          <el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName"  :show-overflow-tooltip="true" />
           <el-table-column label="设备状态" align="center" key="status" prop="status" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.mes_machinery_status" :value="scope.row.status"/>
@@ -102,7 +111,6 @@ import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachiner
 import { listMachinerytype } from "@/api/mes/dv/machinerytype";
 import { listAllWorkshop } from "@/api/mes/md/workshop";
 
-import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -175,6 +183,10 @@ export default {
     this.getTreeselect();
   },
   methods: {
+    handleOpen(id) {
+      this.showFlag = true
+      this.selectedMachineryId = id
+    },
     /** 查询物料编码列表 */
     getList() {
       this.loading = true;
@@ -187,7 +199,6 @@ export default {
     },
     getWorkshops(){
       listAllWorkshop().then( response => {
-        debugger;
         this.workshopOptions =response.data;
       });
     },
@@ -205,7 +216,6 @@ export default {
 	/** 查询设备类型下拉树结构 */
     getTreeselect() {
       listMachinerytype().then(response => {
-        debugger;
         this.machineryTypeOptions = [];
         const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
         this.machineryTypeOptions.push(data);
@@ -265,4 +275,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/components/noticeSelect/lineSingle.vue

@@ -11,11 +11,11 @@
             <template v-slot="scope">
                 <el-radio v-model="selectedId" :label="scope.row.lineId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
             </template>
-        </el-table-column> 
+        </el-table-column>
         <el-table-column label="物料编码" width="120px" align="center" prop="itemCode" />
         <el-table-column label="物料名称" width="150px" align="center" prop="itemName" />
         <el-table-column label="规格型号" align="center" prop="specification" />
-        <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+        <el-table-column label="单位" align="center" prop="unitName" />
         <el-table-column label="到货数量" align="center" prop="quantityArrival" />
         <el-table-column label="是否检验" align="center" prop="iqcCheck">
           <template slot-scope="scope">
@@ -26,7 +26,7 @@
         <el-table-column label="检验单号" align="center" prop="iqcCode" />
         <el-table-column label="备注" align="center" prop="remark" />
       </el-table>
-      
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -40,7 +40,7 @@
       </div>
     </el-dialog>
   </template>
-  
+
   <script>
   import { listArrivalnoticeline} from "@/api/mes/wm/arrivalnoticeline";
   export default {
@@ -130,4 +130,3 @@
     }
   };
   </script>
-  

src/components/noticeSelect/single.vue

@@ -49,7 +49,12 @@
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in orderStatusDict"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -63,7 +68,7 @@
             <template v-slot="scope">
                 <el-radio v-model="selectedId" :label="scope.row.noticeId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
             </template>
-        </el-table-column>    
+        </el-table-column>
       <el-table-column label="入库单编号" align="center" width="180px" prop="noticeCode" >
         <template slot-scope="scope">
           <el-button
@@ -82,9 +87,9 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.arrivalDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column> 
+      </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -105,6 +110,7 @@ export default {
     data() {
     return {
       showFlag:false,
+      orderStatusDict: [],
       // 遮罩层
       loading: true,
       // 选中
@@ -128,13 +134,29 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        noticeCode: null,        noticeName: null,        poCode: null,        vendorId: null,        vendorCode: null,        vendorName: null,        vendorNick: null,        arrivalDate: null,        status: 'APPROVED',      },
+        noticeCode: null,
+        noticeName: null,
+        poCode: null,
+        vendorId: null,
+        vendorCode: null,
+        vendorName: null,
+        vendorNick: null,
+        arrivalDate: null,
+        status: null,
+      },
     };
   },
   created() {
     this.getList();
+    this.getDicts("mes_order_status").then(res => {
+      this.orderStatusDict = res.data
+    })
   },
   methods: {
+      handleOpen(id) {
+        this.showFlag = true
+        this.selectedId = id
+      },
     /** 查询到货通知单列表 */
     getList() {
       this.loading = true;

src/components/stockSelect/multi.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="人员选择"
+  <el-dialog title="库存选择"
     v-if="showFlag"
     :visible.sync="showFlag"
     :modal= false
@@ -95,7 +95,7 @@
         </el-form-item>
       </el-form>
 
-      <el-row :gutter="10" class="mb8">    
+      <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
             type="warning"
@@ -129,7 +129,7 @@
           </template>
         </el-table-column>
       </el-table>
-    
+
       <pagination
         v-show="total>0"
         :total="total"

src/components/stockSelect/single.vue

@@ -94,7 +94,7 @@
                 clearable
                 @keyup.enter.native="handleQuery"
               />
-            </el-form-item> 
+            </el-form-item>
           </el-col>
         </el-row>
         <el-form-item>
@@ -103,7 +103,7 @@
         </el-form-item>
       </el-form>
 
-      <el-row :gutter="10" class="mb8">    
+      <el-row :gutter="10" class="mb8">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
@@ -112,7 +112,7 @@
             <template v-slot="scope">
                 <el-radio v-model="selectedId" :label="scope.row.materialStockId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
             </template>
-        </el-table-column>    
+        </el-table-column>
         <el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
         <el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
         <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
@@ -132,7 +132,7 @@
           </template>
         </el-table-column>
       </el-table>
-    
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -240,6 +240,11 @@ export default {
     this.getTreeselect();
   },
   methods: {
+    handleOpen(id) {
+      this.showFlag = true
+      this.getList()
+      this.selectedId = id
+    },
     /** 查询库存记录列表 */
     getList() {
       this.loading = true;

src/components/userSelect/multi.vue

@@ -64,21 +64,21 @@
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-switch-->
+<!--                v-model="scope.row.status"-->
+<!--                active-value="0"-->
+<!--                inactive-value="1"-->
+<!--                @change="handleStatusChange(scope.row)"-->
+<!--              ></el-switch>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
-          </el-table-column>         
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -239,4 +239,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/components/userSelect/single.vue

@@ -62,26 +62,26 @@
                 <template v-slot="scope">
                     <el-radio v-model="selectedId" :label="scope.row.userId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
                 </template>
-            </el-table-column>          
+            </el-table-column>
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-switch-->
+<!--                v-model="scope.row.status"-->
+<!--                active-value="0"-->
+<!--                inactive-value="1"-->
+<!--                @change="handleStatusChange(scope.row)"-->
+<!--              ></el-switch>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
-          </el-table-column>         
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -255,4 +255,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/components/vendorSelect/single.vue

@@ -100,7 +100,7 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -126,7 +126,7 @@ export default {
       selectedVendorId: undefined,
       selectedRow: undefined,
       // 遮罩层
-      loading: true,      
+      loading: true,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -174,6 +174,10 @@ export default {
     this.getList();
   },
   methods: {
+    handleOpen(id) {
+      this.showFlag = true
+      this.selectedVendorId = id
+    },
     /** 查询供应商列表 */
     getList() {
       this.loading = true;

src/components/workorderSelect/single.vue

@@ -49,7 +49,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -73,8 +73,8 @@
         <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
         <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
         <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
-        <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-        <el-table-column label="工单数量" align="center" prop="quantity" />                 
+        <el-table-column label="单位" align="center" prop="unitName" />
+        <el-table-column label="工单数量" align="center" prop="quantity" />
         <el-table-column label="客户编码" align="center" prop="clientCode" />
         <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
         <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
@@ -105,7 +105,7 @@
         dicts: ['mes_order_status','mes_workorder_sourcetype'],
         props:{
           workorder: {
-            type: Object, 
+            type: Object,
             default: function(){
               return {'workorderType': 'SELF'}
             }} //外部传入的工单过滤信息
@@ -163,6 +163,10 @@
             this.getList();
         },
         methods:{
+          handleOpen(id) {
+            this.showFlag = true
+            this.selectedWorkorderId = id
+          },
             /** 查询生产工单列表 */
             getList() {
                 this.loading = true;
@@ -214,4 +218,4 @@
             }
         }
     }
-</script>
+</script>

src/components/workstationSelect/simpletableSingle.vue

@@ -68,7 +68,7 @@
       <el-table-column label="工作站地点" align="center" prop="workstationAddress" />
       <el-table-column label="所在车间名称" align="center" prop="workshopName" />
       <el-table-column label="所属工序" align="center" prop="processName" />
-      <el-table-column label="备注" align="center" prop="remark" />      
+      <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
     <pagination
       v-show="total>0"
@@ -145,6 +145,10 @@ export default {
     this.getProcess();
   },
   methods: {
+    handleOpen(id) {
+      this.showFlag = true
+      this.selectedWorkstationId = id
+    },
     /** 查询工作站列表 */
     getList() {
       this.loading = true;
@@ -156,7 +160,7 @@ export default {
     },
     //查询车间信息
     getWorkshops(){
-      listAllWorkshop().then( response => {        
+      listAllWorkshop().then( response => {
         this.workshopOptions = response.data;
       });
     },

src/layout/components/Navbar.vue

@@ -7,15 +7,6 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-        
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '苦糖果MES',
+      title: '企业协同运营平台',
       logo: logoImg
     }
   }

src/router/index.js

@@ -260,7 +260,49 @@ export const dynamicRoutes = [
         meta: {title: '打印模板编辑',activeMenu: '/print/printtemplate/edit'}
       }
     ]
-  }
+  },
+  {
+    path: '/mes/md/item',
+    component: Layout,
+    hidden: true,
+    permissions: ['mes:md:mditem:edit'],
+    children: [
+      {
+        path: 'form',
+        component: () => import('@/views/mes/md/mditem/form.vue'),
+        name: 'itemForm',
+        meta: { title: '物料详情', activeMenu: '/mes/md/item/form' }
+      }
+    ]
+  },
+
+  {
+    path: '/mes/wm/purchaseInventory',
+    component: Layout,
+    hidden: true,
+    permissions: ['mes:wm:itemrecpt:edit'],
+    children: [
+      {
+        path: 'form',
+        component: () => import('@/views/mes/wm/itemrecpt/form.vue'),
+        name: 'itemrecptForm',
+        meta: { title: '采购入库详情', activeMenu: '/mes/wm/itemrecpt/form' }
+      }
+    ]
+  },
+  {
+    path: '/mes/wm/saleOutbound',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'form',
+        component: () => import('@/views/mes/wm/productsalse/form.vue'),
+        name: 'productsalseForm',
+        meta: { title: '销售出库详情', activeMenu: '/mes/wm/productsalse/form' }
+      }
+    ]
+  },
 ]
 
 // 防止连续点击多次路由报错

src/store/modules/user.js

@@ -6,6 +6,8 @@ const user = {
     token: getToken(),
     name: '',
     avatar: '',
+    id: '',
+    nick: '',
     roles: [],
     permissions: []
   },
@@ -20,6 +22,12 @@ const user = {
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
+    SET_ID: (state, id) => {
+      state.id = id
+    },
+    SET_NICK: (state, nick) => {
+      state.nick = nick
+    },
     SET_ROLES: (state, roles) => {
       state.roles = roles
     },
@@ -58,6 +66,8 @@ const user = {
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
+          commit('SET_ID', user.userId)
+          commit('SET_NICK', user.nickName)
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           resolve(res)

src/views/dashboard/BarChart.vue

@@ -62,7 +62,7 @@ export default {
         },
         xAxis: [{
           type: 'category',
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
           axisTick: {
             alignWithLabel: true
           }
@@ -74,21 +74,21 @@ export default {
           }
         }],
         series: [{
-          name: 'pageA',
+          name: '气钢瓶1',
           type: 'bar',
           stack: 'vistors',
           barWidth: '60%',
           data: [79, 52, 200, 334, 390, 330, 220],
           animationDuration
         }, {
-          name: 'pageB',
+          name: '气钢瓶2',
           type: 'bar',
           stack: 'vistors',
           barWidth: '60%',
           data: [80, 52, 200, 334, 390, 330, 220],
           animationDuration
         }, {
-          name: 'pageC',
+          name: '气钢瓶3',
           type: 'bar',
           stack: 'vistors',
           barWidth: '60%',

src/views/dashboard/LineChart.vue

@@ -64,7 +64,7 @@ export default {
     setOptions({ expectedData, actualData } = {}) {
       this.chart.setOption({
         xAxis: {
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
           boundaryGap: false,
           axisTick: {
             show: false
@@ -90,10 +90,10 @@ export default {
           }
         },
         legend: {
-          data: ['expected', 'actual']
+          data: ['气钢瓶1', '气钢瓶2']
         },
         series: [{
-          name: 'expected', itemStyle: {
+          name: '气钢瓶1', itemStyle: {
             normal: {
               color: '#FF005A',
               lineStyle: {
@@ -109,7 +109,7 @@ export default {
           animationEasing: 'cubicInOut'
         },
         {
-          name: 'actual',
+          name: '气钢瓶2',
           smooth: true,
           type: 'line',
           itemStyle: {

src/views/dashboard/PanelGroup.vue

@@ -7,7 +7,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            设备总数
+            钢瓶数
           </div>
           <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
         </div>
@@ -20,9 +20,9 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            运行中
+            订单数
           </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="12" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -33,7 +33,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            待机
+            库存数
           </div>
           <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
         </div>
@@ -46,7 +46,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            故障
+            欠瓶
           </div>
           <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
         </div>

src/views/dashboard/PieChart.vue

@@ -52,7 +52,7 @@ export default {
         legend: {
           left: 'center',
           bottom: '10',
-          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+          data: ['气钢瓶1', '气钢瓶2', '气钢瓶3', '气钢瓶4', '气钢瓶5']
         },
         series: [
           {
@@ -62,11 +62,11 @@ export default {
             radius: [15, 95],
             center: ['50%', '38%'],
             data: [
-              { value: 320, name: 'Industries' },
-              { value: 240, name: 'Technology' },
-              { value: 149, name: 'Forex' },
-              { value: 100, name: 'Gold' },
-              { value: 59, name: 'Forecasts' }
+              { value: 320, name: '气钢瓶1' },
+              { value: 240, name: '气钢瓶2' },
+              { value: 149, name: '气钢瓶3' },
+              { value: 100, name: '气钢瓶4' },
+              { value: 59, name: '气钢瓶5' }
             ],
             animationEasing: 'cubicInOut',
             animationDuration: 2600

src/views/dashboard/RaddarChart.vue

@@ -68,18 +68,18 @@ export default {
             }
           },
           indicator: [
-            { name: 'Sales', max: 10000 },
-            { name: 'Administration', max: 20000 },
-            { name: 'Information Techology', max: 20000 },
-            { name: 'Customer Support', max: 20000 },
-            { name: 'Development', max: 20000 },
-            { name: 'Marketing', max: 20000 }
+            { name: '气钢瓶1', max: 10000 },
+            { name: '气钢瓶2', max: 20000 },
+            { name: '气钢瓶3', max: 20000 },
+            { name: '气钢瓶4', max: 20000 },
+            { name: '气钢瓶5', max: 20000 },
+            { name: '气钢瓶6', max: 20000 }
           ]
         },
         legend: {
           left: 'center',
           bottom: '10',
-          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
+          data: ['销量', '库存', '订单']
         },
         series: [{
           type: 'radar',
@@ -96,15 +96,15 @@ export default {
           data: [
             {
               value: [5000, 7000, 12000, 11000, 15000, 14000],
-              name: 'Allocated Budget'
+              name: '销量'
             },
             {
               value: [4000, 9000, 15000, 15000, 13000, 11000],
-              name: 'Expected Spending'
+              name: '库存'
             },
             {
               value: [5500, 11000, 12000, 15000, 12000, 12000],
-              name: 'Actual Spending'
+              name: '订单'
             }
           ],
           animationDuration: animationDuration

src/views/index.vue

@@ -8,71 +8,44 @@
             <div slot="header" class="clearfix">
                 <span>生产进度</span>
             </div>
-            <el-table
-                v-loading="loading"
-                :data="workorderList"
-                row-key="workorderId"
-                default-expand-all
-                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-                >
-                <el-table-column label="工单编码" width="180" prop="workorderCode" >
-                    <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="text"
-                        @click="handleView(scope.row)"
-                        v-hasPermi="['mes:pro:workorder:query']"
-                    >{{scope.row.workorderCode}}</el-button>
-                    </template>
-                </el-table-column>
-                <el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />            
-                <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
-                <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
-                <el-table-column label="产品名称" width="250px" align="center" prop="productName" :show-overflow-tooltip="true"/>
-                <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
-                <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-                <el-table-column label="生产进度" align="center" width="200px" >
-                    <template slot-scope="scope">
-                        <el-progress :text-inside="true" :stroke-width="20" :percentage="parseFloat(((scope.row.quantityProduced/scope.row.quantity*100).toFixed(2)))>100?100:parseFloat(((scope.row.quantityProduced/scope.row.quantity*100).toFixed(2)))"></el-progress>
-                    </template>
-                </el-table-column>            
-                <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
-                    <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                </el-table-column>         
-            </el-table>
+          <el-table
+            v-loading="loading"
+            :data="workorderList"
+            row-key="workorderId"
+            default-expand-all
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+            <el-table-column label="工单编码" width="180" prop="workorderCode" >
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="handleView(scope.row)"
+                  v-hasPermi="['mes:pro:workorder:query']"
+                >{{scope.row.workorderCode}}</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单编号" align="center" prop="sourceCode" />
+            <el-table-column label="工单名称" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
+            <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
+            <el-table-column label="产品名称" align="center" prop="productName" :show-overflow-tooltip="true"/>
+            <el-table-column label="规格型号" width="140" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
+            <el-table-column label="单位" width="140" align="center" prop="unitOfMeasure" />
+            <el-table-column label="需求日期" align="center" prop="requestDate">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-card>
     </el-row>
-    
-    <el-row style="background:#fff;padding:16px 16px 0; margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
 
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
-        </div>
-      </el-col>
-    </el-row>
 
-    
+
   </div>
 </template>
 
 <script>
-import { listWorkorder } from "@/api/mes/pro/workorder";
+import {getHomeList} from "@/api/mes/pro/workorder";
 import PanelGroup from './dashboard/PanelGroup'
 import LineChart from './dashboard/LineChart'
 import RaddarChart from './dashboard/RaddarChart'
@@ -112,7 +85,14 @@ export default {
         loading: true,
         queryParams: {status:'CONFIRMED'},
         workorderList: [],
-        lineChartData: lineChartData.newVisitis
+        lineChartData: lineChartData.newVisitis,
+      colors: [
+        {color: '#f56c6c', percentage: 20},
+        {color: '#e6a23c', percentage: 40},
+        {color: '#5cb87a', percentage: 60},
+        {color: '#1989fa', percentage: 80},
+        {color: '#6f7ad3', percentage: 100}
+      ]
     }
   },
   created(){
@@ -121,8 +101,8 @@ export default {
   methods: {
     getList() {
       this.loading = true;
-      listWorkorder(this.queryParams).then(response => {
-        this.workorderList = response.rows;
+      getHomeList(this.queryParams).then(response => {
+        this.workorderList = response.data;
         this.loading = false;
       });
     },
@@ -135,6 +115,7 @@ export default {
 
 <style lang="scss" scoped>
 .dashboard-editor-container {
+  height: calc(100vh - 84px);
   padding: 32px;
   background-color: rgb(240, 242, 245);
   position: relative;

src/views/login.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="login">
+    <label class="title-name">陕西隆庆气体有限公司</label>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">苦糖果生产执行管理系统</h3>
+      <h3 class="title">企业协同运营平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -166,6 +167,13 @@ export default {
   height: 100%;
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
+  flex-direction: column;
+}
+.title-name {
+  font-size: 100px;
+  margin-bottom: 100px;
+  color: #1c2187;
+  text-shadow:5px 5px #777;
 }
 .title {
   margin: 0px auto 30px auto;

src/views/md/baoxiao/index.vue

@@ -0,0 +1,286 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型" prop="leixing">
+        <el-input
+          v-model="queryParams.leixing"
+          placeholder="请输入类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原因" prop="yuanyin">
+        <el-input
+          v-model="queryParams.yuanyin"
+          placeholder="请输入原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="金额" prop="jine">
+        <el-input
+          v-model="queryParams.jine"
+          placeholder="请输入金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="时间" prop="shijian">
+        <el-date-picker clearable
+          v-model="queryParams.shijian"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:baoxiao:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:baoxiao:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:baoxiao:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:baoxiao:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="baoxiaoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="类型" align="center" prop="leixing" />
+      <el-table-column label="原因" align="center" prop="yuanyin" />
+      <el-table-column label="金额" align="center" prop="jine" />
+      <el-table-column label="时间" align="center" prop="shijian" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.shijian, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:baoxiao:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:baoxiao:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改报销对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="类型" prop="leixing">
+          <el-input v-model="form.leixing" placeholder="请输入类型" />
+        </el-form-item>
+        <el-form-item label="原因" prop="yuanyin">
+          <el-input v-model="form.yuanyin" placeholder="请输入原因" />
+        </el-form-item>
+        <el-form-item label="金额" prop="jine">
+          <el-input v-model="form.jine" placeholder="请输入金额" type="number"/>
+        </el-form-item>
+        <el-form-item label="时间" prop="shijian">
+          <el-date-picker clearable
+            v-model="form.shijian"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBaoxiao, getBaoxiao, delBaoxiao, addBaoxiao, updateBaoxiao } from "@/api/md/baoxiao";
+
+export default {
+  name: "Baoxiao",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 报销表格数据
+      baoxiaoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        leixing: null,        yuanyin: null,        jine: null,        shijian: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询报销列表 */
+    getList() {
+      this.loading = true;
+      listBaoxiao(this.queryParams).then(response => {
+        this.baoxiaoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        leixing: null,        yuanyin: null,        jine: null,        shijian: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加报销";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getBaoxiao(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改报销";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBaoxiao(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBaoxiao(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除报销编号为"' + ids + '"的数据项？').then(function() {
+        return delBaoxiao(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/baoxiao/export', {
+        ...this.queryParams
+      }, `baoxiao_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/ggl/index.vue

@@ -0,0 +1,266 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="biaoti">
+        <el-input
+          v-model="queryParams.biaoti"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="时间" prop="shijian">
+        <el-date-picker clearable
+          v-model="queryParams.shijian"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:ggl:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:ggl:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:ggl:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:ggl:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="gglList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标题" align="center" prop="biaoti" />
+      <el-table-column label="时间" align="center" prop="shijian" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.shijian, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="内容" align="center" prop="neirong" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:ggl:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:ggl:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公告栏对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="biaoti">
+          <el-input v-model="form.biaoti" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="时间" prop="shijian">
+          <el-date-picker clearable
+            v-model="form.shijian"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="内容" prop="neirong">
+          <el-input v-model="form.neirong" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGgl, getGgl, delGgl, addGgl, updateGgl } from "@/api/md/ggl";
+
+export default {
+  name: "Ggl",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公告栏表格数据
+      gglList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        biaoti: null,        shijian: null,        neirong: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询公告栏列表 */
+    getList() {
+      this.loading = true;
+      listGgl(this.queryParams).then(response => {
+        this.gglList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        biaoti: null,        shijian: null,        neirong: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加公告栏";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getGgl(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改公告栏";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateGgl(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGgl(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除公告栏编号为"' + ids + '"的数据项？').then(function() {
+        return delGgl(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/ggl/export', {
+        ...this.queryParams
+      }, `ggl_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/hetong/index.vue

@@ -0,0 +1,290 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="合同编号" prop="bianhao">
+        <el-input
+          v-model="queryParams.bianhao"
+          placeholder="请输入合同编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同名称" prop="mingcheng">
+        <el-input
+          v-model="queryParams.mingcheng"
+          placeholder="请输入合同名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同金额" prop="jine">
+        <el-input
+          v-model="queryParams.jine"
+          placeholder="请输入合同金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同时间" prop="shijian">
+        <el-date-picker clearable
+          v-model="queryParams.shijian"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择合同时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:hetong:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:hetong:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:hetong:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:hetong:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="hetongList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="合同编号" align="center" prop="bianhao" />
+      <el-table-column label="合同名称" align="center" prop="mingcheng" />
+      <el-table-column label="合同金额" align="center" prop="jine" />
+      <el-table-column label="合同时间" align="center" prop="shijian" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.shijian, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="合同内容" align="center" prop="neirong" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:hetong:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:hetong:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改合同管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="合同编号" prop="bianhao">
+          <el-input v-model="form.bianhao" placeholder="请输入合同编号" />
+        </el-form-item>
+        <el-form-item label="合同名称" prop="mingcheng">
+          <el-input v-model="form.mingcheng" placeholder="请输入合同名称" />
+        </el-form-item>
+        <el-form-item label="合同金额" prop="jine">
+          <el-input v-model="form.jine" placeholder="请输入合同金额" type="number"/>
+        </el-form-item>
+        <el-form-item label="合同时间" prop="shijian">
+          <el-date-picker clearable
+            v-model="form.shijian"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择合同时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="合同内容" prop="neirong">
+          <el-input v-model="form.neirong" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listHetong, getHetong, delHetong, addHetong, updateHetong } from "@/api/md/hetong";
+
+export default {
+  name: "Hetong",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 合同管理表格数据
+      hetongList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        bianhao: null,        mingcheng: null,        jine: null,        shijian: null,        neirong: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询合同管理列表 */
+    getList() {
+      this.loading = true;
+      listHetong(this.queryParams).then(response => {
+        this.hetongList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        bianhao: null,        mingcheng: null,        jine: null,        shijian: null,        neirong: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加合同管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getHetong(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改合同管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateHetong(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHetong(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除合同管理编号为"' + ids + '"的数据项？').then(function() {
+        return delHetong(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/hetong/export', {
+        ...this.queryParams
+      }, `hetong_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/kehutongji/index.vue

@@ -0,0 +1,413 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户类型" prop="customerType">
+        <el-input
+          v-model="queryParams.customerType"
+          placeholder="请选择客户类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系人姓名" prop="contactName">
+        <el-input
+          v-model="queryParams.contactName"
+          placeholder="请输入联系人姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="contactPhone">
+        <el-input
+          v-model="queryParams.contactPhone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户所在地区" prop="region">
+        <el-input
+          v-model="queryParams.region"
+          placeholder="请输入客户所在地区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="统计周期" prop="statisticPeriod">
+        <el-date-picker clearable
+          v-model="queryParams.statisticPeriod"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择统计周期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:kehutongji:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:kehutongji:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:kehutongji:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:kehutongji:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="kehutongjiList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="统计周期" align="center" prop="id" />
+      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="客户类型" align="center" prop="customerType" />
+      <el-table-column label="联系人姓名" align="center" prop="contactName" />
+      <el-table-column label="联系电话" align="center" prop="contactPhone" />
+      <el-table-column label="客户所在地区" align="center" prop="region" />
+      <el-table-column label="总销售额" align="center" prop="totalSales" />
+      <el-table-column label="总销售量" align="center" prop="totalQuantity" />
+      <el-table-column label="平均单价" align="center" prop="averageUnitPrice" />
+      <el-table-column label="最大订单金额" align="center" prop="largestOrder" />
+      <el-table-column label="平均订单金额" align="center" prop="averageOrderValue" />
+      <el-table-column label="直销销售额" align="center" prop="directSales" />
+      <el-table-column label="代理商销售额" align="center" prop="agentSales" />
+      <el-table-column label="电商平台销售额" align="center" prop="onlineSales" />
+      <el-table-column label="气体产品销售额" align="center" prop="gasSales" />
+      <el-table-column label="设备销售额" align="center" prop="equipmentSales" />
+      <el-table-column label="服务销售额" align="center" prop="serviceSales" />
+      <el-table-column label="首次下单日期" align="center" prop="firstOrderDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.firstOrderDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="最近下单日期" align="center" prop="lastOrderDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.lastOrderDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="累计订单数" align="center" prop="totalOrders" />
+      <el-table-column label="复购率" align="center" prop="repeatPurchaseRate" />
+      <el-table-column label="累计支付金额" align="center" prop="totalPayments" />
+      <el-table-column label="累计退款金额" align="center" prop="totalRefunds" />
+      <el-table-column label="未结清金额" align="center" prop="outstandingBalance" />
+      <el-table-column label="统计周期" align="center" prop="statisticPeriod" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.statisticPeriod, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:kehutongji:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:kehutongji:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改客户统计报对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="客户名称" prop="customerName">
+          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+        </el-form-item>
+        <el-form-item label="客户类型" prop="customerType">
+          <el-input v-model="form.customerType" placeholder="请选择客户类型" />
+        </el-form-item>
+        <el-form-item label="联系人姓名" prop="contactName">
+          <el-input v-model="form.contactName" placeholder="请输入联系人姓名" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="contactPhone">
+          <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="客户所在地区" prop="region">
+          <el-input v-model="form.region" placeholder="请输入客户所在地区" />
+        </el-form-item>
+        <el-form-item label="总销售额" prop="totalSales">
+          <el-input v-model="form.totalSales" placeholder="请输入总销售额" />
+        </el-form-item>
+        <el-form-item label="总销售量" prop="totalQuantity">
+          <el-input v-model="form.totalQuantity" placeholder="请输入总销售量" />
+        </el-form-item>
+        <el-form-item label="平均单价" prop="averageUnitPrice">
+          <el-input v-model="form.averageUnitPrice" placeholder="请输入平均单价" />
+        </el-form-item>
+        <el-form-item label="最大订单金额" prop="largestOrder">
+          <el-input v-model="form.largestOrder" placeholder="请输入最大订单金额" />
+        </el-form-item>
+        <el-form-item label="平均订单金额" prop="averageOrderValue">
+          <el-input v-model="form.averageOrderValue" placeholder="请输入平均订单金额" />
+        </el-form-item>
+        <el-form-item label="直销销售额" prop="directSales">
+          <el-input v-model="form.directSales" placeholder="请输入直销销售额" />
+        </el-form-item>
+        <el-form-item label="代理商销售额" prop="agentSales">
+          <el-input v-model="form.agentSales" placeholder="请输入代理商销售额" />
+        </el-form-item>
+        <el-form-item label="电商平台销售额" prop="onlineSales">
+          <el-input v-model="form.onlineSales" placeholder="请输入电商平台销售额" />
+        </el-form-item>
+        <el-form-item label="气体产品销售额" prop="gasSales">
+          <el-input v-model="form.gasSales" placeholder="请输入气体产品销售额" />
+        </el-form-item>
+        <el-form-item label="设备销售额" prop="equipmentSales">
+          <el-input v-model="form.equipmentSales" placeholder="请输入设备销售额" />
+        </el-form-item>
+        <el-form-item label="服务销售额" prop="serviceSales">
+          <el-input v-model="form.serviceSales" placeholder="请输入服务销售额" />
+        </el-form-item>
+        <el-form-item label="首次下单日期" prop="firstOrderDate">
+          <el-date-picker clearable
+            v-model="form.firstOrderDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择首次下单日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="最近下单日期" prop="lastOrderDate">
+          <el-date-picker clearable
+            v-model="form.lastOrderDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择最近下单日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="累计订单数" prop="totalOrders">
+          <el-input v-model="form.totalOrders" placeholder="请输入累计订单数" />
+        </el-form-item>
+        <el-form-item label="复购率" prop="repeatPurchaseRate">
+          <el-input v-model="form.repeatPurchaseRate" placeholder="请输入复购率" />
+        </el-form-item>
+        <el-form-item label="累计支付金额" prop="totalPayments">
+          <el-input v-model="form.totalPayments" placeholder="请输入累计支付金额" />
+        </el-form-item>
+        <el-form-item label="累计退款金额" prop="totalRefunds">
+          <el-input v-model="form.totalRefunds" placeholder="请输入累计退款金额" />
+        </el-form-item>
+        <el-form-item label="未结清金额" prop="outstandingBalance">
+          <el-input v-model="form.outstandingBalance" placeholder="请输入未结清金额" />
+        </el-form-item>
+        <el-form-item label="统计周期" prop="statisticPeriod">
+          <el-date-picker clearable
+            v-model="form.statisticPeriod"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择统计周期">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listKehutongji, getKehutongji, delKehutongji, addKehutongji, updateKehutongji } from "@/api/md/kehutongji";
+
+export default {
+  name: "Kehutongji",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户统计报表格数据
+      kehutongjiList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        customerId: null,        customerName: null,        customerType: null,        contactName: null,        contactPhone: null,        region: null,        totalSales: null,        totalQuantity: null,        averageUnitPrice: null,        largestOrder: null,        averageOrderValue: null,        directSales: null,        agentSales: null,        onlineSales: null,        gasSales: null,        equipmentSales: null,        serviceSales: null,        firstOrderDate: null,        lastOrderDate: null,        totalOrders: null,        repeatPurchaseRate: null,        totalPayments: null,        totalRefunds: null,        outstandingBalance: null,        statisticPeriod: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        customerId: [
+          { required: true, message: "客户ID不能为空", trigger: "blur" }
+        ],        customerName: [
+          { required: true, message: "客户名称不能为空", trigger: "blur" }
+        ],        customerType: [
+          { required: true, message: "客户类型不能为空", trigger: "change" }
+        ],        totalSales: [
+          { required: true, message: "总销售额不能为空", trigger: "blur" }
+        ],        totalQuantity: [
+          { required: true, message: "总销售量不能为空", trigger: "blur" }
+        ],        statisticPeriod: [
+          { required: true, message: "统计周期不能为空", trigger: "blur" }
+        ]      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询客户统计报列表 */
+    getList() {
+      this.loading = true;
+      listKehutongji(this.queryParams).then(response => {
+        this.kehutongjiList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        customerId: null,        customerName: null,        customerType: null,        contactName: null,        contactPhone: null,        region: null,        totalSales: null,        totalQuantity: null,        averageUnitPrice: null,        largestOrder: null,        averageOrderValue: null,        directSales: null,        agentSales: null,        onlineSales: null,        gasSales: null,        equipmentSales: null,        serviceSales: null,        firstOrderDate: null,        lastOrderDate: null,        totalOrders: null,        repeatPurchaseRate: null,        totalPayments: null,        totalRefunds: null,        outstandingBalance: null,        statisticPeriod: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加客户统计报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getKehutongji(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改客户统计报";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateKehutongji(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addKehutongji(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除客户统计报编号为"' + ids + '"的数据项？').then(function() {
+        return delKehutongji(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/kehutongji/export', {
+        ...this.queryParams
+      }, `kehutongji_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/kucuntongji/index.vue

@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="统计日期" prop="statisticDate">
+        <el-date-picker clearable
+          v-model="queryParams.statisticDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择统计日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="地区" prop="region">
+        <el-input
+          v-model="queryParams.region"
+          placeholder="请输入地区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouse">
+        <el-input
+          v-model="queryParams.warehouse"
+          placeholder="请输入仓库名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年份" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:kucuntongji:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:kucuntongji:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:kucuntongji:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:kucuntongji:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="kucuntongjiList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="年份" align="center" prop="id" />
+      <el-table-column label="统计日期" align="center" prop="statisticDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.statisticDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总库存价值" align="center" prop="totalInventoryValue" />
+      <el-table-column label="总库存数量" align="center" prop="totalQuantity" />
+      <el-table-column label="原材料库存价值" align="center" prop="rawMaterialValue" />
+      <el-table-column label="原材料库存数量" align="center" prop="rawMaterialQuantity" />
+      <el-table-column label="原材料库存周转率" align="center" prop="rawMaterialTurnoverRate" />
+      <el-table-column label="成品库存价值" align="center" prop="finishedGoodsValue" />
+      <el-table-column label="成品库存数量" align="center" prop="finishedGoodsQuantity" />
+      <el-table-column label="成品库存周转率" align="center" prop="finishedGoodsTurnoverRate" />
+      <el-table-column label="氧气库存价值" align="center" prop="oxygenValue" />
+      <el-table-column label="氧气库存数量" align="center" prop="oxygenQuantity" />
+      <el-table-column label="氮气库存价值" align="center" prop="nitrogenValue" />
+      <el-table-column label="氮气库存数量" align="center" prop="nitrogenQuantity" />
+      <el-table-column label="氩气库存价值" align="center" prop="argonValue" />
+      <el-table-column label="氩气库存数量" align="center" prop="argonQuantity" />
+      <el-table-column label="总库存周转率" align="center" prop="overallTurnoverRate" />
+      <el-table-column label="库存周转天数" align="center" prop="daysInventoryOutstanding" />
+      <el-table-column label="低库存商品数量" align="center" prop="lowStockItems" />
+      <el-table-column label="缺货商品数量" align="center" prop="outOfStockItems" />
+      <el-table-column label="积压商品数量" align="center" prop="excessStockItems" />
+      <el-table-column label="地区" align="center" prop="region" />
+      <el-table-column label="仓库名称" align="center" prop="warehouse" />
+      <el-table-column label="年份" align="center" prop="year" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:kucuntongji:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:kucuntongji:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改库存统计报对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="统计日期" prop="statisticDate">
+          <el-date-picker clearable
+            v-model="form.statisticDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择统计日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总库存价值" prop="totalInventoryValue">
+          <el-input v-model="form.totalInventoryValue" placeholder="请输入总库存价值" />
+        </el-form-item>
+        <el-form-item label="总库存数量" prop="totalQuantity">
+          <el-input v-model="form.totalQuantity" placeholder="请输入总库存数量" />
+        </el-form-item>
+        <el-form-item label="原材料库存价值" prop="rawMaterialValue">
+          <el-input v-model="form.rawMaterialValue" placeholder="请输入原材料库存价值" />
+        </el-form-item>
+        <el-form-item label="原材料库存数量" prop="rawMaterialQuantity">
+          <el-input v-model="form.rawMaterialQuantity" placeholder="请输入原材料库存数量" />
+        </el-form-item>
+        <el-form-item label="原材料库存周转率" prop="rawMaterialTurnoverRate">
+          <el-input v-model="form.rawMaterialTurnoverRate" placeholder="请输入原材料库存周转率" />
+        </el-form-item>
+        <el-form-item label="成品库存价值" prop="finishedGoodsValue">
+          <el-input v-model="form.finishedGoodsValue" placeholder="请输入成品库存价值" />
+        </el-form-item>
+        <el-form-item label="成品库存数量" prop="finishedGoodsQuantity">
+          <el-input v-model="form.finishedGoodsQuantity" placeholder="请输入成品库存数量" />
+        </el-form-item>
+        <el-form-item label="成品库存周转率" prop="finishedGoodsTurnoverRate">
+          <el-input v-model="form.finishedGoodsTurnoverRate" placeholder="请输入成品库存周转率" />
+        </el-form-item>
+        <el-form-item label="氧气库存价值" prop="oxygenValue">
+          <el-input v-model="form.oxygenValue" placeholder="请输入氧气库存价值" />
+        </el-form-item>
+        <el-form-item label="氧气库存数量" prop="oxygenQuantity">
+          <el-input v-model="form.oxygenQuantity" placeholder="请输入氧气库存数量" />
+        </el-form-item>
+        <el-form-item label="氮气库存价值" prop="nitrogenValue">
+          <el-input v-model="form.nitrogenValue" placeholder="请输入氮气库存价值" />
+        </el-form-item>
+        <el-form-item label="氮气库存数量" prop="nitrogenQuantity">
+          <el-input v-model="form.nitrogenQuantity" placeholder="请输入氮气库存数量" />
+        </el-form-item>
+        <el-form-item label="氩气库存价值" prop="argonValue">
+          <el-input v-model="form.argonValue" placeholder="请输入氩气库存价值" />
+        </el-form-item>
+        <el-form-item label="氩气库存数量" prop="argonQuantity">
+          <el-input v-model="form.argonQuantity" placeholder="请输入氩气库存数量" />
+        </el-form-item>
+        <el-form-item label="总库存周转率" prop="overallTurnoverRate">
+          <el-input v-model="form.overallTurnoverRate" placeholder="请输入总库存周转率" />
+        </el-form-item>
+        <el-form-item label="库存周转天数" prop="daysInventoryOutstanding">
+          <el-input v-model="form.daysInventoryOutstanding" placeholder="请输入库存周转天数" />
+        </el-form-item>
+        <el-form-item label="低库存商品数量" prop="lowStockItems">
+          <el-input v-model="form.lowStockItems" placeholder="请输入低库存商品数量" />
+        </el-form-item>
+        <el-form-item label="缺货商品数量" prop="outOfStockItems">
+          <el-input v-model="form.outOfStockItems" placeholder="请输入缺货商品数量" />
+        </el-form-item>
+        <el-form-item label="积压商品数量" prop="excessStockItems">
+          <el-input v-model="form.excessStockItems" placeholder="请输入积压商品数量" />
+        </el-form-item>
+        <el-form-item label="地区" prop="region">
+          <el-input v-model="form.region" placeholder="请输入地区" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouse">
+          <el-input v-model="form.warehouse" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="年份" prop="year">
+          <el-input v-model="form.year" placeholder="请输入年份" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listKucuntongji, getKucuntongji, delKucuntongji, addKucuntongji, updateKucuntongji } from "@/api/md/kucuntongji";
+
+export default {
+  name: "Kucuntongji",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 库存统计报表格数据
+      kucuntongjiList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        statisticDate: null,        totalInventoryValue: null,        totalQuantity: null,        rawMaterialValue: null,        rawMaterialQuantity: null,        rawMaterialTurnoverRate: null,        finishedGoodsValue: null,        finishedGoodsQuantity: null,        finishedGoodsTurnoverRate: null,        oxygenValue: null,        oxygenQuantity: null,        nitrogenValue: null,        nitrogenQuantity: null,        argonValue: null,        argonQuantity: null,        overallTurnoverRate: null,        daysInventoryOutstanding: null,        lowStockItems: null,        outOfStockItems: null,        excessStockItems: null,        region: null,        warehouse: null,        year: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        statisticDate: [
+          { required: true, message: "统计日期不能为空", trigger: "blur" }
+        ],        totalInventoryValue: [
+          { required: true, message: "总库存价值不能为空", trigger: "blur" }
+        ],        totalQuantity: [
+          { required: true, message: "总库存数量不能为空", trigger: "blur" }
+        ],      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询库存统计报列表 */
+    getList() {
+      this.loading = true;
+      listKucuntongji(this.queryParams).then(response => {
+        this.kucuntongjiList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        statisticDate: null,        totalInventoryValue: null,        totalQuantity: null,        rawMaterialValue: null,        rawMaterialQuantity: null,        rawMaterialTurnoverRate: null,        finishedGoodsValue: null,        finishedGoodsQuantity: null,        finishedGoodsTurnoverRate: null,        oxygenValue: null,        oxygenQuantity: null,        nitrogenValue: null,        nitrogenQuantity: null,        argonValue: null,        argonQuantity: null,        overallTurnoverRate: null,        daysInventoryOutstanding: null,        lowStockItems: null,        outOfStockItems: null,        excessStockItems: null,        region: null,        warehouse: null,        year: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加库存统计报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getKucuntongji(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改库存统计报";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateKucuntongji(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addKucuntongji(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除库存统计报编号为"' + ids + '"的数据项？').then(function() {
+        return delKucuntongji(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/kucuntongji/export', {
+        ...this.queryParams
+      }, `kucuntongji_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/qingjia/index.vue

@@ -0,0 +1,295 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型" prop="leixing">
+        <el-input
+          v-model="queryParams.leixing"
+          placeholder="请输入类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="kaishi">
+        <el-date-picker clearable
+          v-model="queryParams.kaishi"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="jieshu">
+        <el-date-picker clearable
+          v-model="queryParams.jieshu"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="原因" prop="yuanyin">
+        <el-input
+          v-model="queryParams.yuanyin"
+          placeholder="请输入原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:qingjia:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:qingjia:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:qingjia:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:qingjia:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="qingjiaList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="类型" align="center" prop="leixing" />
+      <el-table-column label="开始时间" align="center" prop="kaishi" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.kaishi, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="jieshu" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.jieshu, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="原因" align="center" prop="yuanyin" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:qingjia:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:qingjia:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改请假对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="类型" prop="leixing">
+          <el-input v-model="form.leixing" placeholder="请输入类型" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="kaishi">
+          <el-date-picker clearable
+            v-model="form.kaishi"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="jieshu">
+          <el-date-picker clearable
+            v-model="form.jieshu"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="原因" prop="yuanyin">
+          <el-input v-model="form.yuanyin" placeholder="请输入原因" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listQingjia, getQingjia, delQingjia, addQingjia, updateQingjia } from "@/api/md/qingjia";
+
+export default {
+  name: "Qingjia",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 请假表格数据
+      qingjiaList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        leixing: null,        kaishi: null,        jieshu: null,        yuanyin: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询请假列表 */
+    getList() {
+      this.loading = true;
+      listQingjia(this.queryParams).then(response => {
+        this.qingjiaList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        leixing: null,        kaishi: null,        jieshu: null,        yuanyin: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加请假";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getQingjia(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改请假";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateQingjia(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addQingjia(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除请假编号为"' + ids + '"的数据项？').then(function() {
+        return delQingjia(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/qingjia/export', {
+        ...this.queryParams
+      }, `qingjia_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/qipingtongji/index.vue

@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="统计日期" prop="statisticDate">
+        <el-date-picker clearable
+          v-model="queryParams.statisticDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择统计日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="地区" prop="region">
+        <el-input
+          v-model="queryParams.region"
+          placeholder="请输入地区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouse">
+        <el-input
+          v-model="queryParams.warehouse"
+          placeholder="请输入仓库名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年份" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:qipingtongji:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:qipingtongji:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:qipingtongji:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:qipingtongji:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="qipingtongjiList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="年份" align="center" prop="id" />
+      <el-table-column label="统计日期" align="center" prop="statisticDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.statisticDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="公司库存气瓶数量" align="center" prop="companyStock" />
+      <el-table-column label="客户欠瓶数量" align="center" prop="customerOwing" />
+      <el-table-column label="新购气瓶数量" align="center" prop="newlyPurchased" />
+      <el-table-column label="售出气瓶数量" align="center" prop="sold" />
+      <el-table-column label="报废气瓶数量" align="center" prop="scrapped" />
+      <el-table-column label="气瓶实际总量" align="center" prop="totalCylinders" />
+      <el-table-column label="在库气瓶数量" align="center" prop="inStock" />
+      <el-table-column label="在用气瓶数量" align="center" prop="inUse" />
+      <el-table-column label="在维护气瓶数量" align="center" prop="inMaintenance" />
+      <el-table-column label="待报废气瓶数量" align="center" prop="awaitingScrap" />
+      <el-table-column label="氧气瓶数量" align="center" prop="oxygenCylinders" />
+      <el-table-column label="氮气瓶数量" align="center" prop="nitrogenCylinders" />
+      <el-table-column label="氩气瓶数量" align="center" prop="argonCylinders" />
+      <el-table-column label="其他气瓶数量" align="center" prop="otherCylinders" />
+      <el-table-column label="租出气瓶数量" align="center" prop="cylindersRented" />
+      <el-table-column label="归还气瓶数量" align="center" prop="cylindersReturned" />
+      <el-table-column label="丢失气瓶数量" align="center" prop="cylindersLost" />
+      <el-table-column label="地区" align="center" prop="region" />
+      <el-table-column label="仓库名称" align="center" prop="warehouse" />
+      <el-table-column label="年份" align="center" prop="year" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:qipingtongji:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:qipingtongji:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改气瓶统计报对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="统计日期" prop="statisticDate">
+          <el-date-picker clearable
+            v-model="form.statisticDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择统计日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="公司库存气瓶数量" prop="companyStock">
+          <el-input v-model="form.companyStock" placeholder="请输入公司库存气瓶数量" />
+        </el-form-item>
+        <el-form-item label="客户欠瓶数量" prop="customerOwing">
+          <el-input v-model="form.customerOwing" placeholder="请输入客户欠瓶数量" />
+        </el-form-item>
+        <el-form-item label="新购气瓶数量" prop="newlyPurchased">
+          <el-input v-model="form.newlyPurchased" placeholder="请输入新购气瓶数量" />
+        </el-form-item>
+        <el-form-item label="售出气瓶数量" prop="sold">
+          <el-input v-model="form.sold" placeholder="请输入售出气瓶数量" />
+        </el-form-item>
+        <el-form-item label="报废气瓶数量" prop="scrapped">
+          <el-input v-model="form.scrapped" placeholder="请输入报废气瓶数量" />
+        </el-form-item>
+        <el-form-item label="气瓶实际总量" prop="totalCylinders">
+          <el-input v-model="form.totalCylinders" placeholder="请输入气瓶实际总量" />
+        </el-form-item>
+        <el-form-item label="在库气瓶数量" prop="inStock">
+          <el-input v-model="form.inStock" placeholder="请输入在库气瓶数量" />
+        </el-form-item>
+        <el-form-item label="在用气瓶数量" prop="inUse">
+          <el-input v-model="form.inUse" placeholder="请输入在用气瓶数量" />
+        </el-form-item>
+        <el-form-item label="在维护气瓶数量" prop="inMaintenance">
+          <el-input v-model="form.inMaintenance" placeholder="请输入在维护气瓶数量" />
+        </el-form-item>
+        <el-form-item label="待报废气瓶数量" prop="awaitingScrap">
+          <el-input v-model="form.awaitingScrap" placeholder="请输入待报废气瓶数量" />
+        </el-form-item>
+        <el-form-item label="氧气瓶数量" prop="oxygenCylinders">
+          <el-input v-model="form.oxygenCylinders" placeholder="请输入氧气瓶数量" />
+        </el-form-item>
+        <el-form-item label="氮气瓶数量" prop="nitrogenCylinders">
+          <el-input v-model="form.nitrogenCylinders" placeholder="请输入氮气瓶数量" />
+        </el-form-item>
+        <el-form-item label="氩气瓶数量" prop="argonCylinders">
+          <el-input v-model="form.argonCylinders" placeholder="请输入氩气瓶数量" />
+        </el-form-item>
+        <el-form-item label="其他气瓶数量" prop="otherCylinders">
+          <el-input v-model="form.otherCylinders" placeholder="请输入其他气瓶数量" />
+        </el-form-item>
+        <el-form-item label="租出气瓶数量" prop="cylindersRented">
+          <el-input v-model="form.cylindersRented" placeholder="请输入租出气瓶数量" />
+        </el-form-item>
+        <el-form-item label="归还气瓶数量" prop="cylindersReturned">
+          <el-input v-model="form.cylindersReturned" placeholder="请输入归还气瓶数量" />
+        </el-form-item>
+        <el-form-item label="丢失气瓶数量" prop="cylindersLost">
+          <el-input v-model="form.cylindersLost" placeholder="请输入丢失气瓶数量" />
+        </el-form-item>
+        <el-form-item label="地区" prop="region">
+          <el-input v-model="form.region" placeholder="请输入地区" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouse">
+          <el-input v-model="form.warehouse" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="年份" prop="year">
+          <el-input v-model="form.year" placeholder="请输入年份" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listQipingtongji, getQipingtongji, delQipingtongji, addQipingtongji, updateQipingtongji } from "@/api/md/qipingtongji";
+
+export default {
+  name: "Qipingtongji",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 气瓶统计报表格数据
+      qipingtongjiList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        statisticDate: null,        companyStock: null,        customerOwing: null,        newlyPurchased: null,        sold: null,        scrapped: null,        totalCylinders: null,        inStock: null,        inUse: null,        inMaintenance: null,        awaitingScrap: null,        oxygenCylinders: null,        nitrogenCylinders: null,        argonCylinders: null,        otherCylinders: null,        cylindersRented: null,        cylindersReturned: null,        cylindersLost: null,        region: null,        warehouse: null,        year: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        statisticDate: [
+          { required: true, message: "统计日期不能为空", trigger: "blur" }
+        ],        companyStock: [
+          { required: true, message: "公司库存气瓶数量不能为空", trigger: "blur" }
+        ],        customerOwing: [
+          { required: true, message: "客户欠瓶数量不能为空", trigger: "blur" }
+        ],        newlyPurchased: [
+          { required: true, message: "新购气瓶数量不能为空", trigger: "blur" }
+        ],        sold: [
+          { required: true, message: "售出气瓶数量不能为空", trigger: "blur" }
+        ],        scrapped: [
+          { required: true, message: "报废气瓶数量不能为空", trigger: "blur" }
+        ],        totalCylinders: [
+          { required: true, message: "气瓶实际总量不能为空", trigger: "blur" }
+        ],      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询气瓶统计报列表 */
+    getList() {
+      this.loading = true;
+      listQipingtongji(this.queryParams).then(response => {
+        this.qipingtongjiList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        statisticDate: null,        companyStock: null,        customerOwing: null,        newlyPurchased: null,        sold: null,        scrapped: null,        totalCylinders: null,        inStock: null,        inUse: null,        inMaintenance: null,        awaitingScrap: null,        oxygenCylinders: null,        nitrogenCylinders: null,        argonCylinders: null,        otherCylinders: null,        cylindersRented: null,        cylindersReturned: null,        cylindersLost: null,        region: null,        warehouse: null,        year: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加气瓶统计报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getQipingtongji(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改气瓶统计报";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateQipingtongji(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addQipingtongji(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除气瓶统计报编号为"' + ids + '"的数据项？').then(function() {
+        return delQipingtongji(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/qipingtongji/export', {
+        ...this.queryParams
+      }, `qipingtongji_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/shenpiliu/HelloWorld.vue

@@ -0,0 +1,14 @@
+<template>
+  <div class="hello">
+    <h1>{{ msg }}</h1>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HelloWorld',
+  props: {
+    msg: String
+  }
+}
+</script>

src/views/md/shenpiliu/addNode.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class="add-node-btn-box">
+    <div class="add-node-btn">
+      <el-popover placement="right-start" popper-class="add-node-popover" v-model="visible">
+        <div class="add-node-popover-body">
+          <div class="add-node-popover-item approver" @click="addType(1)">
+            <div class="item-wrapper">
+              <img src="@/assets/images/审批人.png" alt="" class="img-style">
+            </div>
+            <p>审批人</p>
+          </div>
+          <div class="add-node-popover-item notifier" @click="addType(2)">
+            <div class="item-wrapper">
+              <img src="@/assets/images/抄送人.png" alt="" class="img-style">
+            </div>
+            <p>抄送人</p>
+          </div>
+          <div class="add-node-popover-item condition" @click="addType(4)">
+            <div class="item-wrapper">
+              <img src="@/assets/images/条件.png" alt="" class="img-style">
+            </div>
+            <p>条件分支</p>
+          </div>
+        </div>
+        <button class="btn" type="button" slot="reference">
+          <i style="color:#fff" class="el-icon-plus"></i>
+        </button>
+      </el-popover>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ["childNodeP", "nodeConfig", 'tip'],
+  data() {
+    return {
+      visible: false,
+      parentObj: {},
+    }
+  },
+  methods: {
+    addType(type) {
+      this.visible = false;
+      let data;
+      if (type != 4) {
+        if (type == 1) {
+          data = {
+            nodeName: "审核人",
+            error: true,
+            type: 1,
+            nodeId: "approvalID",
+            examineMode: "1",
+            nodeUserType: {
+              type: 'manager',
+              value: '',
+              valueList: [],
+              valueName: '',
+            },
+            childNode: this.childNodeP,
+          }
+        } else if (type == 2) {
+          data = {
+            nodeName: "抄送人",
+            error: true,
+            type: 2,
+            nodeId: "copyID",
+            nodeUserType: {
+              type: 'manager',
+              value: 'm-1',
+              valueName: '第一级主管',
+              valueList: [],
+            },
+            childNode: this.childNodeP,
+          }
+        }
+        this.$parent.setPerson('', '', data, this.tip);  //添加节点自动弹出弹框
+      } else {
+        data = {
+          nodeName: "路由",
+          type: 4,
+          nodeId: "conditionID",
+          childNode: this.childNodeP,
+          conditionNodes: [{
+            nodeName: "条件1",
+            error: true,
+            type: 3,
+            priorityLevel: 1,
+            conditionList: [],
+            childNode: null,
+          }, {
+            nodeName: "默认",
+            error: true,
+            type: 3,
+            priorityLevel: 2,
+            conditionList: [],
+            childNode: null
+          }]
+        }
+        this.$parent.setPerson(1, '', data);//添加节点自动弹出弹框
+      }
+      this.$emit("update:childNodeP", data);
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.add-node-btn-box {
+  width: 240px;
+  display: inline-flex;
+  flex-shrink: 0;
+  position: relative;
+  &:first-child {
+    margin-left: 16px;
+  }
+  &:before {
+    content: "";
+    position: absolute;
+    top: 1px;
+    left: 0px;
+    right: 0;
+    bottom: 0;
+    z-index: -1;
+    margin: auto;
+    width: 1px;
+    // height: 100%;
+    background-color: #ebebeb;
+  }
+}
+.img-style {
+  width: 36px;
+}
+.add-node-popover {
+  padding: 14px 26px;
+  .add-node-popover-body {
+    display: flex;
+    .add-node-popover-item {
+      margin-right: 20px;
+      text-align: center;
+      cursor: pointer;
+      &:last-child {
+        margin-right: 0;
+      }
+      i {
+        font-size: 36px;
+      }
+      p {
+        color: #333;
+        margin-top: 4px;
+      }
+    }
+    .approver {
+      i {
+        color: #e6a23c;
+      }
+    }
+    .condition {
+      i {
+        color: #67c23a;
+      }
+    }
+    .notifier {
+      i {
+        color: #4880ff;
+      }
+    }
+  }
+}
+</style>

src/views/md/shenpiliu/cptPopver.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="approval-CptPopver">
+    <el-popover placement="top" v-if="type" popper-class="set_promoter_explain_tip" width="270" trigger="hover">
+      <div>
+        <p class="explain_tip_title">以发起人的直接部门主管为第一级</p>
+        <div class="explain_tip_flow flex">
+          <div class="explain_tip_flow_list">
+            <p>第四级主管</p>
+            <p><i class="el-icon-top"></i></p>
+          </div>
+          <div class="explain_tip_flow_list">
+            <p>第三级主管</p>
+            <p><i class="el-icon-top"></i></p>
+          </div>
+          <div class="explain_tip_flow_list">
+            <p>第二级主管</p>
+            <p><i class="el-icon-top"></i></p>
+          </div>
+          <div class="explain_tip_flow_list">
+            <p style="color:#4880FF">第一级主管</p>
+            <p><i class="el-icon-top"></i></p>
+          </div>
+          <div class="explain_tip_flow_list">
+            <p><i class="iconfont icon-icon_sponsor"></i> 发起人</p>
+          </div>
+        </div>
+      </div>
+      <i slot="reference" class="iconfont icon-icon_explain"></i>
+    </el-popover>
+    <el-popover v-else placement="top" popper-class="set_promoter_explain_tip" width="270" trigger="hover">
+      <div>
+        <p class="explain_tip_title">以公司的最高部门为第一级</p>
+        <div class="explain_tip_flow flex">
+          <div class="explain_tip_flow_list">
+            <p style="color:#4880FF">第一级主管</p>
+            <p><i class="el-icon-top"></i></p>
+          </div>
+          <div class="explain_tip_flow_list">
+            <p>第二级主管</p>
+            <p><i class="el-icon-top"></i></p>
+          </div>
+          <div class="explain_tip_flow_list">
+            <p>第三级主管</p>
+            <p><i class="el-icon-top"></i></p>
+          </div>
+          <div class="explain_tip_flow_list">
+            <p>第四级主管</p>
+            <p><i class="el-icon-top"></i></p>
+          </div>
+          <div class="explain_tip_flow_list">
+            <p><i class="iconfont icon-icon_sponsor"></i> 发起人</p>
+          </div>
+        </div>
+      </div>
+      <i slot="reference" class="iconfont icon-icon_explain"></i>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['type'],
+};
+</script>
+
+<style lang="less">
+.approval-CptPopver {
+  display: inline-block;
+}
+
+.set_promoter_explain_tip {
+  padding: 16px 21px;
+
+  .explain_tip_title {
+    color: #828282;
+    margin-bottom: 11px;
+  }
+
+  .explain_tip_flow {
+    padding: 21px 0;
+    background-color: #f7f8fa;
+    flex-direction: column;
+    text-align: center;
+    color: #828282;
+
+    i {
+      color: #bfbfbf;
+      margin: 6px 0;
+    }
+
+    .icon-icon_sponsor {
+      color: #828282;
+    }
+  }
+}
+</style>

src/views/md/shenpiliu/index.vue

@@ -0,0 +1,756 @@
+<template>
+  <div>
+    <div class="approval-flow fd-nav-content">
+      <div class="dingflow-design">
+        <div class="box-scale" id="box-scale" :style="'transform: scale('+nowVal/100+'); transform-origin: 50% 0px 0px;'">
+          <div class="end-node flex">
+            <p>开始</p>
+          </div>
+          <nodeWrap v-bind="$attrs" :nodeConfig="nodeConfig" :dataFields="dataFields" :isTried="isTried"></nodeWrap>
+          <div class="end-node flex">
+            <p>结束</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import nodeWrap from './nodeWrap.vue'
+export default {
+  components: {
+    nodeWrap,
+  },
+  data() {
+    return {
+      //流程设置
+      isTried: false,
+      tipList: [],
+      nodeConfig: {
+        error: true,
+        childNode: {
+          nodeName: "审核人",
+          nodeUserType: {
+            valueName: "admin",
+            valueList: ["admin"],
+            type: "user",
+            value: "admin"
+          },
+          examineMode: "1",
+          error: false,
+          type: 1,
+          nodeId: "approvalID"
+        }
+      },
+      dataFields: [
+        { name: "日期", key: "date", type: "date" },
+        { name: "地址", key: "adress" },
+        { name: "状态", key: "state" }
+      ],
+      nowVal: 100,
+      flowPermission: [],
+      tableId: "",
+      nodeConfigss: {
+        "type": 0, //类型
+        "priorityLevel": "", //优先级
+        "settype": "", //审批人类型
+        "selectMode": "", // 1人还是多人
+        "selectRange": "", //选择范围
+        "directorLevel": "", // 主管层级
+        "examineMode": "", //多人审批时采用的审批方式  （依次审批 ，会签）
+        "noHanderAction": "", //审批人为空时 (自动审批通过/不允许发起, 转交给审核管理员)
+        "examineEndType": "",
+        "examineEndRoleId": "",
+        "examineEndDirectorLevel": "", // 审批终点层级
+        "ccSelfSelectFlag": "", // 抄送人 
+        "conditionList": [], //条件设置
+        "nodeUserList": [], // 人员列表
+      },
+    };
+  },
+  computed: {
+
+  },
+  watch: {
+  },
+  created() {
+
+  },
+  mounted() {
+
+  },
+  methods: {
+    // 保存
+    saveData() {
+      this.isTried = true;
+      this.tipList = [];
+      this.reErr(this.nodeConfig)
+      if (this.tipList.length != 0) {
+        return;
+      }
+      this.workflowSave()
+    },
+    reErr(data) {
+      if (data.childNode) {
+        if (data.childNode.type == 1) {
+          //审批人
+          if (data.childNode.error) {
+            this.tipList.push({
+              name: data.childNode.nodeName,
+              type: '审核人',
+            })
+          }
+          this.reErr(data.childNode)
+        } else if (data.childNode.type == 2) {
+          if (data.childNode.error) {
+            this.tipList.push({
+              name: data.childNode.nodeName,
+              type: '抄送人',
+            })
+          }
+          this.reErr(data.childNode)
+        } else if (data.childNode.type == 3) {
+          this.reErr(data.childNode.childNode)
+        } else if (data.childNode.type == 4) {
+          this.reErr(data.childNode)
+          for (
+            var i = 0; i < data.childNode.conditionNodes.length; i++
+          ) {
+            if (data.childNode.conditionNodes[i].error) {
+              this.tipList.push({
+                name: data.childNode.conditionNodes[i].nodeName,
+                type: '条件',
+              })
+            }
+            this.reErr(data.childNode.conditionNodes[i])
+          }
+        }
+      } else {
+        data.childNode = null
+      }
+    },
+    // 给数据加preId(递归)
+    handleData(data) {
+      if (data.childNode) {
+        data.childNode.preId = data.nodeId;
+        this.handleData(data.childNode);
+      }
+      return data;
+    },
+    workflowSave() {
+      // 调接口存数据
+      let data = this.handleData(this.nodeConfig);
+      console.log('data', data);
+      this.$message.success('保存成功')
+    },
+    zoomSize(type) {
+      if (type == 1) {
+        if (this.nowVal == 50) {
+          return;
+        }
+        this.nowVal -= 10;
+      } else {
+        if (this.nowVal == 300) {
+          return;
+        }
+        this.nowVal += 10;
+      }
+    }
+  },
+};
+</script>
+
+<style lang="less">
+.btn-style {
+  position: fixed;
+  right: 60px;
+}
+.approval-flow {
+  .dingflow-design {
+    .zoom {
+      position: fixed;
+      height: 40px;
+      width: 125px;
+      right: 40px;
+      margin-top: 30px;
+      z-index: 10;
+      display: flex;
+      .zoom-in,
+      .zoom-out {
+        width: 30px;
+        height: 30px;
+        background: #fff;
+        color: #c1c1cd;
+        cursor: pointer;
+        background-size: 100%;
+        background-repeat: no-repeat;
+      }
+
+      .zoom-out {
+        background-image: url(https://gw.alicdn.com/tfs/TB1s0qhBHGYBuNjy0FoXXciBFXa-90-90.png);
+      }
+
+      .zoom-out.disabled {
+        opacity: 0.5;
+      }
+
+      .zoom-in {
+        background-image: url(https://gw.alicdn.com/tfs/TB1UIgJBTtYBeNjy1XdXXXXyVXa-90-90.png);
+      }
+
+      .zoom-in.disabled {
+        opacity: 0.5;
+      }
+    }
+
+    .box-scale {
+      transform: scale(1);
+      display: inline-block;
+      position: relative;
+      width: auto;
+      // padding: 54.5px 0;
+      transform-origin: 0 0 0;
+      left: 40%;
+      .branch-wrap {
+        .branch-box-wrap {
+          margin-left: -240px;
+          .auto-judge {
+            position: relative;
+            width: 280px;
+            min-height: 100px;
+            background: #fff;
+            border-radius: 4px;
+            cursor: pointer;
+
+            .title-wrapper {
+              position: relative;
+              font-size: 12px;
+              color: #333;
+              text-align: left;
+              height: 38px;
+              line-height: 38px;
+              padding: 0 13px 0 0px;
+              border-bottom: 1px solid #ebebeb;
+            }
+          }
+        }
+      }
+
+      .node-wrap-box {
+        display: inline-flex;
+        flex-direction: column;
+        position: relative;
+        width: 280px;
+        min-height: 72px;
+        background: #fff;
+        border-radius: 4px;
+        cursor: pointer;
+      }
+
+      .node-wrap-box:after {
+        pointer-events: none;
+        content: "";
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        z-index: 2;
+        border-radius: 4px;
+        border: 1px solid transparent;
+        transition: all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);
+        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
+      }
+
+      .end-node {
+        justify-content: center;
+        flex-direction: column;
+
+        p {
+          width: 280px;
+          height: 40px;
+          line-height: 40px;
+          color: #fff;
+          text-align: center;
+          background-color: #8cafff;
+          border-radius: 4px;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+}
+.fd-nav-content {
+  position: fixed;
+  top: 84px;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1;
+  overflow-x: hidden;
+  overflow-y: auto;
+  padding-bottom: 30px;
+}
+.dingflow-design {
+  width: auto;
+  background-color: #f5f8ff;
+  overflow: auto;
+  position: absolute;
+  bottom: 0;
+  left: 250px;
+  right: 0;
+  top: 0;
+}
+.editable-title {
+  font-size: 14px;
+  padding-left: 18px;
+}
+.dingflow-design .ie-polyfill-container {
+  display: -ms-grid;
+  -ms-grid-columns: min-content;
+}
+
+.dingflow-design .node-wrap {
+  flex-direction: column;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  -webkit-box-flex: 1;
+  -ms-flex-positive: 1;
+  // padding: 0 50px;
+  position: relative;
+}
+
+.dingflow-design .branch-wrap,
+.dingflow-design .node-wrap {
+  display: inline-flex;
+  // width: 100%;
+}
+
+.dingflow-design .branch-box-wrap {
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  min-height: 270px;
+  width: 100%;
+  -ms-flex-negative: 0;
+  flex-shrink: 0;
+}
+
+.dingflow-design .branch-box {
+  display: flex;
+  overflow: visible;
+  min-height: 180px;
+  height: auto;
+  border-bottom: 1px solid #ebebeb;
+  border-top: 1px solid #ebebeb;
+  position: relative;
+  margin-top: 15px;
+}
+
+.dingflow-design .branch-box .col-box:before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 0;
+  margin: auto;
+  width: 1px;
+  height: 100%;
+  background-color: #ebebeb;
+}
+
+.dingflow-design .add-branch {
+  border: none;
+  outline: none;
+  user-select: none;
+  justify-content: center;
+  font-size: 12px;
+  padding: 0 10px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 15px;
+  color: #4880ff;
+  background: #fff;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
+  position: absolute;
+  top: -16px;
+  left: 50%;
+  transform: translateX(-50%);
+  transform-origin: center center;
+  cursor: pointer;
+  z-index: 1;
+  display: inline-flex;
+  align-items: center;
+  -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+}
+
+.dingflow-design .add-branch:hover {
+  transform: translateX(-50%) scale(1.1);
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.1);
+}
+
+.dingflow-design .add-branch:active {
+  transform: translateX(-50%);
+  box-shadow: none;
+}
+
+.dingflow-design .col-box {
+  display: inline-flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  flex-direction: column;
+  -webkit-box-align: center;
+  align-items: center;
+  position: relative;
+}
+
+.dingflow-design .condition-node {
+  min-height: 220px;
+}
+
+.dingflow-design .condition-node,
+.dingflow-design .condition-node-box {
+  display: inline-flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  flex-direction: column;
+  -webkit-box-flex: 1;
+}
+
+.dingflow-design .condition-node-box {
+  padding-top: 30px;
+  padding-right: 50px;
+  padding-left: 50px;
+  -webkit-box-pack: center;
+  justify-content: center;
+  -webkit-box-align: center;
+  align-items: center;
+  flex-grow: 1;
+  position: relative;
+}
+
+.dingflow-design .condition-node-box:before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+  width: 1px;
+  height: 100%;
+  background-color: #ebebeb;
+}
+
+.dingflow-design .auto-judge:after {
+  pointer-events: none;
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 2;
+  border-radius: 4px;
+  border: 1px solid transparent;
+  transition: all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);
+  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
+}
+
+.dingflow-design .auto-judge.active:after,
+.dingflow-design .auto-judge:active:after,
+.dingflow-design .auto-judge:hover:after {
+  border: 1px solid #4880ff;
+  box-shadow: 0 0 6px 0 rgba(50, 150, 250, 0.3);
+}
+
+.dingflow-design .auto-judge.active .close,
+.dingflow-design .auto-judge:active .close,
+.dingflow-design .auto-judge:hover .close {
+  display: block;
+}
+
+.dingflow-design .auto-judge.error:after {
+  border: 1px solid #f25643;
+  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
+}
+
+.dingflow-design .auto-judge .title-wrapper .editable-title {
+  display: inline-block;
+  max-width: 120px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: 16px;
+}
+
+.dingflow-design .auto-judge .title-wrapper .priority-title {
+  display: inline-block;
+  float: right;
+  margin-right: 35px;
+  color: #828282;
+}
+
+.dingflow-design .auto-judge .title-wrapper .priority-button {
+  display: inline-block;
+  height: 28px;
+  float: right;
+  margin-right: 10px;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  color: rgba(0, 0, 0, 0.65);
+}
+
+.dingflow-design .auto-judge .title-wrapper .priority-button div {
+  display: inline-block;
+}
+
+.dingflow-design .auto-judge .title-wrapper .priority-button .priority-content {
+  padding: 0 8px;
+  font-size: 12px;
+  line-height: 28px;
+  border-left: 1px solid rgba(0, 0, 0, 0.15);
+  border-right: 1px solid rgba(0, 0, 0, 0.15);
+}
+
+.dingflow-design .auto-judge .placeholder {
+  color: #bfbfbf;
+}
+
+.dingflow-design .auto-judge .close {
+  display: none;
+  position: absolute;
+  right: 22px;
+  top: 8px;
+  width: 20px;
+  height: 20px;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.25);
+  border-radius: 50%;
+  text-align: center;
+  line-height: 20px;
+  z-index: 2;
+}
+
+.dingflow-design .auto-judge .content {
+  height: calc(100% - 39px);
+  display: flex;
+  align-items: center;
+  max-width: calc(100% - 36px);
+  padding: 0 18px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 14px;
+}
+
+.dingflow-design .auto-judge .sort-left,
+.dingflow-design .auto-judge .sort-right {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  display: none;
+  z-index: 1;
+  color: rgba(0, 0, 0, 0.25);
+}
+
+.dingflow-design .auto-judge .sort-left {
+  left: 4px;
+  top: 33px;
+  color: rgba(0, 0, 0, 0.5);
+}
+
+.dingflow-design .auto-judge .sort-right {
+  right: 26px;
+  top: 33px;
+}
+
+.dingflow-design .auto-judge:hover .sort-left,
+.dingflow-design .auto-judge:hover .sort-right {
+  display: flex;
+  align-items: center;
+}
+
+.dingflow-design .add-node-btn {
+  user-select: none;
+  width: 240px;
+  padding: 30px 0;
+  display: flex;
+  -webkit-box-pack: center;
+  justify-content: center;
+  flex-shrink: 0;
+  -webkit-box-flex: 1;
+  flex-grow: 1;
+  // margin-left: -55px;
+}
+
+.dingflow-design .add-node-btn .btn {
+  outline: none;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
+  width: 30px;
+  height: 30px;
+  background: #4880ff;
+  border-radius: 50%;
+  position: relative;
+  border: none;
+  line-height: 30px;
+  -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  // margin-left: 36px;
+}
+
+.dingflow-design .add-node-btn .btn .iconfont {
+  color: #fff;
+  font-size: 16px;
+}
+
+.dingflow-design .add-node-btn .btn:hover {
+  transform: scale(1.3);
+  box-shadow: 0 13px 27px 0 rgba(0, 0, 0, 0.1);
+}
+
+.dingflow-design .add-node-btn .btn:active {
+  transform: none;
+  background: #1e83e9;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
+}
+
+.top-left-cover-line {
+  left: -1px;
+}
+
+.top-left-cover-line,
+.top-right-cover-line {
+  position: absolute;
+  height: 3px;
+  width: 50%;
+  background-color: #f5f8ff;
+  top: -2px;
+}
+
+.top-right-cover-line {
+  right: -1px;
+}
+
+.bottom-left-cover-line {
+  left: -1px;
+}
+
+.bottom-left-cover-line,
+.bottom-right-cover-line {
+  position: absolute;
+  height: 3px;
+  width: 50%;
+  background-color: #f5f8ff;
+  bottom: -2px;
+}
+
+.bottom-right-cover-line {
+  right: -1px;
+}
+
+.node-wrap-box.active:after,
+.node-wrap-box:active:after,
+.node-wrap-box:hover:after {
+  border: 1px solid #3296fa;
+  box-shadow: 0 0 6px 0 rgba(50, 150, 250, 0.3);
+}
+
+.node-wrap-box.active .close,
+.node-wrap-box:active .close,
+.node-wrap-box:hover .close {
+  display: block;
+}
+
+.node-wrap-box.error:after {
+  border: 1px solid #f25643;
+  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
+}
+
+.node-wrap-box .title {
+  position: relative;
+  display: flex;
+  align-items: center;
+  padding-left: 16px;
+  // padding-right: 30px;
+  // width: 100%;
+  height: 40px;
+  line-height: 40px;
+  font-size: 16px;
+  color: #fff;
+  text-align: left;
+  background: #576a95;
+  border-radius: 4px 4px 0 0;
+}
+
+.node-wrap-box .title .iconfont {
+  font-size: 12px;
+  margin-right: 5px;
+}
+
+.node-wrap-box .placeholder {
+  color: #bfbfbf;
+}
+
+.node-wrap-box .close {
+  display: none;
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 20px;
+  height: 20px;
+  font-size: 14px;
+  color: #fff;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 20px;
+}
+
+.node-wrap-box .content {
+  position: relative;
+  font-size: 14px;
+  padding: 20px 18px;
+  /* padding-right: 30px */
+}
+
+.node-wrap-box .content .text {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+}
+
+.node-wrap-box .content .arrow {
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 20px;
+  height: 14px;
+  font-size: 14px;
+  color: #979797;
+}
+
+.start-node.node-wrap-box .content .text {
+  display: block;
+  white-space: nowrap;
+}
+</style>

src/views/md/weipan/index.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="上传人" prop="shangchuanren">
+        <el-input
+          v-model="queryParams.shangchuanren"
+          placeholder="请输入上传人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="时间" prop="shijian">
+        <el-date-picker clearable
+          v-model="queryParams.shijian"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="类型" prop="leixing">
+        <el-input
+          v-model="queryParams.leixing"
+          placeholder="请输入类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:weipan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:weipan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:weipan:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:weipan:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="weipanList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="上传人" align="center" prop="shangchuanren" />
+      <el-table-column label="时间" align="center" prop="shijian" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.shijian, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center" prop="leixing" />
+      <el-table-column label="文件" align="center" prop="wenjian" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:weipan:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:weipan:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改微盘管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="上传人" prop="shangchuanren">
+          <el-input v-model="form.shangchuanren" placeholder="请输入上传人" />
+        </el-form-item>
+        <el-form-item label="时间" prop="shijian">
+          <el-date-picker clearable
+            v-model="form.shijian"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="类型" prop="leixing">
+          <el-input v-model="form.leixing" placeholder="请输入类型" />
+        </el-form-item>
+        <el-form-item label="文件">
+          <file-upload v-model="form.wenjian"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWeipan, getWeipan, delWeipan, addWeipan, updateWeipan } from "@/api/md/weipan";
+
+export default {
+  name: "Weipan",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 微盘管理表格数据
+      weipanList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        shangchuanren: null,        shijian: null,        leixing: null,        wenjian: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询微盘管理列表 */
+    getList() {
+      this.loading = true;
+      listWeipan(this.queryParams).then(response => {
+        this.weipanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        shangchuanren: null,        shijian: null,        leixing: null,        wenjian: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加微盘管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getWeipan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改微盘管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateWeipan(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWeipan(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除微盘管理编号为"' + ids + '"的数据项？').then(function() {
+        return delWeipan(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/weipan/export', {
+        ...this.queryParams
+      }, `weipan_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/xiaoshoutongji/index.vue

@@ -0,0 +1,346 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="统计日期" prop="statisticDate">
+        <el-date-picker clearable
+          v-model="queryParams.statisticDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择统计日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="年份" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:xiaoshoutongji:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:xiaoshoutongji:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:xiaoshoutongji:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:xiaoshoutongji:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="xiaoshoutongjiList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="年份" align="center" prop="id" />
+      <el-table-column label="统计日期" align="center" prop="statisticDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.statisticDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总销售额" align="center" prop="totalSales" />
+      <el-table-column label="总销售量" align="center" prop="totalQuantity" />
+      <el-table-column label="平均单价" align="center" prop="averageUnitPrice" />
+      <el-table-column label="工业客户销售额" align="center" prop="industrialSales" />
+      <el-table-column label="医疗客户销售额" align="center" prop="medicalSales" />
+      <el-table-column label="零售客户销售额" align="center" prop="retailSales" />
+      <el-table-column label="其他客户销售额" align="center" prop="otherSales" />
+      <el-table-column label="直销销售额" align="center" prop="directSales" />
+      <el-table-column label="代理商销售额" align="center" prop="agentSales" />
+      <el-table-column label="电商平台销售额" align="center" prop="onlineSales" />
+      <el-table-column label="气体产品销售额" align="center" prop="gasSales" />
+      <el-table-column label="设备销售额" align="center" prop="equipmentSales" />
+      <el-table-column label="服务销售额" align="center" prop="serviceSales" />
+      <el-table-column label="新增客户数量" align="center" prop="newCustomers" />
+      <el-table-column label="回头客数量" align="center" prop="repeatCustomers" />
+      <el-table-column label="最大订单金额" align="center" prop="largestOrder" />
+      <el-table-column label="平均订单金额" align="center" prop="averageOrderValue" />
+      <el-table-column label="退款金额" align="center" prop="refundAmount" />
+      <el-table-column label="净销售额" align="center" prop="netSales" />
+      <el-table-column label="季度" align="center" prop="season" />
+      <el-table-column label="年份" align="center" prop="year" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:xiaoshoutongji:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:xiaoshoutongji:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改销售统计报对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="统计日期" prop="statisticDate">
+          <el-date-picker clearable
+            v-model="form.statisticDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择统计日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总销售额" prop="totalSales">
+          <el-input v-model="form.totalSales" placeholder="请输入总销售额" />
+        </el-form-item>
+        <el-form-item label="总销售量" prop="totalQuantity">
+          <el-input v-model="form.totalQuantity" placeholder="请输入总销售量" />
+        </el-form-item>
+        <el-form-item label="平均单价" prop="averageUnitPrice">
+          <el-input v-model="form.averageUnitPrice" placeholder="请输入平均单价" />
+        </el-form-item>
+        <el-form-item label="工业客户销售额" prop="industrialSales">
+          <el-input v-model="form.industrialSales" placeholder="请输入工业客户销售额" />
+        </el-form-item>
+        <el-form-item label="医疗客户销售额" prop="medicalSales">
+          <el-input v-model="form.medicalSales" placeholder="请输入医疗客户销售额" />
+        </el-form-item>
+        <el-form-item label="零售客户销售额" prop="retailSales">
+          <el-input v-model="form.retailSales" placeholder="请输入零售客户销售额" />
+        </el-form-item>
+        <el-form-item label="其他客户销售额" prop="otherSales">
+          <el-input v-model="form.otherSales" placeholder="请输入其他客户销售额" />
+        </el-form-item>
+        <el-form-item label="直销销售额" prop="directSales">
+          <el-input v-model="form.directSales" placeholder="请输入直销销售额" />
+        </el-form-item>
+        <el-form-item label="代理商销售额" prop="agentSales">
+          <el-input v-model="form.agentSales" placeholder="请输入代理商销售额" />
+        </el-form-item>
+        <el-form-item label="电商平台销售额" prop="onlineSales">
+          <el-input v-model="form.onlineSales" placeholder="请输入电商平台销售额" />
+        </el-form-item>
+        <el-form-item label="气体产品销售额" prop="gasSales">
+          <el-input v-model="form.gasSales" placeholder="请输入气体产品销售额" />
+        </el-form-item>
+        <el-form-item label="设备销售额" prop="equipmentSales">
+          <el-input v-model="form.equipmentSales" placeholder="请输入设备销售额" />
+        </el-form-item>
+        <el-form-item label="服务销售额" prop="serviceSales">
+          <el-input v-model="form.serviceSales" placeholder="请输入服务销售额" />
+        </el-form-item>
+        <el-form-item label="新增客户数量" prop="newCustomers">
+          <el-input v-model="form.newCustomers" placeholder="请输入新增客户数量" />
+        </el-form-item>
+        <el-form-item label="回头客数量" prop="repeatCustomers">
+          <el-input v-model="form.repeatCustomers" placeholder="请输入回头客数量" />
+        </el-form-item>
+        <el-form-item label="最大订单金额" prop="largestOrder">
+          <el-input v-model="form.largestOrder" placeholder="请输入最大订单金额" />
+        </el-form-item>
+        <el-form-item label="平均订单金额" prop="averageOrderValue">
+          <el-input v-model="form.averageOrderValue" placeholder="请输入平均订单金额" />
+        </el-form-item>
+        <el-form-item label="退款金额" prop="refundAmount">
+          <el-input v-model="form.refundAmount" placeholder="请输入退款金额" />
+        </el-form-item>
+        <el-form-item label="净销售额" prop="netSales">
+          <el-input v-model="form.netSales" placeholder="请输入净销售额" />
+        </el-form-item>
+        <el-form-item label="年份" prop="year">
+          <el-input v-model="form.year" placeholder="请输入年份" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listXiaoshoutongji, getXiaoshoutongji, delXiaoshoutongji, addXiaoshoutongji, updateXiaoshoutongji } from "@/api/md/xiaoshoutongji";
+
+export default {
+  name: "Xiaoshoutongji",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 销售统计报表格数据
+      xiaoshoutongjiList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        statisticDate: null,        totalSales: null,        totalQuantity: null,        averageUnitPrice: null,        industrialSales: null,        medicalSales: null,        retailSales: null,        otherSales: null,        directSales: null,        agentSales: null,        onlineSales: null,        gasSales: null,        equipmentSales: null,        serviceSales: null,        newCustomers: null,        repeatCustomers: null,        largestOrder: null,        averageOrderValue: null,        refundAmount: null,        netSales: null,        season: null,        year: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        statisticDate: [
+          { required: true, message: "统计日期不能为空", trigger: "blur" }
+        ],        totalSales: [
+          { required: true, message: "总销售额不能为空", trigger: "blur" }
+        ],        totalQuantity: [
+          { required: true, message: "总销售量不能为空", trigger: "blur" }
+        ],      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询销售统计报列表 */
+    getList() {
+      this.loading = true;
+      listXiaoshoutongji(this.queryParams).then(response => {
+        this.xiaoshoutongjiList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        statisticDate: null,        totalSales: null,        totalQuantity: null,        averageUnitPrice: null,        industrialSales: null,        medicalSales: null,        retailSales: null,        otherSales: null,        directSales: null,        agentSales: null,        onlineSales: null,        gasSales: null,        equipmentSales: null,        serviceSales: null,        newCustomers: null,        repeatCustomers: null,        largestOrder: null,        averageOrderValue: null,        refundAmount: null,        netSales: null,        season: null,        year: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加销售统计报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getXiaoshoutongji(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改销售统计报";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateXiaoshoutongji(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addXiaoshoutongji(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除销售统计报编号为"' + ids + '"的数据项？').then(function() {
+        return delXiaoshoutongji(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/xiaoshoutongji/export', {
+        ...this.queryParams
+      }, `xiaoshoutongji_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/md/zhiliangfenxi/index.vue

@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="统计日期" prop="statisticDate">
+        <el-date-picker clearable
+          v-model="queryParams.statisticDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择统计日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="地区" prop="region">
+        <el-input
+          v-model="queryParams.region"
+          placeholder="请输入地区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生产线名称" prop="productionLine">
+        <el-input
+          v-model="queryParams.productionLine"
+          placeholder="请输入生产线名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年份" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['md:zhiliangfenxi:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['md:zhiliangfenxi:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['md:zhiliangfenxi:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['md:zhiliangfenxi:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="zhiliangfenxiList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="统计日期" align="center" prop="statisticDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.statisticDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总检测样本数" align="center" prop="totalSamples" />
+      <el-table-column label="合格样本数" align="center" prop="passedSamples" />
+      <el-table-column label="不合格样本数" align="center" prop="failedSamples" />
+      <el-table-column label="合格率" align="center" prop="passRate" />
+      <el-table-column label="杂质超标不合格数" align="center" prop="impurityFailures" />
+      <el-table-column label="压力不合格数" align="center" prop="pressureFailures" />
+      <el-table-column label="泄漏不合格数" align="center" prop="leakageFailures" />
+      <el-table-column label="标签错误不合格数" align="center" prop="labelingFailures" />
+      <el-table-column label="其他原因不合格数" align="center" prop="otherFailures" />
+      <el-table-column label="氧气产品合格率" align="center" prop="oxygenPassRate" />
+      <el-table-column label="氮气产品合格率" align="center" prop="nitrogenPassRate" />
+      <el-table-column label="氩气产品合格率" align="center" prop="argonPassRate" />
+      <el-table-column label="其他气体产品合格率" align="center" prop="otherGasesPassRate" />
+      <el-table-column label="检测设备名称" align="center" prop="testingEquipment" />
+      <el-table-column label="检测人员姓名" align="center" prop="testingPersonnel" />
+      <el-table-column label="地区" align="center" prop="region" />
+      <el-table-column label="生产线名称" align="center" prop="productionLine" />
+      <el-table-column label="年份" align="center" prop="year" />
+      <el-table-column label="纠正措施" align="center" prop="correctiveActions" />
+      <el-table-column label="预防措施" align="center" prop="preventiveActions" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:zhiliangfenxi:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['md:zhiliangfenxi:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改数据统计与分析对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="统计日期" prop="statisticDate">
+          <el-date-picker clearable
+            v-model="form.statisticDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择统计日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总检测样本数" prop="totalSamples">
+          <el-input v-model="form.totalSamples" placeholder="请输入总检测样本数" />
+        </el-form-item>
+        <el-form-item label="合格样本数" prop="passedSamples">
+          <el-input v-model="form.passedSamples" placeholder="请输入合格样本数" />
+        </el-form-item>
+        <el-form-item label="不合格样本数" prop="failedSamples">
+          <el-input v-model="form.failedSamples" placeholder="请输入不合格样本数" />
+        </el-form-item>
+        <el-form-item label="合格率" prop="passRate">
+          <el-input v-model="form.passRate" placeholder="请输入合格率" />
+        </el-form-item>
+        <el-form-item label="杂质超标不合格数" prop="impurityFailures">
+          <el-input v-model="form.impurityFailures" placeholder="请输入杂质超标不合格数" />
+        </el-form-item>
+        <el-form-item label="压力不合格数" prop="pressureFailures">
+          <el-input v-model="form.pressureFailures" placeholder="请输入压力不合格数" />
+        </el-form-item>
+        <el-form-item label="泄漏不合格数" prop="leakageFailures">
+          <el-input v-model="form.leakageFailures" placeholder="请输入泄漏不合格数" />
+        </el-form-item>
+        <el-form-item label="标签错误不合格数" prop="labelingFailures">
+          <el-input v-model="form.labelingFailures" placeholder="请输入标签错误不合格数" />
+        </el-form-item>
+        <el-form-item label="其他原因不合格数" prop="otherFailures">
+          <el-input v-model="form.otherFailures" placeholder="请输入其他原因不合格数" />
+        </el-form-item>
+        <el-form-item label="氧气产品合格率" prop="oxygenPassRate">
+          <el-input v-model="form.oxygenPassRate" placeholder="请输入氧气产品合格率" />
+        </el-form-item>
+        <el-form-item label="氮气产品合格率" prop="nitrogenPassRate">
+          <el-input v-model="form.nitrogenPassRate" placeholder="请输入氮气产品合格率" />
+        </el-form-item>
+        <el-form-item label="氩气产品合格率" prop="argonPassRate">
+          <el-input v-model="form.argonPassRate" placeholder="请输入氩气产品合格率" />
+        </el-form-item>
+        <el-form-item label="其他气体产品合格率" prop="otherGasesPassRate">
+          <el-input v-model="form.otherGasesPassRate" placeholder="请输入其他气体产品合格率" />
+        </el-form-item>
+        <el-form-item label="检测设备名称" prop="testingEquipment">
+          <el-input v-model="form.testingEquipment" placeholder="请输入检测设备名称" />
+        </el-form-item>
+        <el-form-item label="检测人员姓名" prop="testingPersonnel">
+          <el-input v-model="form.testingPersonnel" placeholder="请输入检测人员姓名" />
+        </el-form-item>
+        <el-form-item label="地区" prop="region">
+          <el-input v-model="form.region" placeholder="请输入地区" />
+        </el-form-item>
+        <el-form-item label="生产线名称" prop="productionLine">
+          <el-input v-model="form.productionLine" placeholder="请输入生产线名称" />
+        </el-form-item>
+        <el-form-item label="年份" prop="year">
+          <el-input v-model="form.year" placeholder="请输入年份" />
+        </el-form-item>
+        <el-form-item label="纠正措施" prop="correctiveActions">
+          <el-input v-model="form.correctiveActions" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="预防措施" prop="preventiveActions">
+          <el-input v-model="form.preventiveActions" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listZhiliangfenxi, getZhiliangfenxi, delZhiliangfenxi, addZhiliangfenxi, updateZhiliangfenxi } from "@/api/md/zhiliangfenxi";
+
+export default {
+  name: "Zhiliangfenxi",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 数据统计与分析表格数据
+      zhiliangfenxiList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        statisticDate: null,        totalSamples: null,        passedSamples: null,        failedSamples: null,        passRate: null,        impurityFailures: null,        pressureFailures: null,        leakageFailures: null,        labelingFailures: null,        otherFailures: null,        oxygenPassRate: null,        nitrogenPassRate: null,        argonPassRate: null,        otherGasesPassRate: null,        testingEquipment: null,        testingPersonnel: null,        region: null,        productionLine: null,        year: null,        correctiveActions: null,        preventiveActions: null      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        statisticDate: [
+          { required: true, message: "统计日期不能为空", trigger: "blur" }
+        ],        totalSamples: [
+          { required: true, message: "总检测样本数不能为空", trigger: "blur" }
+        ],        passedSamples: [
+          { required: true, message: "合格样本数不能为空", trigger: "blur" }
+        ],        failedSamples: [
+          { required: true, message: "不合格样本数不能为空", trigger: "blur" }
+        ],      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询数据统计与分析列表 */
+    getList() {
+      this.loading = true;
+      listZhiliangfenxi(this.queryParams).then(response => {
+        this.zhiliangfenxiList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,        statisticDate: null,        totalSamples: null,        passedSamples: null,        failedSamples: null,        passRate: null,        impurityFailures: null,        pressureFailures: null,        leakageFailures: null,        labelingFailures: null,        otherFailures: null,        oxygenPassRate: null,        nitrogenPassRate: null,        argonPassRate: null,        otherGasesPassRate: null,        testingEquipment: null,        testingPersonnel: null,        region: null,        productionLine: null,        year: null,        correctiveActions: null,        preventiveActions: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加数据统计与分析";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getZhiliangfenxi(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改数据统计与分析";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateZhiliangfenxi(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addZhiliangfenxi(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除数据统计与分析编号为"' + ids + '"的数据项？').then(function() {
+        return delZhiliangfenxi(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/zhiliangfenxi/export', {
+        ...this.queryParams
+      }, `zhiliangfenxi_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/mes/cal/calendar/calendarType.vue

@@ -2,21 +2,31 @@
       <div class="app-container">
           <el-container>
                   <el-aside width="150px">
-                        <el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">        
+                        <el-radio-group v-model="selectedType" class="x-fillitem el-group-list" @change="onSelected">
                               <el-radio-button
                                     v-for="dict in dict.type.mes_calendar_type"
                                     :key="dict.value"
                                     :label="dict.value"
-                              >{{dict.label}}</el-radio-button>                                              
+                              >{{dict.label}}</el-radio-button>
                         </el-radio-group>
                   </el-aside>
                   <el-main>
+                    <el-form :model="form" size="small" :inline="true" label-width="100px">
+                      <el-form-item label="日期" prop="date">
+                        <el-date-picker
+                          v-model="form.date"
+                          type="date"
+                          @change="changeDate"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-form>
                         <el-calendar v-loading="loading" v-model="date">
                               <template slot="dateCell" slot-scope="{date, data }">
                               <div>
                                     <el-row>
                                           <el-col :span="6">
-                                                <div class="solar">                    
+                                                <div class="solar">
                                                       {{ data.day.split('-')[2] }}
                                                 </div>
                                           </el-col>
@@ -35,10 +45,10 @@
                                                       <el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'" type="warning" icon="el-icon-sunny">{{ teamShift.teamName }}</el-button>
                                                       <el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'"   type="info"    icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
                                                       <el-button v-if="teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'" type="info"    icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
-                                                </div>                                               
+                                                </div>
                                           </el-col>
-                                    </el-row>                                  
-                              </div>                
+                                    </el-row>
+                              </div>
                               </template>
                         </el-calendar>
                   </el-main>
@@ -50,11 +60,14 @@
 import { listCalholiday } from "@/api/mes/cal/calholiday";
 import { listCalendars } from "@/api/mes/cal/calendar";
 import calendar from '@/utils/calendar';
+import UserSingleSelect from "@/components/userSelect/single.vue";
 export default {
-      name: 'CalendarTypeView',     
-      dicts:['mes_calendar_type'], 
+      name: 'CalendarTypeView',
+  components: {UserSingleSelect},
+      dicts:['mes_calendar_type'],
       data(){
             return {
+                  form: {},
                   // 遮罩层
                   loading: true,
                   date: new Date(),
@@ -72,15 +85,15 @@ export default {
                         holidayType: null,
                         startTime: null,
                         endTime: null,
-                  },                        
+                  },
             }
       },
       watch:{
             date:{
                   handler(newVal,oldVal){
                         console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
-                        this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();         
-                        this.loading = true;         
+                        this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
+                        this.loading = true;
                         listCalendars(this.teamShiftQueryParams).then(response =>{
                               this.calendarDayList = response.data;
                               this.loading = false;
@@ -92,12 +105,15 @@ export default {
             this.getList();
       },
       methods:{
+        changeDate(val) {
+          this.date = val
+        },
             /** 查询节假日设置列表 */
             getList() {
-                  this.loading = true;   
+                  this.loading = true;
                   this.holidayList =[];
                   this.workdayList =[];
-                  let that = this;         
+                  let that = this;
                   listCalholiday(this.queryParams).then(response => {
                   if(response.data !=null){
                         response.data.forEach(theDay => {
@@ -106,16 +122,16 @@ export default {
                               }else{
                               that.workdayList.push(theDay.theDay);
                               }
-                        });                    
+                        });
                         this.loading = false;
                   }
                   });
             },
             //点击班组类型
             onSelected(calType){
-                  this.loading = true;   
+                  this.loading = true;
                   this.teamShiftQueryParams.calendarType = calType;
-                  this.teamShiftQueryParams.date = this.date;                  
+                  this.teamShiftQueryParams.date = this.date.getFullYear() + '-' + (this.date.getMonth() + 1) + '-' + this.date.getDate();
                   listCalendars(this.teamShiftQueryParams).then(response =>{
                         this.calendarDayList = response.data;
                         this.loading = false;
@@ -124,20 +140,20 @@ export default {
             isFestival(slotDate, slotData) {
                   let solarDayArr = slotData.day.split('-');
                   let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
-      
+
                   // 公历节日\农历节日\农历节气
                   let festAndTerm = [];
                   festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
                   festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
                   festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
                   festAndTerm = festAndTerm.join('')
-      
+
                   return festAndTerm != ''
             },
             solarDate2lunar(solarDate) {
                   var solar = solarDate.split('-')
-                  var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])       
-                  
+                  var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])
+
                   let lunarMD = lunar.IMonthCn + lunar.IDayCn;
                   // 公历节日\农历节日\农历节气
                   let festAndTerm = [];
@@ -145,9 +161,9 @@ export default {
                   festAndTerm.push(lunar.lunarFestival == null ? '' : '' + lunar.lunarFestival)
                   festAndTerm.push(lunar.Term == null ? '' : '' + lunar.Term)
                   festAndTerm = festAndTerm.join('')
-      
+
                   return festAndTerm == '' ? lunarMD : festAndTerm
-                  
+
             }
       }
 }
@@ -204,4 +220,4 @@ export default {
       .el-calendar-table .holiday {
             background-color: #88E325;
       }
-</style>
+</style>

src/views/mes/cal/calendar/person.vue

@@ -14,6 +14,14 @@
                                     </el-input>
                                     <UserSingleSelect ref="userSelect" @onSelected="onUserSelected"></UserSingleSelect>
                               </el-form-item>
+                            <el-form-item label="日期" prop="date">
+                              <el-date-picker
+                                v-model="form.date"
+                                type="date"
+                                @change="changeDate"
+                                placeholder="选择日期">
+                              </el-date-picker>
+                            </el-form-item>
                         </el-form>
                   </el-header>
                   <el-main>
@@ -22,7 +30,7 @@
                               <div>
                                     <el-row>
                                           <el-col :span="6">
-                                                <div class="solar">                    
+                                                <div class="solar">
                                                       {{ data.day.split('-')[2] }}
                                                 </div>
                                           </el-col>
@@ -41,10 +49,10 @@
                                                       <el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_THREE'" type="warning" icon="el-icon-sunny">{{ teamShift.teamName }}</el-button>
                                                       <el-button v-if="teamShift.orderNum ==2 && calendarDay.shiftType=='SHIFT_TWO'"   type="info"    icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
                                                       <el-button v-if="teamShift.orderNum ==3 && calendarDay.shiftType=='SHIFT_THREE'" type="info"    icon="el-icon-moon">{{ teamShift.teamName }}</el-button>
-                                                </div>                                               
+                                                </div>
                                           </el-col>
-                                    </el-row>                                  
-                              </div>                
+                                    </el-row>
+                              </div>
                               </template>
                         </el-calendar>
                   </el-main>
@@ -58,8 +66,8 @@ import { listCalendars } from "@/api/mes/cal/calendar";
 import UserSingleSelect from "@/components/userSelect/single.vue"
 import calendar from '@/utils/calendar';
 export default {
-      name: 'UserView',     
-      dicts:['mes_calendar_type'], 
+      name: 'UserView',
+      dicts:['mes_calendar_type'],
       components :{UserSingleSelect},
       data(){
             return {
@@ -81,15 +89,14 @@ export default {
                         holidayType: null,
                         startTime: null,
                         endTime: null,
-                  },                        
+                  },
             }
       },
       watch:{
             date:{
                   handler(newVal,oldVal){
-                        console.log(newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate());
-                        this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();         
-                        this.loading = true;         
+                        this.teamShiftQueryParams.date = newVal.getFullYear()+'-'+(newVal.getMonth()+1)+'-'+newVal.getDate();
+                        this.loading = true;
                         listCalendars(this.teamShiftQueryParams).then(response =>{
                               this.calendarDayList = response.data;
                               this.loading = false;
@@ -101,12 +108,15 @@ export default {
             this.getList();
       },
       methods:{
+        changeDate(val) {
+          this.date = val
+        },
             /** 查询节假日设置列表 */
             getList() {
-                  this.loading = true;   
+                  this.loading = true;
                   this.holidayList =[];
                   this.workdayList =[];
-                  let that = this;         
+                  let that = this;
                   listCalholiday(this.queryParams).then(response => {
                   if(response.data !=null){
                         response.data.forEach(theDay => {
@@ -115,7 +125,7 @@ export default {
                               }else{
                               that.workdayList.push(theDay.theDay);
                               }
-                        });                    
+                        });
                         this.loading = false;
                   }
                   });
@@ -125,9 +135,9 @@ export default {
                   this.$refs.userSelect.showFlag = true;
             },
             //人员选择返回
-            onUserSelected(row){                  
+            onUserSelected(row){
                   this.form.nickName = row.nickName;
-                  this.loading = true;   
+                  this.loading = true;
                   this.teamShiftQueryParams.userId = row.userId;
                   this.teamShiftQueryParams.date = this.date;
                   listCalendars(this.teamShiftQueryParams).then(response =>{
@@ -138,20 +148,20 @@ export default {
             isFestival(slotDate, slotData) {
                   let solarDayArr = slotData.day.split('-');
                   let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
-      
+
                   // 公历节日\农历节日\农历节气
                   let festAndTerm = [];
                   festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
                   festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
                   festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
                   festAndTerm = festAndTerm.join('')
-      
+
                   return festAndTerm != ''
             },
             solarDate2lunar(solarDate) {
                   var solar = solarDate.split('-')
-                  var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])       
-                  
+                  var lunar = calendar.solar2lunar(solar[0], solar[1], solar[2])
+
                   let lunarMD = lunar.IMonthCn + lunar.IDayCn;
                   // 公历节日\农历节日\农历节气
                   let festAndTerm = [];
@@ -159,9 +169,9 @@ export default {
                   festAndTerm.push(lunar.lunarFestival == null ? '' : '' + lunar.lunarFestival)
                   festAndTerm.push(lunar.Term == null ? '' : '' + lunar.Term)
                   festAndTerm = festAndTerm.join('')
-      
+
                   return festAndTerm == '' ? lunarMD : festAndTerm
-                  
+
             }
       }
 }
@@ -218,4 +228,4 @@ export default {
       .el-calendar-table .holiday {
             background-color: #88E325;
       }
-</style>
+</style>