system-clients 1.5.0 → 1.5.24-5

package/build.gradle

@@ -1,6 +1,6 @@
-version = '1.5.0'
-
-task release(type:Exec) {
-	workingDir '.'
-	commandLine 'cmd', '/c', 'release.bat ' + version
-}
+version = '1.4.17'
+
+task release(type:Exec) {
+	workingDir '.'
+	commandLine 'cmd', '/c', 'release.bat ' + version
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "1.5.0",
+  "version": "1.5.24-5",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "base64-js": "^1.3.0",
+    "encryptlong": "^3.1.4",
     "js-base64": "^2.4.9",
     "jsencrypt": "^3.0.0-rc.1",
     "less": "^2.7.1",
@@ -75,7 +76,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "^1.15.3",
+    "vue-client": "1.19.228-1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",
@@ -87,7 +88,8 @@
     "webpack": "^1.12.2",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
+    "webpack-merge": "^0.8.3",
+    "crypto-js": "^4.0.0"
   },
   "repository": {
     "type": "git",

package/src/components/Main.vue

@@ -1,14 +1,24 @@
 <template>
   <div>
     <div class='flex-row' id="box" v-el:box v-if="!isManger">
-      <div class="auto" style="position: fixed;right: 30px;top: 20px;">
-        <span>登录人：</span>
-        <label>{{orgpathnames}}</label>
+      <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>Aote</h3>
+          <h3>气电集团</h3>
           <div class="span" style="margin-bottom:20px;flex: 1;">
-            <left-tree :functions='functions.functions' :userid='userid' v-show="treeOrIcon" v-ref:tree></left-tree>
+            <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>
 
@@ -40,7 +50,7 @@
         <!-- <operator-badge></operator-badge> -->
         <div class="span">
           <echarts-box v-if="$refs.mic.tabs.length === 0"></echarts-box>
-          <dynamic :comps='[]' name='main' @tab-changed="tabChange" v-ref:mic v-show="!($refs.mic.tabs.length === 0)"></dynamic>
+          <dynamic :comps='[]' name='main' :selecttab.sync="selecttab" @tab-changed="tabChange" @tabscg="tabcg"  v-ref:mic v-show="!($refs.mic.tabs.length === 0)"></dynamic>
         </div>
       </div>
     </div>
@@ -73,15 +83,18 @@ export default {
     return {
       // 左侧树下部三个小图标
       imgs: {
-        open: '/images/mainicon/treeopen.png',
-        set: '/images/mainicon/treeset.png',
-        out: '/images/mainicon/treeout.png'
+        open: '/images/lefticon/菜单伸缩.png',
+        set: '/images/lefticon/系统设置.png',
+        out: '/images/lefticon/退出系统.png'
       },
       treeOrIcon: false,
       isManger: false,
+      userpane: false,
       show: false,
       orgpathnames: this.$login.f.orgpathnames,
-      date: this.$login.toStandardDateString()
+      date: this.$login.toStandardDateString(),
+      tabs:[],       //已初始化页签数组
+      selecttab:''
 
       // headerHint: true, // 右侧顶部提示信息
       // value: 25645.26,
@@ -133,6 +146,15 @@ export default {
     this.changeShow()
   },
   methods: {
+    isnodo(val){
+      this.selecttab = val
+    },
+    mouseenteruser(){
+      this.userpane=true
+    },
+    mouseleaveuser(){
+      this.userpane=false
+    },
     unfurl () {
       if(this.showsum){
         this.showsum = false
@@ -171,7 +193,11 @@ export default {
       this.$goto('res-main', {userid: this.userid}, 'self')
     },
     tabChange (name) {
+      this.selecttab = name
       this.$refs.tree.changeSelect(name)
+    },
+    tabcg(val){
+      this.tabs = val
     }
   },
   computed: {
@@ -233,6 +259,17 @@ export default {
   .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;
   }
@@ -253,7 +290,7 @@ export default {
     height: 100%;
     // width: 150px;
     /*width: 60px;*/
-    background: #4C637B;
+    background: #4a7cae;
     color: #fff;
 
   }
@@ -266,8 +303,7 @@ export default {
   }
   .tree-flex h3 {
     text-align: center;
-    line-height: 80px;
-    margin: 0px;
+    margin: 1em 0;
   }
 
   .tree-flex-footer {
@@ -365,8 +401,10 @@ export default {
     background-color: rgba(255,255,255,0);
   }
   .tree-flex img{
-    height: 30px;
+    height: 1.2em;
+    width: 1.2em;
     margin-right: 15px;
+    margin-left: 5px;
   }
   .line {
     height: 100%;

package/src/components/equipment/EquipmentManage.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="auto">
+    <div class="form-group">
+      <label class="control-label">终端类型</label>
+      <v-select id="f_charge_type"
+                v-model="model.f_equipment_type"
+                placeholder='终端类型'
+                :value.sync="model.f_equipment_type"
+                :options='equipmentType'
+                close-on-select clear-button>
+      </v-select>
+    </div>
+
+    <div v-if="model.f_equipment_type[0] === 'PC'">
+      <pc-manage></pc-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'POS'">
+      <pos-manage></pos-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PHONE'">
+      <phone-manage></phone-manage>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title: '终端控制',
+    data () {
+      return {
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.f_orgids,
+        userid:this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        equipmentType: this.$appdata.getParam('终端类型'),
+        model: {
+            f_equipment_type: []
+        }
+      }
+    },
+    ready () {
+      console.log('看看终端类型',  this.equipmentType)
+      this.model.f_equipment_type = [this.equipmentType[0].value]
+    },
+    methods: {
+      del (row) {
+          console.log('要删除了', row)
+      },
+
+      getRes (obj) {
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
+      },
+    },
+    computed: {
+
+    }
+  }
+</script>

package/src/components/equipment/PcAdd.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="auto select-overspread">
+    <validator name='v'>
+      <ul class="nav nav-tabs" >
+        <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
+      </ul>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">使用人员</label>
+            <input type="text" class="form-control" v-model="model.f_username" placeholder="使用人员" >
+          </div>
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">所属地址</label>
+            <input type="text" class="form-control" v-model="model.f_mac_outlets" placeholder="所属地址" >
+          </div>
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">mac地址</label>
+            <input type="text" class="form-control" v-model="model.f_mac_number" placeholder="mac地址" >
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group form-input-group">
+            <label class=" col-sm-2 control-label">使用公司</label>
+            <div class="col-sm-2">
+              <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
+            </div>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;height:auto;">
+        <button class="btn btn-success " @click="confirm()"  >确认</button>
+        <button class="btn btn-default " @click="cancel()" >取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+
+
+  export default {
+    data () {
+      return {
+        model: {
+          f_username: '',
+          f_mac_outlets: '',
+          f_mac_number: '',
+          f_equipment_type: 'PC',
+          f_state: '正常'
+        },
+        filialeCodeStr: this.$login.f.f_orgids,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+      }
+    },
+    props: ['data'],
+    watch: {
+      'data' (val) {
+          if (val) {
+            this.edit(val)
+          } else {
+              this.initModel()
+          }
+      }
+    },
+    ready () {
+      console.log('mac信息：', this.data)
+      if (this.data) {
+          this.edit(this.data)
+      }
+    },
+    methods: {
+      confirm () {
+        this.model.f_operator = this.$login.f.name
+        this.model.f_filialeids = this.filialeCodeStr
+        console.log('保存', this.model)
+        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+          this.$dispatch('refresh')
+        }).catch((error) => {
+          this.$dispatch('refresh')
+        })
+      },
+      edit (row) {
+        console.log('修改，，。。', row)
+        this.model.f_username = row.f_username
+        this.model.f_mac_outlets = row.f_mac_outlets
+        this.model.f_mac_number = row.f_mac_number
+        this.model.id = row.id
+        this.filialeCodeStr = row.f_filialeids
+      },
+      initModel () {
+        delete this.model.id
+        this.model.f_username = ''
+        this.model.f_mac_outlets = ''
+        this.model.f_mac_number = ''
+      },
+      cancel () {
+        this.$dispatch('close')
+      },
+      getRes(obj) {
+        this.filialeCodeStr = obj.resids
+      },
+    }
+  }
+</script>

package/src/components/equipment/PcList.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="flex" style="flex:1; ">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-inline" partial>
+          <div class="form-group">
+            <label>使用公司</label>
+            <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>
+          </div>
+
+          <div class="form-group" >
+            <input  type="text" class="form-control" v-model="model.f_username"
+                    condition="f_username like '%{}%'" placeholder="使用人员">
+          </div>
+          <div class="form-group" >
+            <input  type="text" class="form-control" v-model="model.f_mac_outlets"
+                    condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
+          </div>
+          <div class="form-group" >
+            <input  type="text" class="form-control" v-model="model.f_mac_number"
+                    condition="f_mac_number like '%{}%'" placeholder="MAC地址">
+          </div>
+
+          <div class="form-group">
+            <button class="btn btn-success width-80" @click="$parent.$parent.search()" v-el:cx>查询</button>
+          </div>
+          <div class="form-group">
+            <button class="btn btn-success width-80" @click="$parent.$parent.add()" v-el:cx>新增</button>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>使用人员</th>
+            <th>所属地址</th>
+            <th>MAC地址</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body':model="model">
+          <tr>
+            <td style="text-align:center">{{$index+1}}</td>
+            <td style="text-align:center">{{row.f_username}}</td>
+            <td style="text-align:center">{{row.f_mac_outlets}}</td>
+            <td style="text-align:center">{{row.f_mac_number}}</td>
+            <td style="text-align:center">
+              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    title: 'PC',
+    components: {},
+    data () {
+      return {
+        model: new PagedList('rs/sql/equipmentQuery', 20),
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.f_orgids,
+        userid:this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
+      }
+    },
+    ready () {
+      console.log('看看终端类型',  this.equipmentType)
+      this.search()
+    },
+    methods: {
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+
+      selfSearch (args) {
+        args.condition =  `${args.condition} and f_equipment_type = 'PC' and f_state = '正常' and f_filialeids like '${this.filialeCodeStr}%'`
+        this.model.search(args.condition, this.model)
+      },
+      add () {
+        this.$dispatch('add')
+      },
+      del (row) {
+        console.log('要删除了', row)
+        row.f_state = '已删除'
+        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+          this.$dispatch('refresh')
+        }).catch((error) => {
+          this.$dispatch('refresh')
+        })
+      },
+      getRes (obj) {
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
+      },
+    },
+    computed: {
+
+    }
+  }
+</script>

package/src/components/equipment/PcManage.vue

@@ -0,0 +1,58 @@
+<template>
+  <div class="flex-row">
+    <pc-list :row="row" @select-changed="selected"  style="width:auto;" v-ref:list ></pc-list>
+    <div class="flex" style="margin-left: 10px; width: 50%;" v-if="isChange">
+      <pc-add :data="row" v-ref:addbox></pc-add>
+    </div>
+  </div>
+</template>
+<script>
+
+  import PcList from './PcList'
+  import PcAdd from './PcAdd'
+
+  export default {
+    title: 'PC终端管理',
+    components: {
+      PcList, PcAdd
+    },
+    data () {
+      return {
+        isChange: false,
+        row: null
+      }
+    },
+    methods: {
+      selected (obj) {
+        this.isChange = true
+        this.row = obj.val
+      }
+    },
+    events: {
+      'search' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.$refs.paged.$refs.cri.search()
+      },
+      'refresh' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.search()
+      },
+      'error' (name, row, res) {
+        this.isChange = false
+        this.row = null
+      },
+      'close' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.search()
+      },
+      'add' () {
+        this.row = null
+        this.isChange = true
+        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
+      }
+    }
+  }
+</script>

