manage-client 3.1.13-aode → 3.1.13-ls

package/package.json

@@ -1,97 +1,101 @@
-{
-  "name": "manage-client",
-  "version": "3.1.13-aode",
-  "description": "经营管控模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less": "^2.7.3",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "vue-amap": "0.5.10",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-client": "1.0.93-aode",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.22.24-aode",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "8.2.1",
-    "system-clients": "3.1.92-aode",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js --single-run",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/management_modules.git"
-  },
-  "keywords": [
-    "manage"
-  ],
-  "author": "liuxudong",
-  "license": "ISC"
-}
+{
+  "name": "manage-client",
+  "version": "3.1.13-ls",
+  "description": "经营管控模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "axios": "^0.21.1",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.28",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "3.2.13-71",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.1.89-18",
+    "url-loader": "^0.5.7",
+    "vue-amap": "0.5.10",
+    "vue-client": "1.24.87",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js --single-run",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/management_modules.git"
+  },
+  "keywords": [
+    "manage"
+  ],
+  "author": "liuxudong",
+  "license": "ISC"
+}

package/src/App.vue

@@ -3,14 +3,14 @@
     <app-base class="bg">
       <div class='flex'>
         <article>
-          <!--<route :comp="{name: 'manage-home'}"></route>-->
+          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
           <!--<route :comp="{name: 'meter-reading'}"></route>-->
           <!--<route :comp="{name: 'Gasproperties'}"></route>-->
           <!--<route :comp="{name: 'vender-management'}"></route>-->
           <!--<route :comp="{name: 'malfunction-home'}"></route>-->
           <route :comp="{name: 'login'}"></route>
           <!-- <route :comp="{name: 'load-data'}"></route> -->
-          <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
           <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
         </article>
       </div>

package/src/Util.js

@@ -318,7 +318,31 @@ export function nextMonth20 (date) {
   let nextMonth = ds[1] - 0 + 1
   return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
 }
-
+//
+export function dateSwitch(fmt,dateStr,times){
+  let date=new Date(dateStr).getTime()+times
+  return this.dateFormat(fmt,new Date(date))
+}
+// 时间格式化
+export function dateFormat(fmt, date) {
+  let ret;
+  const opt = {
+    "y+": date.getFullYear().toString(),        // 年
+    "M+": (date.getMonth() + 1).toString(),     // 月
+    "d+": date.getDate().toString(),            // 日
+    "h+": date.getHours().toString(),           // 时
+    "m+": date.getMinutes().toString(),         // 分
+    "s+": date.getSeconds().toString()          // 秒
+    // 有其他格式化字符需求可以继续添加，必须转化成字符串
+  }
+  for (let k in opt) {
+    ret = new RegExp("(" + k + ")").exec(fmt);
+    if (ret) {
+      fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+    }
+  }
+  return fmt
+}
 // export function getNowDate () {
 //   // 求取当前时间的工具
 //   let myweekday = ''

package/src/components/BasisEcharts/BarChart.vue

