system-clients 3.2.72 → 3.2.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.72",
+  "version": "3.2.74",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/App.vue

@@ -1,24 +1,24 @@
-<template>
-  <app-base class="bg">
-    <div class='flex'>
-      <article>
-        <!--<route :comp="{name: 'check-model'}"></route>-->
-        <!--<route :comp="{name: 'vender-management'}"></route>-->
-        <route :comp="{name: 'login'}"></route>
-        <!-- <route :comp="{name: 'load-data'}"></route> -->
-        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-      </article>
-    </div>
-  </app-base>
-</template>
-
-<script>
-// import cardListen from './plugins/CardListen'
-
-export default {
-  // ready () {
-  //   cardListen.startListen()
-  // }
-}
-</script>
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <!--<route :comp="{name: 'check-model'}"></route>-->
+        <!--<route :comp="{name: 'vender-management'}"></route>-->
+        <route :comp="{name: 'login'}"></route>
+        <!-- <route :comp="{name: 'load-data'}"></route> -->
+        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+      </article>
+    </div>
+  </app-base>
+</template>
+
+<script>
+// import cardListen from './plugins/CardListen'
+
+export default {
+  // ready () {
+  //   cardListen.startListen()
+  // }
+}
+</script>

package/src/filiale/shiquan/Login.vue

@@ -10,8 +10,8 @@
           </button>
           <span v-if="$login.versionTime">>构建时间：{{ vTime }}</span>
           <div v-if="titleShow">
-          <img src="../../../static/newStyle/login-info.png"/>
-          <span @click="showus=true">关于我们</span>
+            <img src="../../../static/newStyle/login-info.png"/>
+            <span @click="showus=true">关于我们</span>
           </div>
           <!--          <img src="../../../static/newStyle/login-con.png"/>-->
           <!--          <span>联系我们</span>-->
@@ -37,7 +37,7 @@
     <div class="loginmain">
       <!-- <img src="../../../static/login_title1.png" alt="图片加载未完成" class="img-responsive" style="margin: 0 auto; padding-top: 150px;" /> -->
       <div class="loginmain-left">
-        <img  class="loginmain-left-img" src="../../../static/newStyle/login-left.png">
+        <img  class="loginmain-left-img" src="../../../static/newStyle/1959d3b6480f4485b2e32446f762960c.jpg">
       </div>
       <div class="loginmain-right">
 
@@ -99,12 +99,12 @@
               <label class="col-sm-5 ">当前登录人:</label>
               <label style="font-weight:normal">{{$login.f.name}}</label>
             </div>
-              <!--<div class="col-sm-12 form-group" v-if="$login.f.number">-->
-              <!--<label class="col-sm-5 ">组&nbsp;织&nbsp;编&nbsp;码:</label>-->
-              <!--<label style="font-weight:normal">{{$login.f.number}}</label>-->
-              <!-- <div class="col-sm-7">
-                <span >{{$login.f.number}}</span>
-              </div> -->
+            <!--<div class="col-sm-12 form-group" v-if="$login.f.number">-->
+            <!--<label class="col-sm-5 ">组&nbsp;织&nbsp;编&nbsp;码:</label>-->
+            <!--<label style="font-weight:normal">{{$login.f.number}}</label>-->
+            <!-- <div class="col-sm-7">
+              <span >{{$login.f.number}}</span>
+            </div> -->
             <!--</div>-->
             <div class="col-sm-12 form-group">
               <label class="col-sm-5">所在销售点:</label>
@@ -114,7 +114,7 @@
               </div> -->
             </div>
             <div class="col-sm-12 " v-if="AppDaiBan !==''">
-                <label class="col-sm-2">报装待办:</label>
+              <label class="col-sm-2">报装待办:</label>
               <span style="font-weight:normal">{{AppDaiBan}}</span>
             </div>
             <div class="col-sm-12 " v-if="OrderDaiBan !==''">
@@ -141,424 +141,424 @@
 </template>
 
 <script>
-import co from 'co'
-import $ from 'jquery'
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
+  import co from 'co'
+  import $ from 'jquery'
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
 
