system-clients 3.0.14-akyh-1 → 3.0.14-akyh-3

package/src/components/equipment/PhoneAdd.vue

@@ -65,7 +65,9 @@
     methods: {
       confirm () {
         this.model.f_operator = this.$login.f.name
-        this.model.f_filialeids = this.filialeCodeStr
+        this.model.f_filialeids = this.filialeCodeStr[0]
+        this.model.f_filialeid = this.filialeCodeStr[0]
+        this.model.f_orgid = this.filialeCodeStr[0]
         console.log('保存', this.model)
         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')

package/src/components/equipment/PhoneList.vue

@@ -74,7 +74,7 @@
       },
 
       selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_filialeids like '${this.filialeCodeStr}%'`
+        args.condition =  `${args.condition} and f_equipment_type = 'PHONE' and f_state = '正常' and f_orgid like '${this.filialeCodeStr}%'`
         this.model.search(args.condition, this.model)
       },
       add () {

package/src/components/equipment/PosAdd.vue

@@ -65,6 +65,7 @@
         this.model.f_operator = this.$login.f.name
         this.model.f_operatorid = this.$login.f.id
         this.model.f_orgid = this.f_filialeid
+        this.model.f_filialeid = this.f_filialeid
         this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
           this.$dispatch('refresh')
         }).catch((error) => {

package/src/components/equipment/PosList.vue

@@ -18,6 +18,12 @@
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
                       condition="f_terminal_number like '%{}%'" placeholder="设备编号">
             </div>
+            <div class="col-sm-3">
+              <label class="font_normal_body">联系电话</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_phone"
+                      condition="f_phone like '%{}%'" placeholder="联系电话">
+            </div>
+
             <div class="span" style="float:right;">
               <button type="button" class="button_search" @click="search()" v-el:cx>查询</button>
               <button type="button" class="button_search" @click="$parent.$parent.add()" v-el:cx>新增</button>
@@ -26,11 +32,21 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-3">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;所在地</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                      condition="f_address like '%{}%'" placeholder="所在地">
+            </div>
             <div class="col-sm-3">
               <label class="font_normal_body">设备名称</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_name"
                       condition="f_terminal_name like '%{}%'" placeholder="设备名称">
             </div>
+            <div class="col-sm-3">
+              <label class="font_normal_body">机器编号</label>
+              <input  type="text" class="input_search" style="width:60%"  v-model="model.f_machine_number"
+                      condition="f_machine_number like '%{}%'" placeholder="机器编号">
+            </div>
             <div class="col-sm-3">
               <label class="font_normal_body">所属银行</label>
               <input  type="text" class="input_search" style="width:60%"  v-model="model.f_bank_name"
@@ -45,7 +61,14 @@
             <th>序号</th>
             <th>设备编号</th>
             <th>设备名称</th>
+            <th>机器编号</th>
+            <th>联系电话</th>
+            <th>所在地</th>
             <th>所属银行</th>
+            <th>电池电量</th>
+            <th>是否登录</th>
+            <th>更新时间</th>
+            <th>软件版本</th>
             <th>操作</th>
           </tr>
         </template>
@@ -54,10 +77,19 @@
             <td style="text-align:center">{{$index+1}}</td>
             <td style="text-align:center">{{row.f_terminal_number}}</td>
             <td style="text-align:center">{{row.f_terminal_name}}</td>
+            <td style="text-align:center">{{row.f_machine_number}}</td>
+            <td style="text-align:center">{{row.f_phone}}</td>
+            <td style="text-align:center">{{row.f_address}}</td>
             <td style="text-align:center">{{row.f_bank_name}}</td>
+            <td style="text-align:center">{{row.f_battery_level}}</td>
+            <td style="text-align:center">{{row.f_is_login}}</td>
+            <td style="text-align:center">{{row.f_hybrid_version}}</td>
+            <td style="text-align:center">{{row.f_appVer}}</td>
             <td style="text-align:center">
               <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
+
+
           </tr>
         </template>
       </data-grid>
@@ -77,6 +109,7 @@
         model: new PagedList('rs/sql/equipmentQuery', 20),
         curorgid: [this.f_filialeid],
         f_orgid: '',
+        f_filialeids:'',
         criteriaShow: false
       }
     },
@@ -87,17 +120,24 @@
     methods: {
 
       search () {
+        console.log("111111111111111111111111111111111111")
         this.$refs.paged.$refs.cri.search()
       },
 
       selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
+        args.condition =  `${args.condition} and f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
         this.model.search(args.condition, this.model)
         this.$dispatch('research')
       },
 
       add () {
-        this.$dispatch('add')
+        if (this.f_filialeid) {
+          this.$parent.f_filialeid=this.f_filialeid
+          this.$dispatch('add')
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+
       },
 
       del (row) {
@@ -113,6 +153,7 @@
       getorg (val) {
         this.f_orgid = val[0]
         this.f_filialeid = val[0]
+        this.search()
       },
       hidden(){
         this.criteriaShow = !this.criteriaShow

package/src/components/server/Login.vue

@@ -79,46 +79,43 @@
   </div>
   <!--输入框结束-->
   <!-- 注册模态框开始 -->
-  <!-- <modal v-ref:modal :show.sync="registerShow" :backdrop="false" class="auto">
+  <modal :show.sync="visible" v-ref:modal :backdrop="true">
     <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="close"><span>&times;</span></button>
-      <h4 class="modal-title">注册</h4>
+<!--      <button type="button" class="close" @click="closeReset"><span>&times;</span></button>-->
+      <h4 class="modal-title">密码强度过低，请及时重新设置</h4>
     </header>
     <article slot="modal-body" class="modal-body modifystyle">
       <validator name="v">
 
-        <div class="has-feedback"
-        :class="{'has-warning':$v.ename.required,'has-success': !$v.ename.required}">
-          <label for="user" class="control-label">登录用户:&nbsp;&nbsp;</label>
-          <input type="text" v-model="deliver.ename" class="form-control" id="user" v-validate:ename="{ required: true}">
-          <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.ename.required"></span>
-          <span v-if="$v.ename.required">不能为空</span>
+        <div class="has-feedback">
+          <label class="control-label">密码在8-16位字符之间，至少同时具有数字和密码</label>
         </div>
 
-        <div class="has-feedback"
-        :class="{'has-warning':$v.password.required, 'has-success': !$v.password.required}">
+        <div class="has-feedback">
+          <label class="control-label">用户名:</label>
+          <span style="color: black">{{model.ename}}</span>
+        </div>
+
+        <div class="has-feedback" :class="{'has-warning':deliver.password, 'has-success': !deliver.password}">
           <label for="newpassword" class="control-label">登录密码:&nbsp;&nbsp;</label>
-          <input type="password" v-model="deliver.password" class="form-control" id="newpassword" v-validate:password='{ required: true }'>
-          <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-          <span v-if="$v.password.required">不能为空</span>
+          <input type="password" v-model="deliver.password" class="form-control" id="newpassword">
+          <span v-if="!deliver.password">不能为空</span>
         </div>
 
         <div class="has-feedback"
-        :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
-        'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
+        :class="{'has-warning':deliver.affirmpassword,'has-success': !deliver.affirmpassword}">
           <label for="affirmpassword" class="control-label">确认密码:&nbsp;&nbsp;</label>
-          <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.password }">
-          <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-          <span v-if="$v.affirmpassword.required">不能为空</span>
-          <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+          <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword">
+          <span v-if="!deliver.affirmpassword">不能为空</span>
+          <span v-if="deliver.affirmpassword !== deliver.password">两次密码不一致 !!</span>
         </div>
-
       </validator>
     </article>
     <footer slot="modal-footer" class="footerbtn">
-      <button  type="button" class="btn btn-success" @click='registed()' :disabled="!$v.valid">提交注册</button>
+      <button  type="button" class="btn btn-success" @click='resetPassword()' :disabled="!$v.valid">提交</button>
+      <button  type="button" class="btn btn-default" @click='closeReset()'>返回</button>
     </footer>
-  <modal> -->
+  </modal>
   <!-- 注册模态框结束 -->
   <!--<load-data @ready="onReady"></load-data>-->
 <!--  </div>-->
@@ -189,6 +186,22 @@
             $('form').fadeIn(500)
         }
     }
