system-clients 3.1.89-9 → 3.1.89-xianyang

package/src/components/equipment/QCManage.vue

@@ -0,0 +1,150 @@
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <qc-list :row="row" @dblclick="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" :isshowless="isChange" v-ref:list ></qc-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 40%;" v-if="isChange">
+      <qc-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-ref:addbox></qc-add>
+    </div>
+
+    <modal v-if="batchPos" :show.sync="batchPos" backdrop="false" >
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close"><span>&times;</span></button>
+        <h4 class="modal-title">批量操作</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <form class="form-horizontal">
+          <div class="row">
+            <div>
+              <h4>注意事项</h4>
+              <p>1.如果需要对POS设备进行升级，批量选择的POS设备包含非正常状态，则只会对状态为正常的设备进行升级。</p>
+              <p>2.如果POS设备处于停用状态，则可以进行启用操作。如果设备处于启用状态，则可以进行停用和升级操作。</p>
+              <p>3.批量操作可能耗时较长，请刷新列表查看结果。</p>
+            </div>
+          </div>
+        </form>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="button_search button_spacing" @click="batchRoot('2')">批量升级</button>
+        <button type="button" class="button_search button_spacing" @click="batchRoot('1')">批量启用</button>
+        <button type="button" class="button_search button_spacing" @click="batchRoot('0')">批量停用</button>
+        <button type="button" class="button_clear button_spacing" @click='close'>退出</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+
+  import QcList from './QCList'
+  import QcAdd from './QCAdd'
+
+  export default {
+    title: 'POS终端管理',
+    components: {
+      QcList, QcAdd
+    },
+    data () {
+      return {
+        isChange: false,
+        row: null,
+        infoadd: true,  // 判断是否显示 升级 等按钮（true/false）
+        batchPos: false,
+        f_filialeids: ''
+      }
+    },
+    methods: {
+      // 批量操作
+      async batchRoot(val){
+        let arrs = []
+        let alertMessage=''
+        let selPos = this.$refs.list.selPos
+        if (val==='0'){
+          alertMessage='停用'
+          for (const tmp of selPos) {
+            if (tmp.f_state==='正常') arrs.push(tmp)
+          }
+        } else if (val==='1'){
+          alertMessage='启用'
+          for (const tmp of selPos) {
+            if (tmp.f_state==='停用') arrs.push(tmp)
+          }
+        } else if(val==='2'){
+          alertMessage='升级'
+          for (const tmp of selPos) {
+            if (tmp.f_state==='正常') arrs.push(tmp)
+          }
+        } else {
+          this.showAlert('出现异常，请重新进操作')
+          return
+        }
+
+        await this.$resetpost('rs/logic/batchPos',{data: {tasks: arrs, taskState: val}}, {rejectMsg: null, resolveMsg: null})
+
+        // 需要提示
+        this.$showAlert(`已经开始批量${alertMessage}，选择${selPos.length}，其中${arrs.length}台可以正常${alertMessage}，具体请留意设备情况，并刷新列表查看执行结果！`)
+        this.isChange = false
+        this.close()
+      },
+      close(){
+        this.batchPos = false
+      },
+      selected (obj, idx) {
+        console.log(obj)
+        if (!(obj instanceof MouseEvent)) {
+          if (this.$refs.list.selPos.length > 0){
+            this.$showMessage(`系统检测到您进行了多选，是否进行批量操作？`, ['confirm', 'cancel']).then((res) => {
+              if (res==='confirm'){
+                this.batchPos = true
+              } else {
+                this.isChange = true
+                this.infoadd = true
+                this.row = obj
+              }
+            })
+
+          }else {
+            this.isChange = true
+            this.infoadd = true
+            this.row = obj
+          }
+        } else {
+          this.$showAlert('如需新增，请点击增加按钮！', 'info', 1000)
+        }
+      }
+    },
+    events: {
+      'search' () {
+        this.infoadd=true
+        this.isChange = false
+        this.row = null
+        this.$refs.list.$refs.paged.$refs.cri.search()
+      },
+      'research' () {
+        console.log('重新查询')
+        this.isChange = false
+        this.row = null
+      },
+      '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' (val) {
+        this.f_filialeids = val
+        this.infoadd=false
+        this.row = null
+        this.isChange = true
+        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
+      }
+    }
+  }
+</script>