-let daibanJson = require('../../util/Daiban.json')
+  let daibanJson = require('../../util/Daiban.json')
 
 
-let saveGen = function *(self) {
-  try {
-    if(self.$login){
-      // 账号ename，密码password，是否显示异地登陆
-      yield self.$login.login(self.model.ename, self.model.password, self.$login.showYiDi)
-    }
-    if(self.$appdata){
-      yield self.$appdata.load()
-    }
-    if (Vue.$heatCompatibility) {
-      try {
-        if(self.$loginHeat){
-          yield self.$loginHeat.login(self.model.ename, self.model.password)
-        }
-        if(self.$appdataHeat){
-          yield self.$appdataHeat.load()
-        }
-      } catch (e) {
-        console.log('热力系统登陆失败!')
+  let saveGen = function *(self) {
+    try {
+      if(self.$login){
+        // 账号ename，密码password，是否显示异地登陆
+        yield self.$login.login(self.model.ename, self.model.password, self.$login.showYiDi)
       }
-    }
-    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}%'`}}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).catch(() => {
-        throw new Error('获取mac配置失败')
-      })
-      console.log('MAC地址信息', getMacs)
-      // 获取本地mac地址
-      let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
-        resolveMsg: null,
-        rejectMsg: null
-      }).catch(() => {
-        throw new Error('获取本地mac配置失败')
-      })
-      console.log('本地MAC地址信息', getLocalMac)
-      // 对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
+      if(self.$appdata){
+        yield self.$appdata.load()
+      }
+      if (Vue.$heatCompatibility) {
+        try {
+          if(self.$loginHeat){
+            yield self.$loginHeat.login(self.model.ename, self.model.password)
+          }
+          if(self.$appdataHeat){
+            yield self.$appdataHeat.load()
           }
+        } catch (e) {
+          console.log('热力系统登陆失败!')
         }
       }
-      if (!macValidate) {
-        throw new Error('Mac地址验证失败, 请联系管理员！！')
+      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}%'`}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).catch(() => {
+          throw new Error('获取mac配置失败')
+        })
+        console.log('MAC地址信息', getMacs)
+        // 获取本地mac地址
+        let getLocalMac = yield self.$resetget('http://127.0.0.1:8003/loadmac', {
+          resolveMsg: null,
+          rejectMsg: null
+        }).catch(() => {
+          throw new Error('获取本地mac配置失败')
+        })
+        console.log('本地MAC地址信息', getLocalMac)
+        // 对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
+            }
+          }
+        }
+        if (!macValidate) {
+          throw new Error('Mac地址验证失败, 请联系管理员！！')
+        }
       }
-    }
-    console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
-      self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
-        self.modifyPwShow = true
-      })
-    } else if ((!self.otherLogin) && self.$login.depPrompt) {
-      self.depPromptShow = true
-      if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
-        // 获取待办
-        self.getDaiBan()
+      console.log(self.$login.depPrompt)
+      // 弱口令验证
+      //跳转过来的不进行验证
+      if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+        self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
+          self.modifyPwShow = true
+        })
+      } else if ((!self.otherLogin) && self.$login.depPrompt) {
+        self.depPromptShow = true
+        if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
+          // 获取待办
+          self.getDaiBan()
+        }
+        if (self.$login.showDaiBan && self.$login.r.includes('登录预约信息')){
+          // 获取待办  在util下有个Daiban.jsond 文件 ，在里面进行配置，在功能权限界面增加登录预约信息
+          self.getDaiBanA()
+        }
+      } else {
+        self.$goto('home-page', {functions: self.$login.f,config: self.config})
+        if (self.$login) {
+          console.log('登录信息', self.$login.f)
+          global.login=self.$login.f
+          console.log('登录信息', global.login)
+        }
       }