@@ -0,0 +1,247 @@
+
+<template>
+  <div>
+    <div class="text-1" :id="canvas">
+      <div :id="charts"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    name: "barChart",
+
+    /*
+      折线图
+     1.必须要传的参数:xdata,sdata,legendData
+
+     2.规范值
+     传入参数 例
+          xdata:[1,2,3,4]
+          sdata:[
+            [2,4,6,8],
+            [1,3,5,7]
+          ]
+          legendData:['第一个','第二个']
+          legendData的长度等于sdata的长度
+          sdata的每一个数组的长度要和  xdata的长度相等
+
+    3.参数含义
+    xdata   :  x轴数据
+    sdata   :  展示的数据
+    legend : 展示那些显示那些不显示
+    title   :  标题
+    yname   :  y轴名称
+    xname   :  y轴名称
+    settime   :  tooltip 轮播的时间 默认 1500
+    showtooltip : 是否展示 提示框 默认展示
+    smooth : 曲线 平滑线 默认曲线
+    showtitle : 标题是否展示
+    showyname: y轴名称是否显示
+     */
+    props: [
+      'xdata',
+      'sdata',
+      'legend',
+      'title',
+      'yname',
+      'settime',
+      'showtooltip',
+      'smooth',
+      'showtitle',
+      'showyname',
+      'showxname',
+      'xname'
+    ],
+    data() {
+      return {
+        canvas: 'canvas_'+new Date().getTime()+'_'+Math.random()*10,
+        charts: 'charts_'+new Date().getTime()+'_'+Math.random()*10,
+        xc: '',
+        timer: '',
+        time:1500,  // 轮播提示的时间 默认 1500
+        showtTip:true,   // 轮播提示框 默认展示
+        csmooth:false,  // 线的类型  true 为平滑线 反之曲线
+        cshowtitle:true, //标题 默认展示
+        cshowyname:true , //y轴名称 默认展示
+        cshowxname:true , //x轴名称 默认展示
+      }
+    },
+    beforeDestroy() {
+      //清除定时器
+      clearInterval(this.timer);
+    },
+    methods: {
+      setBar() {
+        console.log('进入画图~~~~~~~~~~~~~~~~~~~')
+        const  width=document.getElementById(this.canvas).offsetWidth
+        let fontSize=0
+        if(width<600){
+          fontSize=14
+        }else if(width<1200) {
+          fontSize=18
+        }else{
+          fontSize=22
+        }
+        console.log('字体大小')
+        console.log(width)
+        console.log(fontSize)
+        this.xc = this.$echarts.init(document.getElementById(this.charts))
+        if(this.settime!==undefined){
+          this.time=this.settime
+        }
+        if(this.showtooltip!==undefined){ // 判断提示框
+          this.showtTip=this.showtooltip
+        }
+        if(this.csmooth!==undefined){ // 判断平滑线 折线
+          this.csmooth=this.smooth
+        }
+        if(this.showtitle!==undefined){ // 判断标题
+          this.cshowtitle=this.showtitle
+        }
+        if(this.showyname!==undefined){ // 判断是否展示y轴名称
+          this.cshowyname=this.showyname
+        }
+        if(this.showxname!==undefined){ // 判断是否展示x轴名称
+          this.cshowxname=this.showxname
+        }
+        if(this.cyname!==undefined){ // 判断平滑线 折线
+          this.cyname=this.yname
+        }
+        var serieData = []
+        var legend = this.legend
+        for (let i = 0; i < legend.length; i++) {
+          var series= {
+            name: legend[i],
+            type: 'bar',
+            barWidth: '25%',
+            data: this.sdata[i]
+          }
+          serieData.push(series)
+        }
+        this.xc.setOption({
+          title: {
+            text: this.title,
+            left:'center',
+            textStyle:{
+              fontSize:fontSize
+            },
+            show:this.cshowtitle
+          },
+          tooltip: {
+            show:this.showtTip,
+            alwaysShowContent: true,
+            backgroundColor: 'rgba(2, 59, 63, 0.45)',
+            // borderColor :'rgba(13, 109, 180)',
+            borderWidth: 0,
+            hideDelay: 100,
+            textStyle: {
+              fontSize: fontSize
+            },
+            confine: false,
+            formatter: function (params) {
+              var result = ''
+              params.forEach(function (item) {
+                result += item.marker + " " + item.seriesName + " &nbsp;&nbsp;&nbsp; <sapn style='color:#e1e52a;font-weight: bolder'>" + item.value + "</sapn></br>";
+              });
+              return "<div style='text-align: center;height: 1px;font-weight: normal'>" + params[0].axisValue + '</div><br/>' + result
+            },
+            trigger: 'axis',
+            axisPointer: {type: 'line', lineStyle: {width: 0}},
+            extraCssText: 'width: auto;height: auto;'
+          },
+          legend: {
+            // padding:[50,40,0,200], // 上右下左
+            data: this.legend,
+            textStyle:{
+              fontSize:fontSize
+            },
+            left:'20%',
+            top:'10%'
+          },
+          grid: {
+            left: '6%',
+            right: '15%',
+            bottom: '4%',
+            top:'20%',
+            containLabel: true
+          },
+          xAxis: [
+            {
+              name:this.cshowxname===true?this.xname:'',
+              type: 'category',
+              boundaryGap: true,
+
+              axisTick:{
+                show:false
+              },
+              axisLabel:{
+                fontSize:fontSize
+              },
+              nameTextStyle:{
+                fontSize:fontSize,
+                padding:[0,100,15,-12], // 上右下左
+              },
+              data:this.xdata
+            }
+
+          ],
+          yAxis: [
+            {
+
+              name:this.cshowyname===true?this.yname:'',
+              type: 'value',
+              nameTextStyle:{
+                fontSize:fontSize,
+                padding:[0,0,15,60], // 上右下左
+              },
+              axisLabel:{
+                fontSize:fontSize,
+                formatter: function (params) {
+                  if (params > 9999) {
+                    return params / 10000 + "万"
+                  }
+                  else
+                    return params
+                }
+              },
+              axisTick:{
+                show:false
+              },
+
+            }
+          ],
+          series: serieData
+        })
+        // let idx = -1;
+        // var dataLen = this.sdata[0].length
+        // this.timer = setInterval(() => {
+        //   idx = (idx + 1) % dataLen;
+        //   this.xc.dispatchAction({
+        //     type: 'showTip',
+        //     seriesIndex: 1,
+        //     dataIndex: idx
+        //   });
+        //
+        // }, this.time)
+      },
+
+    },
+    watch: {
+      'sdata' () {
+        // 清除定时器
+        clearInterval(this.timer)
+        this.setBar()
+      }
+    },
+    ready () {
+      this.setBar()
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>