package/src/components/parammanage/ParamManage.vue

@@ -1,9 +1,9 @@
 <template>
-  <div id="unit" class="flex-row" :style="{width: messlist==='mess' ? '50%' : '100%'}">
+  <div id="unit" class="flex-row">
     <div class="binary-left">
       <param-page></param-page>
     </div>
-    <div class="binary-right" :style="{width: messlist==='mess' ? '50%' : '60%'}">
+    <div class="binary-right">
       <single-page></single-page>
     </div>
   </div>

package/src/components/parammanage/ParamPage.vue

@@ -39,9 +39,9 @@
           <td style="text-align:center">{{row.name}}</td>
           <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
           <td class="flex-around">
-            <button type="button" name="button" class="button_search button_spacing width-60"
+            <button type="button" name="button" class="btn btn-link"
                     @click.stop="$parent.$parent.modifyParam(row, 't_parameter')">修改</button>
-            <button type="button" name="button" class="btn btn-danger"
+            <button type="button" name="button" class="btn btn-link"
                     @click.stop="$parent.$parent.deleteParam(row, 't_parameter')">删除</button>
           </td>
         </template>
@@ -65,8 +65,8 @@
           <td style="text-align:center">{{$index+1}}</td>
           <td style="text-align:center">{{row.name}}</td>
           <td class="flex-around">
-            <button type="button" name="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
-            <button type="button" name="button" class="btn btn-danger" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
+            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
+            <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
           </td>
         </template>
       </data-grid>

package/src/components/parammanage/SinglePage.vue

@@ -43,9 +43,9 @@
             <td style="text-align:center">{{row.value}}</td>
             <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
             <td class="flex-around">
-              <button type="button" name="button" class="button_search button_spacing width-60"
+              <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.modifyParam(row)">修改</button>
-              <button type="button" name="button" class="btn btn-danger"
+              <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.deleteItem(row)">删除</button>
             </td>
           </template>

package/src/components/server/Login.vue

@@ -8,11 +8,6 @@
         <span>联系我们</span>
       </div>
     </div>
-    <div class="logoew" v-if="logoandroid" >
-      <div v-if="logoandroid" class="imglogo"></div>
-        <p class="logocontent">燃气客服系统Android版</p>
-        <p  class="logofooter">(仅浏览器扫描)</p>
-    </div>
     <!--输入框-->
     <div class="loginmain">
       <!-- <img src="../../../static/login_title1.png" alt="图片加载未完成" class="img-responsive" style="margin: 0 auto; padding-top: 150px;" /> -->
@@ -21,7 +16,7 @@
       </div>
       <div class="loginmain-right">
 
-        <p @click="theme()" style="white-space: nowrap">{{config.title}}</p>
+        <p @click="theme()" style="white-space: nowrap">咸阳天然气营收系统</p>
 
         <form v-show="!login">
           <!--                    <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
@@ -34,16 +29,16 @@
             <input type="password" placeholder="密码" style="display: inline;background-color: darkgray;" v-model="model.password"
                    @keyup.enter="confirm('key')"/>
           </div>
-          <div class="login-input-1">
-            <img src="../../../static/newStyle/login-check.png"/>
-            <input v-if="$login.Verification" class="login-check"  type="text" placeholder="请输入验证码"
-                   v-model="picLyanzhengma" @keyup.enter="confirm('key')"/>
-          </div>
-          <div class="login-input-2" >
-            <input v-if="$login.Verification" class="login-check-1" style="display: inline;background-color:#eeeeee !important;"
-                   type="button" @click="createCode" v-model="checkCode"/>
-          </div>
-          <div class="login-bt">
+<!--          <div class="login-input-1">-->
+<!--            <img src="../../../static/newStyle/login-check.png"/>-->
+<!--            <input v-if="$login.Verification" class="login-check"  type="text" placeholder="请输入验证码"-->
+<!--                   v-model="picLyanzhengma" @keyup.enter="confirm('key')"/>-->
+<!--          </div>-->
+<!--          <div class="login-input-2" >-->
+<!--            <input v-if="$login.Verification" class="login-check-1" style="display: inline;background-color:#eeeeee !important;"-->
+<!--                   type="button" @click="createCode" v-model="checkCode"/>-->
+<!--          </div>-->
+          <div class="login-bt" style="transform: translate(0,-55px)">
             <button type="button" id="login-button" class="login-button" @click.prevent="confirm('click')">登录</button>
           </div>
           <!--                    <input type="password" placeholder="密码" v-model="model.password" class="psicon"-->