-      if (self.$login.showDaiBan && self.$login.r.includes('登录预约信息')){
-        // 获取待办  在util下有个Daiban.jsond 文件 ，在里面进行配置，在功能权限界面增加登录预约信息
-        self.getDaiBanA()
+    } catch (ret) {
+      console.error('登录失败', ret)
+      let msg
+      if (ret instanceof Error) {
+        msg = ret
       }
-    } else {
-      self.$goto('home-page', {functions: self.$login.f,config: self.config})
-      if (self.$login) {
-        console.log('登录信息', self.$login.f)
-        global.login=self.$login.f
-        console.log('登录信息', global.login)
+      if (ret.status === 0) {
+        msg = '服务连接错误，请确认服务状态'
+      } else if (ret.status === 401) {
+        msg = ret.data
+      } else if (ret.status === 710) {
+        msg = ret.data
+      } else if (ret.status === 555) {
+        msg = ret.data
       }
+      self.createCode()
+      self.picLyanzhengma = ''
+      yield self.$showMessage(msg)
+      self.model.ename = ''
+      self.model.password = ''
+      self.login = false
+      $('form').fadeIn(500)
     }
-  } catch (ret) {
-    console.error('登录失败', ret)
-    let msg
-    if (ret instanceof Error) {
-      msg = ret
-    }
-    if (ret.status === 0) {
-      msg = '服务连接错误，请确认服务状态'
-    } else if (ret.status === 401) {
-      msg = ret.data
-    } else if (ret.status === 710) {
-      msg = ret.data
-    } else if (ret.status === 555) {
-      msg = ret.data
-    }
-    self.createCode()
-    self.picLyanzhengma = ''
-    yield self.$showMessage(msg)
-    self.model.ename = ''
-    self.model.password = ''
-    self.login = false
-    $('form').fadeIn(500)
   }