package/src/components/equipment/PhoneAdd.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="auto select-overspread">
+    <validator name='v'>
+      <ul class="nav nav-tabs" >
+        <li role="presentation" class="active"><a href="#">Phone端设备号</a></li>
+      </ul>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">使用人员</label>
+            <input type="text" class="form-control" v-model="model.f_username" placeholder="使用人员" >
+          </div>
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">设备号</label>
+            <input type="text" class="form-control" v-model="model.f_terminal_number" placeholder="设备号" >
+          </div>
+          <div class="col-sm-4 form-group form-input-group">
+            <label class=" col-sm-2 control-label">使用公司</label>
+            <div class="col-sm-2">
+              <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
+            </div>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;height:auto;">
+        <button class="btn btn-success " @click="confirm()"  >确认</button>
+        <button class="btn btn-default " @click="cancel()" >取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+
+
+  export default {
+    data () {
+      return {
+        model: {
+          f_username: '',
+          f_terminal_number: '',
+          f_equipment_type: 'PHONE',
+          f_state: '正常'
+        },
+        filialeCodeStr: this.$login.f.f_orgids,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+      }
+    },
+    props: ['data'],
+    watch: {
+      'data' (val) {
+        if (val) {
+          this.edit(val)
+        } else {
+          this.initModel()
+        }
+      }
+    },
+    ready () {
+      console.log('mac信息：', this.data)
+      if (this.data) {
+        this.edit(this.data)
+      }
+    },
+    methods: {
+      confirm () {
+        this.model.f_operator = this.$login.f.name
+        this.model.f_filialeids = this.filialeCodeStr
+        console.log('保存', this.model)
+        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+          this.$dispatch('refresh')
+        }).catch(() => {
+          this.$dispatch('refresh')
+        })
+      },
+      edit (row) {
+        console.log('修改，，。。', row)
+        this.model.f_username = row.f_username
+        this.model.f_terminal_number = row.f_terminal_number
+        this.model.id = row.id
+        this.filialeCodeStr = row.f_filialeids
+      },
+      initModel () {
+        delete this.model.id
+        this.model.f_username = ''
+        this.model.f_terminal_number = ''
+      },
+      cancel () {
+        this.$dispatch('close')
+      },
+      getRes(obj) {
+        this.filialeCodeStr = obj.resids
+      },
+    }
+  }
+</script>