@@ -92,9 +87,6 @@
         <button class="button_clear" @click="depPromptCancel">取消</button>
       </footer>
     </modal>
-
-    <!-- 修改密码组件 -->
-    <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow"></modify-pw>
   </div>
 
 </template>
@@ -102,68 +94,50 @@
 <script>
   import co from 'co'
   import $ from 'jquery'
-  import Vue from 'vue'
 
   let saveGen = function *(self) {
     try {
       yield self.$login.login(self.model.ename, self.model.password)
       yield self.$appdata.load()
 
-      if (Vue.$heatCompatibility) {
-        try {
-          yield self.$loginHeat.login(self.model.ename, self.model.password)
-          yield self.$appdataHeat.load()
-        } catch (e) {
-          console.log('热力系统登陆失败!')
-        }
-      }
-
       yield self.$getConfig(self, 'Login')
       console.log('登录配置', self.config)
-      if (self.config.isMac) {
-        // 获取该登录人分公司下的mac配置
-        let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
+      if (self.$login.r.includes('验证站点') && self.$login.f.name!='超级管理员') {
+        // 获取本地mac地址
+        let getLocalMac = yield self.$resetpost('http://127.0.0.1:8003/loadmac', {
           resolveMsg: null,
           rejectMsg: null
         }).catch(() => {
-          throw new Error('获取mac配置失败')
+          throw new Error('获取本地mac配置失败')
         })
-        console.log('MAC地址信息', getMacs)
-        // 获取本地mac地址
-        let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
+        console.log('本地MAC地址信息', getLocalMac)
+        // 获取该登录人分公司下的mac配置
+        let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_mac_number = '${getLocalMac.data}' and f_state ='正常'`}}, {
           resolveMsg: null,
           rejectMsg: null
         }).catch(() => {
-          throw new Error('获取本地mac配置失败')
+          throw new Error('获取mac配置失败')
         })
-        console.log('本地MAC地址信息', getLocalMac)
+        console.log('MAC地址信息', getMacs)
         // 对Mac地址进行匹配
         let macValidate = false
-        for (let i = 0; i < getLocalMac.data.mac.length; i++) {
-          for (let j = 0; j < getMacs.data.length; j++) {
-            if (getMacs.data[j].f_mac_number.toLocaleUpperCase() === getLocalMac.data.mac[i]) {
-              macValidate = true
-            }
-          }
+        // for (let i = 0; i < getLocalMac.data.mac.length; i++) {
+        for (let j = 0; j < getMacs.data.length; j++) {
+          // if (getMacs.data[j].f_mac_number.toLocaleUpperCase() === getLocalMac.data.mac[i]) {
+          macValidate = true
+          self.$login.f.depids = getMacs.data[j].f_username
+          self.$login.f.deps = getMacs.data[j].f_mac_outlets
+          // }
         }
+        // }
         if (!macValidate) {
           throw new Error('Mac地址验证失败, 请联系管理员！！')
         }
       }
-      // 弱口令验证
-      if (self.config.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(self.model.password))) {
-        self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
-          self.modifyPwShow = true
-        })
-      } else if (self.config.depPrompt) {
+      if (self.config.depPrompt) {
         self.depPromptShow = true
       } else {
         self.$goto('home-page', {functions: self.$login.f})
-        if (self.$login) {
-          console.log('登录信息', self.$login.f)
-          global.login=self.$login.f
-          console.log('登录信息', global.login)
-        }
       }
 
     } catch (ret) {
@@ -191,9 +165,9 @@
   export default {
     title: '登录',
     ready () {
-      if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
-        this.model.ename = this.$login.getUrlCompileParames('name')
-        this.model.password = this.$login.getUrlCompileParames('password')
+      if (this.getUrlCompileParames('name') && this.getUrlCompileParames('password')) {
+        this.model.ename = this.getUrlCompileParames('name')
+        this.model.password = this.getUrlCompileParames('password')
         this.confirm()
       }
       $('#login-button').click(function (event) {
@@ -216,8 +190,6 @@
         config: {
           isMac: false,
           depPrompt: false,
-          weakPassword: false,
-          title: '燃气客服系统'
         },
         login: false,
         depPromptShow: false,
@@ -225,13 +197,26 @@
         show: false,
         checkCode: '',
         login_do:true,
-        picLyanzhengma: '',
-        // 修改密码弹框展示
-        modifyPwShow: false,
-        logoandroid:false
+        picLyanzhengma: ''
       }
     },
     methods: {
+      // 从地址栏获取加密的参数
+      getUrlCompileParames (param) {
+        console.log(window.location)
+        let query = window.location.search
+        let iLen = param.length
+        let iStart = query.indexOf(param)
+        if (iStart === -1) {
+          return ''
+        }
+        iStart += iLen + 1
+        let iEnd = query.indexOf('&', iStart)
+        if (iEnd === -1) {
+          return query.substring(iStart)
+        }
+        return query.substring(iStart, iEnd)
+      },
       theme(){
         // var  elementList = document.querySelectorAll('body');
         //   console.log(elementList)
@@ -304,40 +289,31 @@
         this.login = false
         $('form').fadeIn(500)
       }
-    },
-    watch: {
-      'modifyPwShow' (val){
-        if (!val) {
-          window.location.reload()
-        }
-      }
     }
   }
 </script>
 
 <style>
-
   /*输入框样式*/
   /*@import url(http://fonts.useso.com/css?family=Source+Sans+Pro:200,300);*/
   * {
     box-sizing: border-box;
     margin: 0;
     padding: 0;
-    font-weight: 400;
-    outline: none;
+    font-weight: 300;
   }
 
   body {
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body ::-webkit-input-placeholder {
     /* WebKit browsers */
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body :-moz-placeholder {
@@ -345,7 +321,7 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body ::-moz-placeholder {
@@ -353,14 +329,14 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   body :-ms-input-placeholder {
     /* Internet Explorer 10+ */
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   .wrapper {
@@ -429,7 +405,7 @@
     color: white;
     -webkit-transition-duration: 0.25s;
     transition-duration: 0.25s;
-    font-weight: 400;
+    font-weight: 300;
   }
 
   .form input:hover {
@@ -641,29 +617,6 @@
     -webkit-animation-delay: 11s;
     animation-delay: 11s;
   }
-  .logofooter{
-    font-size: 12px;
-    color:#fff;
-    width:150px;
-    margin-left: 17px;
-  }
-  .logocontent{
-    font-size: 14px;
-    color:#fff;
-    width:150px;
-    margin: 3px -15px;
-  }
-  .imglogo {
-    background:url(../../../static/logo.png);
-    background-size:100%;
-  }
-  .logoew {
-    width:120px;
-    height:120px;
-    float:right;
-    margin-right:8.5%;
-    margin-top:10px;
-  }
 
   @-webkit-keyframes square {
     0% {

package/src/components/server/ModifyPw.vue

@@ -18,14 +18,13 @@
             </div>
           </div>
           <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':$v.newpassword.strongpassword && !($v.newpassword.required),
-          'has-success': !$v.newpassword.required && !$v.newpassword.strongpassword }">
+               :class="{'has-warning':$v.newpassword.required,'has-error':$v.newpassword.required,
+          'has-success': !$v.newpassword.required }">
             <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
             <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, strongpassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !($v.newpassword.strongpassword && !($v.newpassword.required))"></span>
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required"></span>
               <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="$v.newpassword.strongpassword && !($v.newpassword.required)">密码必须包含英文大小写、阿拉伯数字、字符</span>
             </div>
           </div>
           <div class="has-feedback form-group"

package/src/components/server/ResSelect.vue

@@ -2,7 +2,7 @@
   <v-select :options='resoptions' placeholder='请选择'
             :value.sync="selectres"
             :multiple="isMul"
-            search="true"
+            :search="search"
             :close-on-select="!isMul"
             @change="resChange"
   >
@@ -23,6 +23,10 @@
         type: Boolean,
         default: true
       },
+      search:{
+        type: Boolean,
+        default: true
+      },
       //资源初始化数据
       initresid: {
         type: Array,