-}
-export default {
-  title: '登录',
-  async ready () {
-    this.titleShow = this.$appdata.getSingleValue('关于我们')
-    window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
-    this.vTime = this.format(new Date(window.versionTime));
-    try{
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'rs/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-    }catch(e){}
-
-    this.loginother();
-    $('#login-button').click(function (event) {
-      event.preventDefault()
-      $('form').fadeOut(500)
-    })
-    if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
-      const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
-      console.log(subUrl)
-      this.model.ename = window.atob(subUrl[0])
-      this.model.password = window.atob(subUrl[1])
-      console.log('this.model.ename',this.model.ename)
-      this.otherLogin = true
-      this.confirm()
-    }else{
-      //跳转不需要验证码
-      this.createCode()
-    }
-    console.log(this.$login)
-  },
-  data () {
-    return {
-      vTime: '',
-      image:{
-        img1: '/images/newStyle/login-info.png',
-        img2: '/images/newStyle/login-con.png',
-        img3: '/images/newStyle/login-left.png',
-        img4: '/images/newStyle/login-user.png',
-        img5: '/images/newStyle/login-pwd.png',
-        img6: '/images/newStyle/login-check.png',
-        img7: '/images/newStyle/login-do.png',
-      },
-      config: {
-        isMac: false,
-        depPrompt: false,
-        weakPassword: false,
-        title: '潮午天然气客服系统',
-        distanceLogin: false,
-        // 那些角色可以定时获取预约提示
-        isTip : false,
-        // 那些角色可以定时获取预约提示
-        msgRole : '预约处理人员',
-        // 定时获取提示间隔 单位：分钟
-        times: 25,
-      },
-      titleShow: true, //标题显示
-      otherLogin:false,
-      login: false,
-      depPromptShow: false,
-      model: {},
-      show: false,
-      checkCode: '',
-      login_do:true,
-      picLyanzhengma: '',
-      // 修改密码弹框展示
-      modifyPwShow: false,
-      logoandroid:false,
-      showus:false,
-      notice:'',
-      loginotherflag :true,
-      // 报建待办
-      AppDaiBan: '',
-      //安检待办
-      safecheckDaiBan:[],
-      // 预约待处理
-      OrderDaiBan: ''
-    }
-  },
-  methods: {
-    //格式化时间
-    format(dat){
-      //获取年月日，时间
-      const year = dat.getFullYear();
-      const mon = (dat.getMonth()+1) < 10 ? "0"+(dat.getMonth()+1) : dat.getMonth()+1;
-      const data = dat.getDate()  < 10 ? "0"+(dat.getDate()) : dat.getDate();
-      const hour = dat.getHours()  < 10 ? "0"+(dat.getHours()) : dat.getHours();
-      const min =  dat.getMinutes()  < 10 ? "0"+(dat.getMinutes()) : dat.getMinutes();
-      const seon = dat.getSeconds() < 10 ? "0"+(dat.getSeconds()) : dat.getSeconds();
+  export default {
+    title: '登录',
+    async ready () {
+      this.titleShow = this.$appdata.getSingleValue('关于我们')
+      window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
+      this.vTime = this.format(new Date(window.versionTime));
+      try{
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/sql/singleTable',
+          {data:{
+              tablename: 't_changedeclare',
+              condition: ` f_type ='变更通知' `
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+        if(res.data.length>0){
+          console.log("---------------获取通知",res.data[0].f_change_message)
+          this.notice=res.data[0].f_change_message
+        }
+      }catch(e){}
 
-      return year + "-" + mon + "-" + data + " " + hour + ":" + min + ":" + seon;
-    },
-    async getDaiBan(){
-      let http = new HttpResetClass()
-      let condition = ''
-      if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
-      } else {
-        condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
-      }
-      await http.load('POST', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
-        OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
-        OrderDaiBan[item.f_ordertype].push(item)
+      this.loginother();
+      $('#login-button').click(function (event) {
+        event.preventDefault()
+        $('form').fadeOut(500)
       })
-      this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
-      if (res.data.length> 0){
-        this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
-      }
-    })
-      let data = {
-        condition: '1 = 1',
-        data: {
-          orgid: this.$login.f.orgid,
-          id: this.$login.f.id
-        }
+      if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
+        const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
+        console.log(subUrl)
+        this.model.ename = window.atob(subUrl[0])
+        this.model.password = window.atob(subUrl[1])
+        console.log('this.model.ename',this.model.ename)
+        this.otherLogin = true
+        this.confirm()
+      }else{
+        //跳转不需要验证码
+        this.createCode()
       }
-      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then((res) => {
-        let AppDaiBan = {}
-        res.data.forEach(item=>{
-        AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
-        AppDaiBan[item.defname].push(item)
-      })
-      this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
-      if (res.data.length> 0){
-        this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
+      console.log(this.$login)
+    },
+    data () {
+      return {
+        vTime: '',
+        image:{
+          img1: '/images/newStyle/login-info.png',
+          img2: '/images/newStyle/login-con.png',
+          img3: '/images/newStyle/login-left.png',
+          img4: '/images/newStyle/login-user.png',
+          img5: '/images/newStyle/login-pwd.png',
+          img6: '/images/newStyle/login-check.png',
+          img7: '/images/newStyle/login-do.png',
+        },
+        config: {
+          isMac: false,
+          depPrompt: false,
+          weakPassword: false,
+          title: '潮午天然气客服系统',
+          distanceLogin: false,
+          // 那些角色可以定时获取预约提示
+          isTip : false,
+          // 那些角色可以定时获取预约提示
+          msgRole : '预约处理人员',
+          // 定时获取提示间隔 单位：分钟
+          times: 25,
+        },
+        titleShow: true, //标题显示
+        otherLogin:false,
+        login: false,
+        depPromptShow: false,
+        model: {},
+        show: false,
+        checkCode: '',
+        login_do:true,
+        picLyanzhengma: '',
+        // 修改密码弹框展示
+        modifyPwShow: false,
+        logoandroid:false,
+        showus:false,
+        notice:'',
+        loginotherflag :true,
+        // 报建待办
+        AppDaiBan: '',
+        //安检待办
+        safecheckDaiBan:[],
+        // 预约待处理
+        OrderDaiBan: ''
       }
-    })
-
     },
-    async getDaiBanA(){
-      // 是否全局开启待办通知
-      if (daibanJson.enable) {
-        console.log("当前获取到待办配置为" + JSON.stringify(daibanJson))
+    methods: {
+      //格式化时间
+      format(dat){
+        //获取年月日，时间
+        const year = dat.getFullYear();
+        const mon = (dat.getMonth()+1) < 10 ? "0"+(dat.getMonth()+1) : dat.getMonth()+1;
+        const data = dat.getDate()  < 10 ? "0"+(dat.getDate()) : dat.getDate();
+        const hour = dat.getHours()  < 10 ? "0"+(dat.getHours()) : dat.getHours();
+        const min =  dat.getMinutes()  < 10 ? "0"+(dat.getMinutes()) : dat.getMinutes();
+        const seon = dat.getSeconds() < 10 ? "0"+(dat.getSeconds()) : dat.getSeconds();
+
+        return year + "-" + mon + "-" + data + " " + hour + ":" + min + ":" + seon;
+      },
+      async getDaiBan(){
         let http = new HttpResetClass()
-        let daibanArray = []
-        for (let daibanItem of daibanJson.daiban) {
-          console.log("开始处理待办任务：" + daibanItem.title + "当前任务状态：" + daibanItem.enable?"开启":"关闭" )
-          if (daibanItem.enable) { // 控制每一项通知是否开启
-          let postResult = ''; //提示信息为
-           await http.load("POST",daibanItem.url,{data:daibanItem.data},{ resolveMsg: null, rejectMsg: null})
-              .then((res)=>{
-                let responseData = res.data
-                for (let item of responseData) {
-                  postResult += eval(daibanItem.text) + "\n"
-                }
-                postResult += '\t'
-                daibanArray.push({text:postResult,oldData:daibanItem})
-              })
+        let condition = ''
+        if(this.$login.f.deps!=='柠条塔'){
+          condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        } else {
+          condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
+        }
+        await http.load('POST', '/rs/sql/singleTable', {data: {
+            tablename:'t_order_center',
+            condition:condition
+          }}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          let OrderDaiBan = {}
+          res.data.forEach(item=>{
+            OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+            OrderDaiBan[item.f_ordertype].push(item)
+          })
+          this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+          if (res.data.length> 0){
+            this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
+          }
+        })
+        let data = {
+          condition: '1 = 1',
+          data: {
+            orgid: this.$login.f.orgid,
+            id: this.$login.f.id
           }
         }
-        console.log("安检数据为："+JSON.stringify(daibanArray))
-        this.safecheckDaiBan = daibanArray
-      }else {
-        console.log("待办提醒全局关闭。")
-      }
+        await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          let AppDaiBan = {}
+          res.data.forEach(item=>{
+            AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
+            AppDaiBan[item.defname].push(item)
+          })
+          this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+          if (res.data.length> 0){
+            this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
+          }
+        })
+
+      },
+      async getDaiBanA(){
+        // 是否全局开启待办通知
+        if (daibanJson.enable) {
+          console.log("当前获取到待办配置为" + JSON.stringify(daibanJson))
+          let http = new HttpResetClass()
+          let daibanArray = []
+          for (let daibanItem of daibanJson.daiban) {
+            console.log("开始处理待办任务：" + daibanItem.title + "当前任务状态：" + daibanItem.enable?"开启":"关闭" )
+            if (daibanItem.enable) { // 控制每一项通知是否开启
+              let postResult = ''; //提示信息为
+              await http.load("POST",daibanItem.url,{data:daibanItem.data},{ resolveMsg: null, rejectMsg: null})
+                .then((res)=>{
+                  let responseData = res.data
+                  for (let item of responseData) {
+                    postResult += eval(daibanItem.text) + "\n"
+                  }
+                  postResult += '\t'
+                  daibanArray.push({text:postResult,oldData:daibanItem})
+                })
+            }
+          }
+          console.log("安检数据为："+JSON.stringify(daibanArray))
+          this.safecheckDaiBan = daibanArray
+        }else {
+          console.log("待办提醒全局关闭。")
+        }
 
 
 
 
-    },
+      },
 
-    async loginother(){
-      if (this.config.distanceLogin) {
-        if (this.$login && this.$login.getUrlParames('name') ) {
-          let ename = this.$login.getUrlParames('name');
-          let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
-          if(logininfo.data){
-            if(logininfo.data.ename && logininfo.data.password){
-              this.model.ename = logininfo.data.ename
-              this.model.password =logininfo.data.password
-              let gen = saveGen(this)
-              return co(gen)
+      async loginother(){
+        if (this.config.distanceLogin) {
+          if (this.$login && this.$login.getUrlParames('name') ) {
+            let ename = this.$login.getUrlParames('name');
+            let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
+            if(logininfo.data){
+              if(logininfo.data.ename && logininfo.data.password){
+                this.model.ename = logininfo.data.ename
+                this.model.password =logininfo.data.password
+                let gen = saveGen(this)
+                return co(gen)
+              }
             }
           }
         }
-      }
-    },
-    theme(){
-      // var  elementList = document.querySelectorAll('body');
-      //   console.log(elementList)
-      //   document.querySelectorAll('body')[0].className='themeTwo'
-      //   var  elementList = document.querySelectorAll('body');
-      //   console.log(elementList)
-    },
-    onReady () {
-      this.$emit('ready')
-    },
-    confirm (key) {
-      this.login_do=!this.login_do
-      // return
-      if (key == 'key') {
-        $('form').fadeOut(500)
-      }
-      this.login = true
-      // let gen = saveGen(this)
-      // return co(gen)
-      if((!this.otherLogin) && this.$login && this.$login.Verification){
-        console.log('跳转过来的不走验证')
-        if(this.picLyanzhengma == '') {
-          this.$showMessage("请输入验证码！").then(()=>{
-            this.login = false
-            $('form').fadeIn(500)
-            this.createCode()
-          })
-        }else if(this.picLyanzhengma.toUpperCase() != this.checkCode ) {
-          //若输入的验证码与产生的验证码不一致时
-          this.$showMessage("验证码不正确").then(()=>{
-            this.login = false
-            $('form').fadeIn(500)
-            this.createCode();//刷新验证码
-            this.picLyanzhengma = '';
-          })
+      },
+      theme(){
+        // var  elementList = document.querySelectorAll('body');
+        //   console.log(elementList)
+        //   document.querySelectorAll('body')[0].className='themeTwo'
+        //   var  elementList = document.querySelectorAll('body');
+        //   console.log(elementList)
+      },
+      onReady () {
+        this.$emit('ready')
+      },
+      confirm (key) {
+        this.login_do=!this.login_do
+        // return
+        if (key == 'key') {
+          $('form').fadeOut(500)
+        }
+        this.login = true
+        // let gen = saveGen(this)
+        // return co(gen)
+        if((!this.otherLogin) && this.$login && this.$login.Verification){
+          console.log('跳转过来的不走验证')
+          if(this.picLyanzhengma == '') {
+            this.$showMessage("请输入验证码！").then(()=>{
+              this.login = false
+              $('form').fadeIn(500)
+              this.createCode()
+            })
+          }else if(this.picLyanzhengma.toUpperCase() != this.checkCode ) {
+            //若输入的验证码与产生的验证码不一致时
+            this.$showMessage("验证码不正确").then(()=>{
+              this.login = false
+              $('form').fadeIn(500)
+              this.createCode();//刷新验证码
+              this.picLyanzhengma = '';
+            })
+          }else {
+            this.login = true
+            let gen = saveGen(this)
+            return co(gen)
+          }
         }else {
           this.login = true
           let gen = saveGen(this)
           return co(gen)
         }
-      }else {
-        this.login = true
-        let gen = saveGen(this)
-        return co(gen)
-      }
-    },
-    createCode(){
-      let code = "";
-      let codeLength = 4;//验证码的长度
-      let random = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-        'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');//随机数
-      for (let i = 0; i < codeLength; i++) {
-        //循环操作
-        let index = Math.floor(Math.random() * 36);//取得随机数的索引（0~35）
-        code += random[index];//根据索引取得随机数加到code上
-      }
-      this.checkCode = code;//把code值赋给验证码
-    },
+      },
+      createCode(){
+        let code = "";
+        let codeLength = 4;//验证码的长度
+        let random = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+          'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');//随机数
+        for (let i = 0; i < codeLength; i++) {
+          //循环操作
+          let index = Math.floor(Math.random() * 36);//取得随机数的索引（0~35）
+          code += random[index];//根据索引取得随机数加到code上
+        }
+        this.checkCode = code;//把code值赋给验证码
+      },
 
-    async depPromptConfirm () {
-      this.depPromptShow = false
-      return this.$goto('home-page', {functions: this.$login.f,config: this.config})
-    },
+      async depPromptConfirm () {
+        this.depPromptShow = false
+        return this.$goto('home-page', {functions: this.$login.f,config: this.config})
+      },
 
-    depPromptCancel () {
-      this.depPromptShow = false
-      this.createCode()
-      this.picLyanzhengma = ''
-      this.model.ename = ''
-      this.model.password = ''
-      this.login = false
-      $('form').fadeIn(500)
-    },
-    delCookie() {
-      let cookies = document.cookie.split(";");
-      console.log("点击触发了")
-      for (let i = 0; i < cookies.length; i++) {
-        let cookie = cookies[i];
-        let eqPos = cookie.indexOf("=");
-        let name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
-        document.cookie =
-          name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/";
-      }
-      if (cookies.length > 0) {
+      depPromptCancel () {
+        this.depPromptShow = false
+        this.createCode()
+        this.picLyanzhengma = ''
+        this.model.ename = ''
+        this.model.password = ''
+        this.login = false
+        $('form').fadeIn(500)
+      },
+      delCookie() {
+        let cookies = document.cookie.split(";");
+        console.log("点击触发了")
         for (let i = 0; i < cookies.length; i++) {
           let cookie = cookies[i];
           let eqPos = cookie.indexOf("=");
           let name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
-          let domain = location.host.substr(location.host.indexOf("."));
           document.cookie =
-            name +
-            "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=" +
-            domain;
+            name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/";
+        }
+        if (cookies.length > 0) {
+          for (let i = 0; i < cookies.length; i++) {
+            let cookie = cookies[i];
+            let eqPos = cookie.indexOf("=");
+            let name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+            let domain = location.host.substr(location.host.indexOf("."));
+            document.cookie =
+              name +
+              "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=" +
+              domain;
+          }
         }
+        localStorage.clear()
+        sessionStorage.clear()
+        window.location.reload()
       }
-      localStorage.clear()
-      sessionStorage.clear()
-      window.location.reload()
-    }
 
-  },
-  watch: {
-    'modifyPwShow' (val){
-      if (!val) {
-        window.location.reload()
+    },
+    watch: {
+      'modifyPwShow' (val){
+        if (!val) {
+          window.location.reload()
+        }
       }
     }
   }
-}
 </script>
 
 <style>
-.my_button_search{width: 100px; height: 25px;position: relative; padding-left:2px;top: 0px;line-height: 25px; background:rgba(0,0,0,0);  border-radius: 4px;    border:none; font-family: PingFang; font-size: 15px}
-.my_button_search:hover img{    filter: opacity(0.8);}
+  .my_button_search{width: 100px; height: 25px;position: relative; padding-left:2px;top: 0px;line-height: 25px; background:rgba(0,0,0,0);  border-radius: 4px;    border:none; font-family: PingFang; font-size: 15px}
+  .my_button_search:hover img{    filter: opacity(0.8);}
 </style>

package/src/styles/less/aofeng/standard.less

@@ -40,10 +40,10 @@
   .fonttitle(@i - 1, @type, @colortype);
 }
 
-.fonttitle(40, 'bold', 'title');
-.fonttitle(40, 'bold', 'body');
-.fonttitle(40, 'bold', 'title1');
-.fonttitle(40, 'bold', 'button');
+.fonttitle(40, bold, title);
+.fonttitle(40, bold, body);
+.fonttitle(40, bold, title1);
+.fonttitle(40, bold, button);
 .fonttitle(40, bold, blue);
 .fonttitle(40, normal, title);
 .fonttitle(40, normal, body);