+    let savePassword = function * (self) {
+      self.deliver.ename = self.model.ename
+      self.deliver.password = self.model.password
+      let res = yield self.$post('rs/db/modifypwd', {data: self.deliver})
+      if (res.status === 200 || res.status === 204) {
+        self.visible = false
+        self.deliver.password = ''
+        self.deliver.newpassword = ''
+        self.deliver.affirmpassword = ''
+        self.deliver.ename = ''
+        self.model.ename = ''
+        self.model.password = ''
+        self.login = false
+        $('form').fadeIn(500)
+      }
+    }
     export default {
         title: '登录',
         ready () {
@@ -222,7 +235,8 @@
                 show: false,
                 checkCode: '',
                 login_do:true,
-                picLyanzhengma: ''
+                picLyanzhengma: '',
+                visible: false
             }
         },
         methods: {
@@ -237,6 +251,11 @@
                 this.$emit('ready')
             },
             confirm (key) {
+              if (this.checkPassword(this.model.password) <= 2) {
+                this.visible = true
+                $('form').fadeIn(500)
+                return
+              }
                 this.login_do=!this.login_do
                 // return
                 if (key == 'key') {
@@ -282,7 +301,114 @@
                     code += random[index];//根据索引取得随机数加到code上
                 }
                 this.checkCode = code;//把code值赋给验证码
+            },
+          checkPassword (str) {
+            // 第一步先判断各分类长度
+            let num = 0// 数字
+            let lowerCase = 0// 小写字母
+            let upperCase = 0// 大写字母
+            let special = 0// 特殊字符
+            for (let i = 0; i < str.length; i++) {
+              const c = str.charCodeAt(i)
+              if (c >= 48 && c <= 57) {
+                // 数字
+                num++
+              } else if (c >= 65 && c <= 90) {
+                // 大写字母
+                upperCase++
+              } else if (c === 97 && c <= 122) {
+                // 小写字母
+                lowerCase++
+              } else {
+                special++
+              }
+            }
+            // 第二步 计算分数
+            let wholeMark = 0
+            let numMark = 0
+            let caseMark = 0
+            let specialMark = 0
+            let reward = 0
+            // 整长度分数
+            if (str.length <= 4) {
+              wholeMark = 5
+            } else if (str.length > 4 && str.length <= 8) {
+              wholeMark = 10
+            } else {
+              wholeMark = 25
             }
+            // 奖励分数
+            if ((lowerCase || upperCase) && num) {
+              reward = 2
+              if (special) {
+                reward = 3
+                if (lowerCase && upperCase) {
+                  reward = 5
+                }
+              }
+            }
+            // 字母分数
+            if (lowerCase || upperCase) {
+              caseMark = 10
+              if (lowerCase && upperCase) {
+                caseMark = 20
+              }
+            }
+            // 数字分数
+            if (num) {
+              numMark = 10
+              if (num >= 3) {
+                numMark = 20
+              }
+            }
+            // 符号分数
+            if (special) {
+              specialMark = 10
+              if (special > 1) {
+                specialMark = 25
+              }
+            }
+            const totalMark = wholeMark + numMark + caseMark + specialMark + reward
+            console.warn(totalMark)
+            let strength
+            if (totalMark < 25) {
+              strength = 0
+            } else if (totalMark >= 25 && totalMark < 50) {
+              strength = 1
+            } else if (totalMark >= 50 && totalMark < 60) {
+              strength = 2
+            } else if (totalMark >= 60 && totalMark < 70) {
+              strength = 3
+            } else if (totalMark >= 70 && totalMark < 80) {
+              strength = 4
+            } else if (totalMark >= 80 && totalMark < 90) {
+              strength = 5
+            } else {
+              strength = 6
+            }
+            return strength
+          },
+          closeReset () {
+              this.visible = false
+            this.login = false
+            $('form').fadeIn(500)
+          },
+          resetPassword () {
+              if (!this.deliver.password || !this.deliver.affirmpassword) {
+                this.$showMessage("密码不能为空！")
+                return
+              }
+              if (this.deliver.password !== this.deliver.affirmpassword) {
+                this.$showMessage("两次输入的密码不一致，请核对！")
+                return
+              }
+              if (this.checkPassword(this.deliver.password) <= 2) {
+                this.$showMessage("密码过于简单，请重新设置！")
+                return
+              }
+            let gen = savePassword(this)
+            co(gen)
+          }
         }
     }
 </script>