system-clients 3.1.87-aode → 3.1.87-xianyang

package/src/components/equipment/QCList.vue

@@ -0,0 +1,230 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+
+      <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  form-group">
+              <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;司</label>
+              <res-select restype='organization'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getorg"
+                          :initresid="$parent.$parent.curorgid">
+              </res-select>
+            </div>
+            <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="设备编号">
+            </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>
+              <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                   @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <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_address"
+                      condition="f_address like '%{}%'" placeholder="所在地">
+            </div>
+            <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_name"
+                      condition="f_terminal_name like '%{}%'" placeholder="设备名称">
+            </div>
+            <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_machine_number"
+                      condition="f_machine_number like '%{}%'" placeholder="机器编号">
+            </div>
+            <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_phone"
+                      condition="f_phone like '%{}%'" placeholder="联系电话">
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th><input type="checkbox" name="ischeckbox_all_id" v-model="$parent.$parent.$parent.isSelAll" :value.sync="$parent.$parent.$parent.isSelAll" /></th>
+            <th style="text-align:center;white-space:nowrap;">序号</th>
+            <th style="text-align:center;white-space:nowrap;">设备编号</th>
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">设备类型</th>
+            <th style="text-align:center;white-space:nowrap;">设备名称</th>
+            <th style="text-align:center;white-space:nowrap;">所属公司</th>
+            <th style="text-align:center;white-space:nowrap;">状态</th>
+            <th style="text-align:center;white-space:nowrap;">机器编号</th>
+            <th style="text-align:center;white-space:nowrap;">联系电话</th>
+            <th style="text-align:center;white-space:nowrap;">所在地</th>
+<!--            <th style="text-align:center;white-space:nowrap;">电池电量</th>-->
+<!--            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">是否登录</th>-->
+<!--            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">更新时间</th>-->
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作时间</th>
+<!--            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">软件版本</th>-->
+            <th style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">操作人</th>
+            <th style="text-align:center;white-space:nowrap;">失联状态</th>
+            <th style="text-align:center;white-space:nowrap;">操作</th>
+          </tr>
+        </template>
+        <template partial='body':model="model">
+          <tr>
+            <td><input type="checkbox" name="checkbox_id" v-model="$parent.$parent.$parent.selPos" :value.sync="row"></td>
+            <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
+            <td style="text-align:center;white-space:nowrap;"><span title="点击查看历史" @click="$parent.$parent.$parent.abcd(row)"><a>{{row.f_terminal_number}}</a></span></td>
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_equipment_type}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_terminal_name}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_user_orgname}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_state}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_machine_number}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_phone}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_address}}</td>
+<!--            <td style="text-align:center;white-space:nowrap;">{{row.f_battery_level}}</td>-->
+<!--            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_is_login}}</td>-->
+<!--            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_hybrid_version}}</td>-->
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operate_date}}</td>
+<!--            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_appVer}}</td>-->
+            <td style="text-align:center;white-space:nowrap;" v-show="!$parent.$parent.$parent.isshowless">{{row.f_operator}}</td>
+            <td style="text-align:center;white-space:nowrap;" >{{row.f_online}}</td>
+            <td style="text-align:center;white-space:nowrap;" ><button class="btn btn-danger" @click="$parent.$parent.$parent.delQc(row)">删除</button></td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal v-show="infoshow" :show.sync="infoshow" v-ref:modal backdrop="false" width="800px" title="终端历史信息">
+    <article slot="modal-body" class="modal-body">
+      <criteria-paged :model="model2" v-ref:paged2>
+        <data-grid :model="model2" v-ref:grid2  partial='list'>
+          <template partial='head'>
+            <tr>
+              <th><nobr>序号</nobr></th>
+              <th><nobr>终端号</nobr></th>
+              <th><nobr>上次上报时间</nobr></th>
+              <th><nobr>本次上报时间</nobr></th>
+              <th><nobr><b>状态</b></nobr></th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <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_update_date}}</td>
+            <td style="text-align: center;">{{row.f_update_date }}</td>
+            <td style="text-align: center;"><b>{{row.f_pos_state}}</b></td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success" @click='infoclose'>关闭</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: '终端控制',
+    components: {},
+    data () {
+      return {
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        model: new PagedList('rs/sql/equipmentQuery', 20),
+        model2: new PagedList('rs/sql/singleTable', 30, {tablename: '`t_poshistory`'}),
+        curorgid: [this.f_filialeid],
+        f_orgid: '',
+        f_filialeids: '',
+        criteriaShow: false,
+        infoadd: false,
+        selPos: [],
+        isSelAll: false,  // 默认不全选
+        infoshow: false
+      }
+    },
+    props: ['f_filialeid','isshowless'],
+    ready () {
+      this.search()
+    },
+    watch:{
+      'isSelAll'(val){
+        if (val) {
+          // 对当前页面全选
+          this.selPos = []
+          for (const sel of this.model.rows) {
+            this.selPos.push(sel)
+          }
+        } else {
+          this.selPos = []
+        }
+      }
+    },
+    methods: {
+      delQc(row){
+        this.$showMessage('删除之后不可回复，确定要删除该圈存机吗？', ['confirm', 'cancel']).then(async (res) => {
+          if (res == 'confirm') {
+            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(val){
+        if (val.orgobj.length === 1 && val.orgobj[0].resourcetype === 'user'){
+          this.$refs.paged.$refs.cri.model.f_user_operatorid=val.orgobj[0].userid
+          this.$refs.paged.$refs.cri.model.f_user_operator=val.orgobj[0].name
+        } else {
+          this.$refs.paged.$refs.cri.model.f_user_operatorid=''
+          this.$refs.paged.$refs.cri.model.f_user_operator=''
+        }
+      },
+      infoclose(){
+        this.infoshow=false
+      },
+      abcd (row) {
+        console.log("chakan",row)
+        let condition = `f_terminal_number = '${row.f_terminal_number}' order by id desc`
+        // this.model2.search(condition)
+        this.infoshow = true
+      },
+      search () {
+        console.log("111111111111111111111111111111111111")
+        this.$refs.paged.$refs.cri.search()
+      },
+
+      selfSearch (args) {
+        // args.condition =  `${args.condition} and f_equipment_type = '圈存机' and f_orgid = '${this.f_filialeid ? this.f_orgid: this.$login.f.orgid}'`
+        args.condition =  `${args.condition} and f_equipment_type = '圈存机' 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.infoadd=false
+        this.$dispatch('add', this.f_filialeid)
+      },
+
+      getorg (val) {
+        this.f_orgid = val[0]
+        this.f_filialeid = val[0]
+        // this.search()
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      }
+    },
+    computed: {
+
+    }
+  }
+</script>

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/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">燃气客服系统</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"-->
@@ -78,12 +73,6 @@
                 <p class="form-control-static">{{$login.f.name}}</p>
               </div>
             </div>
-            <div class="col-sm-12 form-group">
-              <label class="col-sm-5 control-label">组&nbsp;织&nbsp;编&nbsp;码</label>
-              <div class="col-sm-7">
-                <p class="form-control-static">{{$login.f.number}}</p>
-              </div>
-            </div>
             <div class="col-sm-12 form-group">
               <label class="col-sm-5 control-label">所在销售点</label>
               <div class="col-sm-7">
@@ -98,9 +87,6 @@
         <button class="button_clear" @click="depPromptCancel">取消</button>
       </footer>
     </modal>
-
-    <!-- 修改密码组件 -->
-    <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow"></modify-pw>
   </div>
 
 </template>
@@ -108,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}'`}}, {
           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) {
@@ -197,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) {
@@ -222,7 +190,6 @@
         config: {
           isMac: false,
           depPrompt: false,
-          weakPassword: true
         },
         login: false,
         depPromptShow: false,
@@ -230,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)
@@ -309,19 +289,11 @@
         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);*/
   * {
@@ -645,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"