system-clients 3.2.107-yzxt → 3.3.1-v3

package/package.info

@@ -0,0 +1 @@
+此为纯v3项目使用的 systemclient_v3 分支

package/package.json

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

package/src/components/Main.vue

@@ -160,24 +160,6 @@
       </footer>
     </modal>
 
-    <modal v-show="notReportShow" :show.sync="notReportShow" :backdrop="false">
-      <header slot="modal-header" class="text-center">
-        <h3>未上报用户提醒</h3>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <form class="form-horizontal">
-          <div class="row">
-            <div class="col-sm-12">
-              <span style="font-weight:normal">{{ notReportTitle }}</span>
-            </div>
-          </div>
-        </form>
-      </article>
-      <footer slot="modal-footer" style="height: 8vh" class="modal-footer">
-        <button class="button_search" @click="notReportShow = false">确认</button>
-      </footer>
-    </modal>
-
     <!-- 变更录入 模态框 -->
     <add-changemsg :show="AddChangeMsgShow" v-on:toggle="AddChangeMsgShow = false"></add-changemsg>
     <!-- 修改密码组件 -->
@@ -202,19 +184,19 @@ import vue from 'vue'
 import co from 'co'
 import {HttpResetClass} from "vue-client";
 
-// let getwartermakr = async function (self) {
-//   let param = {
-//     tablename: 't_singlevalue',
-//     condition: " 1=1 and name=\'水印内容\'"
-//   };
-//   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
-//   if (result && result.data.length > 0) {
-//     self.showwatermakeflag = true;
-//     createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
-//   } else {
-//     self.showwatermakeflag = false;
-//   }
-// }
+let getwartermakr = async function (self) {
+  let param = {
+    tablename: 't_singlevalue',
+    condition: " 1=1 and name=\'水印内容\'"
+  };
+  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  if (result && result.data.length > 0) {
+    self.showwatermakeflag = true;
+    createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
+  } else {
+    self.showwatermakeflag = false;
+  }
+}
 
 let createWaterMark = function (userName) {
   let style;
@@ -273,8 +255,6 @@ let createWaterMark = function (userName) {
           // img2: '/images/lefticon/退出系统.png',
         },
         treeOrIcon: false,
-        notReportTitle: '',
-        notReportShow: false,
         qrCode:false,
         isManger: false,
         show: false,
@@ -296,7 +276,7 @@ let createWaterMark = function (userName) {
       }
     },
     ready() {
-      // getwartermakr(this);
+      getwartermakr(this);
       let component = this.$login.getUrlCompileParames('component')
       if (component) {
         this.isManger = true
@@ -355,28 +335,10 @@ let createWaterMark = function (userName) {
       if (this.config.approve) {
         this.getFlowList()
       }
-      if (this.config.isGetNotReport) {
-        this.getNotReport()
-      }
       // 获取卡表动态库到期时间
       this.getExpireDate()
     },
     methods: {
-      async getNotReport(){
-        this.notReportTitle = ''
-        let http = new HttpResetClass()
-        await http.load('POST', 'rs/sql/getNotReportUserCount', {}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          if (res.data.length > 0){
-            this.notReportTitle = `当前系统物联网表用户有${res.data[0].f_total_web_count}户，超过7天未上报有${res.data[0].f_greater_than_seven_days}户，7天及以内未上报有${res.data[0].f_less_than_orequalto_seven_days}户。如需查询详情，请到物联查询中“失联查询”获取详细信息！`
-          }
-        }).catch((e)=>{})
-        if(this.notReportTitle){
-          this.notReportShow = true
-        }
-      },
       getOrderList(){
         let times = this.config.times * 60 * 1000
         console.log("=定时提示间隔=", times)
@@ -544,13 +506,14 @@ let createWaterMark = function (userName) {
         }
         if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('派单员') !== -1){
           const data = {
-            condition:{
-              condition:`tswo.f_filiale_id = '${this.functions.orgid}'`,
-              sign:'1=1'
-            },
-            userid:this.functions.name
+            "condition":
+              {
+                "condition":" 1=1  and processins.activities[ state='开始活动' and (defname in('站点接单'))].count(*) > 0 ",
+                "sign":"1=1"
+              },
+            "userid":this.functions.name
           }
-          new HttpResetClass().load('POST','rs/sql/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
             if(res.data && res.data.n !== 0){
               this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
             }
@@ -558,7 +521,7 @@ let createWaterMark = function (userName) {
         }
       },
       openUrl() {
-        var url = `http://aote-office.8866.org:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
+        var url = `https://liuli.aofengcloud.com:31467`
         window.open(url, '_blank')
       },
       hindsetting() {

package/src/components/server/Login.vue

@@ -205,9 +205,7 @@ let saveGen = function *(self) {
     console.log(self.$login.depPrompt)
     // 弱口令验证
     //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]).{8,16}$/.test(self.model.password) &&
-        !/(123|234|345|456|567|678|789|012|abc|bcd|cde|def|efg|fgh|ghi|hij|ijk|jkl|klm|lmn|mno|nop|opq|pqr|qrs|rst|stu|tuv|uvw|vwx|wxy|xyz|321|432|543|654|765|876|987|cba|dcba)/i.test(self.model.password)
-    )) {
+    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
@@ -230,8 +228,8 @@ let saveGen = function *(self) {
       }
     }
   } catch (ret) {
-    self.$login.s = null
     console.error('登录失败', ret)
+    self.$login.s = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -244,11 +242,6 @@ let saveGen = function *(self) {
       msg = ret.data
     } else if (ret.status === 555) {
       msg = ret.data
-    } else if(ret.status === 789) {
-      yield self.$showMessage(msg='您的密码已过期，请及时修改！！！', ['confirm']).then(() => {
-        self.modifyPwShow = true
-      })
-      return
     }
     self.createCode()
     self.picLyanzhengma = ''
@@ -265,6 +258,20 @@ export default {
     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()
@@ -272,10 +279,8 @@ export default {
     })
     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{

package/src/components/server/ResSelect.vue

@@ -161,15 +161,6 @@
       'parentresid'(){
         this.dealdata()
       },
-      initresid: {
-        handler(newVal, oldVal) {
-          // 避免重复触发
-          if (JSON.stringify(newVal) === JSON.stringify(oldVal)) {
-            return;
-          }
-          this.dealdata();
-        },
-      }
     },
   }
 </script>

package/src/filiale/baole/Login.vue

@@ -235,6 +235,7 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -261,19 +262,19 @@ export default {
     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){}
+    // 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) {
@@ -282,10 +283,8 @@ export default {
     })
     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{

package/src/filiale/chengtou/Login.vue

@@ -233,6 +233,7 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -259,19 +260,19 @@ export default {
     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){}
+    // 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) {
@@ -280,10 +281,8 @@ export default {
     })
     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{

package/src/filiale/dongguan/Login.vue

@@ -239,6 +239,7 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -263,19 +264,19 @@ export default {
   title: '登录',
   async ready () {
     this.titleShow = true
-    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){}
+    // 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) {
@@ -284,10 +285,8 @@ export default {
     })
     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{

package/src/filiale/dongguan/Main.vue

@@ -313,7 +313,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/furuike/Login.vue

@@ -227,6 +227,7 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -292,19 +293,19 @@ export default {
       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){}
+      // 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) {
@@ -313,10 +314,8 @@ export default {
       })
       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{

package/src/filiale/furuike/Main.vue

@@ -425,7 +425,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/gehua/Main.vue

@@ -363,7 +363,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/konggang/Login.vue

@@ -217,6 +217,7 @@
 
     } catch (ret) {
       console.error('登录失败', ret)
+      self.$login.s = null
       let msg
       if (ret instanceof Error) {
         msg = ret
@@ -240,19 +241,19 @@
   export default {
     title: '登录',
     async ready () {
-      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){}
+      // 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) {
@@ -261,10 +262,8 @@
       })
       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{

package/src/filiale/qianneng/Login.vue

@@ -230,6 +230,7 @@ let saveGen = function *(self) {
     }
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -258,19 +259,19 @@ export default {
     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){}
+    // 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) {
@@ -294,10 +295,8 @@ export default {
       this.confirm()
     } else 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{

package/src/filiale/qianneng/Main.vue

@@ -359,12 +359,12 @@ export default {
         const data = {
           "condition":
             {
-              "condition":` 1=1 and tswo.f_filiale_id = '${this.$login.f.orgid}' `,
+              "condition":" 1=1 ",
               "sign":"1=1"
             },
           "userid":this.functions.name
         }
-        new HttpResetClass().load('POST','rs/sql/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+        new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
           if(res.data && res.data.n !== 0){
              this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
           }
@@ -372,7 +372,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {

package/src/filiale/rizhao/Login.vue

@@ -204,6 +204,7 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -227,19 +228,19 @@ let saveGen = function *(self) {
 export default {
   title: '登录',
   async ready () {
-    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){}
+    // 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) {
@@ -248,10 +249,8 @@ export default {
     })
     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{