system-clients 3.1.87-aode → 3.1.87-xianyang

package/build/webpack.base.conf.js

@@ -38,10 +38,7 @@ module.exports = {
           `${projectRoot}\\test`,
           `${projectRoot}\\node_modules\\vue-client\\src`,
           `${projectRoot}\\node_modules\\vue-strap\\src`
-        ],
-        options: {
-          presets: ['es2015']
-        }
+        ]
       },
       {
         test: /\.json$/,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.1.87-aode",
+  "version": "3.1.87-xianyang",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -19,6 +19,7 @@
   "dependencies": {
     "base64-js": "^1.3.0",
     "js-base64": "^2.4.9",
+    "jsencrypt": "^3.0.0-rc.1",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "src": "^1.1.2",
@@ -85,7 +86,6 @@
     "vue-style-loader": "^1.0.0",
     "vue-validator": "^3.0.0-alpha.2",
     "webpack": "^1.12.2",
-    "jsencrypt": "3.0.0-rc.1",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3"

package/src/components/Main.vue

@@ -57,14 +57,12 @@
     <!--            </div>-->
     <!--    </div>-->
     <div class='flex-row  system-main' id="box" v-el:box v-if="!isManger">
-
       <div class="auto "  :class="{'login-operator1':$refs.mic.tabs.length === 0,'login-operator':$refs.mic.tabs.length != 0}">
-          <span class="glyphicon glyphicon-asterisk" style="color:#a1d0f5"></span>
-          <span>组织编码:</span>
-         <label style="margin-right:14px;">{{$login.f.number}}</label>
-          <span class="glyphicon glyphicon-user"  style="color:#a1d0f5"></span>
-          <span>登录人：</span>
-          <label>{{orgpathnames}}</label>
+            <span>
+               <img
+                 src="../assets/people.png" height="15" width="15">
+              登录人：</span>
+        <label>{{orgpathnames}}</label>
       </div>
       <div class="system-left tree-flex" :class="{'tree-flex-icon': !treeOrIcon}" id="top" v-el:top >
         <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}"  >
@@ -87,7 +85,7 @@
                 <!-- <li>{{name}}</li> -->
                 <li>{{date}}</li>
                 <li @click="show=true">修改密码</li>
-                <li @click="AddChangeMsgShow=true">系统版本:1.0.0</li>
+                <li @click="AddChangeMsgShow=true">系统版本:{{$login.version?$login.version:'1.0.0'}}</li>
               </ul>
 
             </dropdown>

package/src/components/equipment/EquipmentManage.vue

@@ -1,65 +1,68 @@
-<template>
-  <div class="flex">
-    <div class="auto">
-      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
-        <div class="row">
-          <div class="col-sm-2 form-group">
-            <label class="font_normal_body">终端类型</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>
-      </div>
-    </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.orgid,
-        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>
+<template>
+  <div class="flex">
+    <div class="auto">
+      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
+        <div class="row">
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body">终端类型</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>
+      </div>
+    </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 v-if="model.f_equipment_type[0] === '圈存机'">
+      <qc-manage></qc-manage>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title: '终端控制',
+    data () {
+      return {
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.orgid,
+        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

@@ -1,23 +1,23 @@
 <template>
-  <div class="auto select-overspread">
+  <div class="row 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="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">使用人员</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">所属地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_outlets" placeholder="所属地址" >
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">mac地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址" >
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">使用公司</label>
 
               <res-select restype='organization'

package/src/components/equipment/PcList.vue

@@ -4,7 +4,7 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-          <div class="col-sm-3">
+          <div class="col-sm-3 form-group">
             <label class="font_normal_body">使用公司</label>
             <res-select restype='organization'
                         is-mul="false"
@@ -13,12 +13,12 @@
             </res-select>
           </div>
 
-          <div class="col-sm-3" >
+          <div class="col-sm-3 form-group" >
             <label class="font_normal_body">使用人员</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
                     condition="f_username like '%{}%'" placeholder="使用人员">
           </div>
-          <div class="col-sm-3" >
+          <div class="col-sm-3 form-group" >
             <label class="font_normal_body">所属地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_outlets"
                     condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
@@ -31,7 +31,7 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-          <div class="col-sm-3" >
+          <div class="col-sm-3 form-group" >
             <label class="font_normal_body">MAC地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_number"
                     condition="f_mac_number like '%{}%'" placeholder="MAC地址">
@@ -58,7 +58,7 @@
             <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>
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>

package/src/components/equipment/PhoneAdd.vue

@@ -1,20 +1,20 @@
 <template>
-  <div class="auto select-overspread">
+  <div class="row 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="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">使用人员</label>
             <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">设备号</label>
             <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
           </div>
-          <div class="col-sm-6">
+          <div class="col-sm-6 form-group">
             <label class="font_normal_body">使用公司</label>
               <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
           </div>

package/src/components/equipment/PhoneList.vue

@@ -4,17 +4,17 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-          <div class="col-sm-3">
+          <div class="col-sm-3 form-group">
             <label class="font_normal_body">使用公司</label>
             <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>
           </div>
 
-          <div class="col-sm-3" >
+          <div class="col-sm-3 form-group" >
             <label class="font_normal_body">使用人员</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
                     condition="f_username like '%{}%'" placeholder="使用人员">
           </div>
-          <div class="col-sm-3" >
+          <div class="col-sm-3 form-group" >
             <label class="font_normal_body">设备号</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
                     condition="f_terminal_number like '%{}%'" placeholder="设备号">
@@ -41,7 +41,7 @@
             <td style="text-align:center">{{row.f_username}}</td>
             <td style="text-align:center">{{row.f_terminal_number}}</td>
             <td style="text-align:center">
-              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>