system-clients 1.6.26 → 1.6.27-yc

package/build/webpack.dev.conf.js

@@ -17,6 +17,9 @@ module.exports = merge(baseConfig, {
     publicPath: '/'
   },
   plugins: [
+    new webpack.DefinePlugin({
+      'process.env': require('../config/dev.env')
+    }),
     // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
     new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),

package/build/webpack.example.conf.js

@@ -35,6 +35,9 @@ module.exports = merge(baseConfig, {
     publicPath: '/'
   },
   plugins: [
+    new webpack.DefinePlugin({
+      'process.env': require('../config/dev.env')
+    }),
     // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
     new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),

package/build/webpack.prod.conf.js

@@ -29,9 +29,7 @@ module.exports = merge(baseConfig, {
   plugins: [
     // http://vuejs.github.io/vue-loader/workflow/production.html
     new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"production"'
-      }
+      'process.env': require('../config/prod.env')
     }),
     new webpack.optimize.UglifyJsPlugin({
       compress: {

package/config/prod.env.js

@@ -1,3 +1,5 @@
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  // v3: RSA + /rs/logic/getLogin；v4: 父项目统一认证 /api/af-auth/login
+  LOGIN_MODE: '"' + (process.env.LOGIN_MODE || 'v3') + '"'
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "1.6.26",
+  "version": "1.6.27-yc",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -9,9 +9,12 @@
   },
   "scripts": {
     "example": "node build/example-server.js",
+    "example:v4": "cross-env LOGIN_MODE=v4 node build/example-server.js",
     "dev": "node build/dev-server.js",
+    "dev:v4": "cross-env LOGIN_MODE=v4 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",
+    "build:v4": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production LOGIN_MODE=v4 webpack --progress --hide-modules --config build/webpack.prod.conf.js",
     "e2e": "node test/e2e/runner.js",
     "unit": "karma start test/unit/karma.conf.js",
     "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
@@ -76,7 +79,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "^1.18.5",
+    "vue-client": "1.19.5-yc",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/Main.vue

@@ -185,8 +185,8 @@
         // }
         this.treeOrIcon = !this.treeOrIcon
         if (this.treeOrIcon) {
-          this.$els.top.style.width = 160 + "px"
-          this.$els.bottom.style.width = this.$els.box.clientWidth - 160 + "px"
+          this.$els.top.style.width = 200 + "px"
+          this.$els.bottom.style.width = this.$els.box.clientWidth - 200 + "px"
         }else {
           this.$els.top.style.width = 50 + "px"
           this.$els.bottom.style.width = this.$els.box.clientWidth - 50 + "px"

package/src/components/Main.vue.bak

@@ -0,0 +1,459 @@
+<template>
+  <div>
+    <div class='flex-row aaa' id="box" v-el:box v-if="!isManger">
+      <div class="auto" style="position: fixed;right: 30px;top: 20px;color: #333">
+        <span>
+           <img
+             src="../assets/people.png" height="15" width="15">
+          登录人：</span>
+        <label>{{$login.f.name}}</label>
+        <img
+          src="../assets/arrow.png" height="6" width="10"
+          @mouseenter="mouseenteruser()"  @mouseleave="mouseleaveuser()"
+        >
+      </div>
+      <div  v-if="userpane" class="auto userpanel">
+        <span>{{orgpathnames}}</span>
+      </div>
+      <div class="flex tree-flex" :class="{'tree-flex-icon': !treeOrIcon}" id="top" v-el:top >
+        <h3>{{systemname}}</h3>
+        <div class="span" style="margin-bottom:20px;flex: 1;">
+          <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" v-show="treeOrIcon" :tabs="tabs" v-ref:tree></left-tree>
+          <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>
+        </div>
+
+        <div class="tree-flex-footer">
+          <a @click="changeShow()"><img :src="imgs.open" alt=""><span v-if="treeOrIcon">菜单伸缩</span></a>
+          <!-- <a><img src="../../../static/treeset.png" alt="">系统设置</a> -->
+          <dropdown class="auto">
+            <button type="button" data-toggle="dropdown">
+              <img :src="imgs.set" alt=""><span v-if="treeOrIcon">系统设置</span>
+            </button>
+            <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-up">
+              <li>系统信息及设置</li>
+              <!-- <li>{{name}}</li> -->
+              <li>{{date}}</li>
+              <li @click="show=true">修改密码</li>
+              <li @click="AddChangeMsgShow=true">系统版本:1.0.0</li>
+            </ul>
+
+          </dropdown>
+          <a href="index.html" onclick="return confirm('您确定要退出系统吗？');">
+            <img :src="imgs.out" alt="" ><span v-if="treeOrIcon">退出系统</span>
+          </a>
+        </div>
+      </div>
+
+      <!-- <div class="line" id="line" v-show="treeOrIcon" v-el:line></div> -->
+
+      <div class="flex right-bg" id="bottom" v-el:bottom>
+        <!-- <operator-badge></operator-badge> -->
+        <div class="span">
+          <echarts-box v-if="$refs.mic.tabs.length === 0"></echarts-box>
+          <dynamic :comps='[]' name='main' :selecttab="selecttab" @tab-changed="tabChange" @tabscg="tabcg" v-ref:mic v-show="!($refs.mic.tabs.length === 0)"></dynamic>
+        </div>
+      </div>
+    </div>
+    <div v-show="isManger">
+      <route  v-ref:route></route>
+    </div>
+
+    <!-- 变更录入 模态框 -->
+    <add-changemsg :show="AddChangeMsgShow" v-on:toggle = "AddChangeMsgShow = false"></add-changemsg>
+    <!-- 修改密码组件 -->
+    <modify-pw :show.sync="show" v-if="show"><modify-pw>
+      <!-- 修改密码模态框 -->
+  </div>
+</template>
+
+<script>
+  import vue from 'vue'
+  import co from 'co'
+
+  window.onunload = () => {
+    vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
+  }
+  window.onbeforeunload = () => {
+    vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
+  }
+  export default {
+    title: '主界面',
+    props: ['functions', 'userid'],
+    data () {
+      return {
+        // 左侧树下部三个小图标
+        imgs: {
+          open: '/images/mainicon/treeopen.png',
+          set: '/images/mainicon/treeset.png',
+          out: '/images/mainicon/treeout.png'
+        },
+        treeOrIcon: false,
+        userpane: false,
+        isManger: false,
+        show: false,
+        orgpathnames: this.$login.f.orgpathnames,
+        systemname: '客服系统',
+        date: this.$login.toStandardDateString(),
+        tabs:[],       //已初始化页签数组
+        selecttab:''
+
+        // headerHint: true, // 右侧顶部提示信息
+        // value: 25645.26,
+        // AddChangeMsgShow: false,
+        // showsum: false
+      }
+    },
+    ready () {
+      let component = this.$login.getUrlCompileParames('component')
+      if (component) {
+        this.isManger = true
+        this.$refs.route.init(component, {data: this.functions.functions})
+      }
+      if(this.$login.f.password == '1'){
+        this.$showMessage('本地登录系统为此账户的初始密码，请确认修改密码！！！', ['confirm', 'cancel']).then((res) => {
+          if(res == 'confirm')
+            this.show = true
+        })
+      }
+      console.log("系统名称",this.$appdata.getSingleValue("系统名称"))
+      this.systemname = this.$appdata.getSingleValue("系统名称")? this.$appdata.getSingleValue("系统名称"):'客服系统'
+      //   let oBox = this.getElement("box")
+      // 	let	oTop = this.getElement("top")
+      // 	let	oBottom = this.getElement("bottom")
+      // 	let oLine = this.getElement("line")
+      //   let that = this
+      // 			oLine.onmousedown = function(e) {
+      // 				let disX = (e || event).clientX
+      // 				oLine.left = oLine.offsetLeft
+      // 				document.onmousemove = function(e) {
+      // 					let iT = oLine.left + ((e || event).clientX - disX)
+      //           var e = e || window.event
+      // 					let tarnameb = e.target || e.srcElement
+      // 					let maxT = oBox.clientWight - oLine.offsetWidth
+      // 					oLine.style.margin = 0
+      // 					iT < 0 && (iT = 0)
+      // 					iT > maxT && (iT = maxT)
+      // 					oLine.style.left = oTop.style.width = iT + "px"
+      // 					oBottom.style.width = oBox.clientWidth - iT + "px"
+      //           that.$set('treeWidth', iT)
+      // 					return false
+      // 				}
+      // 				document.onmouseup = function() {
+      // 					document.onmousemove = null
+      // 					document.onmouseup = null
+      // 					oLine.releaseCapture && oLine.releaseCapture()
+      // 				}
+      // 				oLine.setCapture && oLine.setCapture()
+      // 				return false
+      // 			}
+      this.changeShow()
+    },
+    methods: {
+      isnodo(val){
+        this.selecttab = val
+      },
+      mouseenteruser(){
+        this.userpane=true
+      },
+      mouseleaveuser(){
+        this.userpane=false
+      },
+      unfurl () {
+        if(this.showsum){
+          this.showsum = false
+        } else {
+          this.showsum = true
+        }
+      },
+      // getElement(id) {
+      //   return document.getElementById(id)
+      // },
+      changeShow () {
+        //   this.treeOrIcon = !this.treeOrIcon
+        //   let oBox = this.getElement("box")
+        // 	let	oTop = this.getElement("top")
+        // 	let	oBottom = this.getElement("bottom")
+        // 	let oLine = this.getElement("line")
+        //   if (this.treeOrIcon) {
+        //     // oLine.style.left = oTop.style.width = 300 + "px"
+        //     oTop.style.width = 150 + "px"
+        //     oBottom.style.width = oBox.clientWidth - 150 + "px"
+        //   }else {
+        //     oLine.style.left = oTop.style.width = 50 + "px"
+        //     oBottom.style.width = oBox.clientWidth - 50 + "px"
+        //   }
+        // }
+        this.treeOrIcon = !this.treeOrIcon
+        if (this.treeOrIcon) {
+          this.$els.top.style.width = 200 + "px"
+          this.$els.bottom.style.width = this.$els.box.clientWidth - 200 + "px"
+        }else {
+          this.$els.top.style.width = 50 + "px"
+          this.$els.bottom.style.width = this.$els.box.clientWidth - 50 + "px"
+        }
+      },
+      changeMain(userid) {
+        this.$goto('res-main', {userid: this.userid}, 'self')
+      },
+      tabChange (name) {
+        this.$refs.tree.changeSelect(name)
+      },
+      tabcg(val){
+        this.tabs = val
+      }
+    },
+    computed: {
+      nowDate () {
+        return this.$login.getNowDate()
+      }
+    }
+  }
+</script>
+<style lang="less">
+  /* 组件内通用样式 */
+  .select-error {
+    button {
+      border-bottom: 1px solid #a94442!important;
+    }
+  }
+  // input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
+  //       -webkit-appearance:textfield;
+  // }
+  /* 表单输入框组 */
+  .form-input-group {
+    display: flex;
+
+    label {
+      width: 100px;
+      text-align: right;
+      + * {
+        flex: 1;
+      }
+    }
+  }
+  // 日期组件在表单中沾满
+  .form-horizontal .datepicker {
+    width: 100%;
+  }
+  // 下拉选择框占据剩余全部空间
+  .select-overspread {
+    .form-group {
+      // margin: 0px 5px 10px 0px;
+      .form-control {
+        margin-right: 0px;
+      }
+    }
+    .btn-group, .btn-group-vertical {
+      width: 100%;
+      // padding-right: 5px;
+      button {
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+    }
+    .dropdown-menu {
+      width: 100%
+    }
+  }
+  // 需要特定宽度的的样式
+  .width-60 {
+    width: 60px;
+  }
+  .userpanel {
+    font-weight: 300;
+    color: #333;
+    position: fixed;
+    right: 30px;
+    top: 45px;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 4px 10px 4px 10px;
+    border-radius:2px;
+  }
+  .width-80 {
+    width: 80px;
+  }
+  .width-100 {
+    width: 100px;
+  }
+
+
+
+  /*右侧区域的背景*/
+  .right-bg {
+    width: 100%;
+    flex: 1;
+    padding: 10px 25px;
+    color: #304A66;
+  }
+  .tree-flex {
+    height: 100%;
+    // width: 150px;
+    /*width: 60px;*/
+    background: #4a7cae;
+    color: #fff;
+
+  }
+  .tree-flex-icon {
+    width: 50px;
+    /*transition: 0.5s;*/
+    > .span {
+      overflow-x: visible;
+    }
+  }
+  .tree-flex h3 {
+    text-align: center;
+    line-height: 80px;
+    margin: 0px;
+  }
+
+  .tree-flex-footer {
+    height: 150px;
+    display: flex;
+    flex-direction:column;
+    color: #fff;
+  }
+  .tree-flex-footer a,.tree-flex-footer button{
+    flex: 1;
+    padding: 8px 5px;
+    font-size: 1.2em;
+    border-top: 1px solid #697D93;
+    text-decoration: none;
+    color: #fff;
+    cursor: pointer;
+  }
+  .tree-flex-footer button {
+    height: auto;
+    width: 100%;
+    border-radius: 0px;
+    background-color: rgba(255,255,255,0);
+    border: none;
+    border-top: 1px solid #697D93;
+    text-align: left;
+  }
+  .tree-flex-footer button:hover{
+    outline: none;
+    background-color: rgba(255,255,255,0.2);
+  }
+  .tree-flex-footer button:focus {
+    outline: none;
+    background-color: rgba(255,255,255,0.5);
+  }
+  .tree-flex-footer a:hover {
+    color: #FFF;
+    background-color: rgba(255,255,255,0.2);
+  }
+  .tree-flex  .btn-group {
+    height: 50px!important;
+  }
+
+  .tree-flex .dropdown-menu {
+    /* 控制显示列表的样式 */
+    background: #4C637B;
+    border-radius: 0px;
+    color: #fff;
+    width: auto;
+    margin: 0px;
+    padding: 0px;
+  }
+  .tree-flex .dropdown-menu-up {
+    /* bottom，top控制上下，left和right控制左右*/
+    left: 100%!important;
+    top: auto!important;
+    bottom: 0;
+  }
+  .tree-flex .dropdown-menu-down {
+    /* bottom，top控制上下，left和right控制左右*/
+    left: 100%!important;
+    top: 0!important;
+  }
+  .tree-flex .dropdown-menu li{
+    text-align: center;
+    line-height: 50px;
+    border-bottom: 1px solid #697D93;
+    font-size: 1.2em;
+    width: auto;
+    white-space: nowrap;
+    cursor: default;
+
+  }
+  .tree-flex .dropdown-menu li + li {
+    text-align: left;
+    border: 0;
+    line-height: 40px;
+    padding-left: 15px;
+    padding-right: 15px;
+    font-size: 1em;
+    cursor: pointer;
+  }
+  .tree-flex .dropdown-menu li + li:hover {
+    background-color: rgba(255,255,255,0.2);
+  }
+  .tree-flex .dropdown-menu li a {
+    border: none;
+    color: #fff;
+    height: 40px;
+    line-height: 40px;
+    font-size: 1em;
+    padding: 0px;
+  }
+  .tree-flex .dropdown-menu li a:hover {
+    color: #fff;
+    background-color: rgba(255,255,255,0);
+  }
+  .tree-flex img{
+    height: 30px;
+    margin-right: 15px;
+  }
+  .line {
+    height: 100%;
+    width: 5px;
+    background: #4C637B;
+    cursor: e-resize;
+  }
+  /*为树（tree）组件写的样式*/
+  .tree-img {
+    font-size: 1.2em;
+  }
+
+  /*将较长信息截断显示，鼠标悬停显示全部信息*/
+  .cutout50 {
+    max-width: 50px;
+    overflow:hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  /* 滚动条样式 */
+  /*---滚动条默认显示样式--*/
+  ::-webkit-scrollbar-thumb{
+    //  display: none;
+    background-color:rgba(0,0,0,0.2);
+    height:50px;
+    outline-offset:-2px;
+    /*outline:2px solid #fff;*/
+    -webkit-border-radius:4px;
+    /*border: 2px solid #fff;*/
+  }
+
+  /*---鼠标点击滚动条显示样式--*/
+  ::-webkit-scrollbar-thumb:hover{
+    //  display: inherit;
+    background-color:rgba(0,0,0,0.4);
+    height:50px;
+    -webkit-border-radius:4px;
+  }
+  /*---滚动条大小--*/
+  ::-webkit-scrollbar{
+    width:8px;
+    height:8px;
+  }
+  /*---滚动框背景样式--*/
+  ::-webkit-scrollbar-track-piece{
+    /* 全透明，不显示 */
+    background-color:rgba(255,255,255,0);
+    -webkit-border-radius:0;
+  }
+</style>

package/src/components/echarts/BankManager.vue

@@ -0,0 +1,148 @@
+<template lang="html">
+  <div id="charts">
+    <div id="bm" :style="{width:'100%',height:'100%'}"></div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../Util'
+import co from 'co'
+import echarts from 'echarts'
+import {HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST', 'rs/sql/sellinggasvalue',
+  {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_bank_name',f_orgstr: self.f_orgstr}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    let arrparams = []
+    let numdata = []
+    let gasdata = []
+    let pricedata = []
+    for (var i = 0; i < res.data.length; i++) {
+        arrparams[i] = res.data[i].name
+        numdata[i] = res.data[i].num_value
+        gasdata[i] = res.data[i].gas_value
+        pricedata[i] = res.data[i].money_value
+    }
+    self.set(arrparams,numdata,gasdata,pricedata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    f_orgstr: {
+      type: String,
+      default: ''
+    }
+},
+ data () {
+   title: '银行管理'
+   return {
+     texttile: '',
+     xc: ''
+   }
+ },
+ methods: {
+   set (arrparams,numdata,gasdata,pricedata) {
+     this.xc = echarts.init(document.getElementById('bm'))
+     this.xc.setOption({
+       title : {
+         text: '银行代售气量金额散列图',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+       tooltip : {
+         trigger: 'axis'
+       },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['数量','气量','金额']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'数量',
+          type:'bar',
+          data:numdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'气量',
+          type:'bar',
+          data:gasdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'金额',
+          type:'bar',
+          data:pricedata,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        }
+      ]
+     })
+   },
+   searchdata () {
+     let getGen =getData(this)
+     co(getGen)
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+ watch: {
+   'startdate' (val) {
+     this.searchdata()
+   },
+   'enddate' (val) {
+     this.searchdata()
+   },
+   'f_orgstr' (val) {
+     this.searchdata()
+   }
+ }
+
+}
+</script>