system-clients 3.2.2 → 3.2.3-aodeToV4

package/src/plugins/HeatGetLoginInfoService.js

@@ -0,0 +1,491 @@
+import Vue from 'vue'
+import JSEncrypt from 'jsencrypt'
+import {HttpResetClass} from 'vue-client'
+
+let loginGen = async function (name, password) {
+  let data = {name: name, password: password}
+  // rsa加密
+  let encrypt = new JSEncrypt();
+  encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
+  data = '$' + encrypt.encrypt(JSON.stringify(data));
+  console.log(data)
+
+  let getLogin = await Vue.resetpost('rs/heat/logic/getLogin', data, {resolveMsg: null, rejectMsg: null})
+  if (getLogin.data.states === '登录成功') {
+    // 调用远程登录服务，获取所有有权访问的功能
+    data = {username: name, password: password}
+    data = encrypt.encrypt(JSON.stringify(data))
+    let resource = await Vue.resetpost(`rs/heat/user/userLogin/客服系统`, data, {
+      resolveMsg: null,
+      rejectMsg: null
+    })
+    console.log('登陆获取Util', JSON.stringify(resource.data))
+    Vue.$loginHeat.f = resource.data
+    //获取jwt
+    Vue.$loginHeat.jwt = getLogin.data.jwt
+    // 把登录用户添加到cookie里
+    Vue.cookie.set('loginIdHeat', Vue.$loginHeat.f.id)
+    if (Vue.$loginHeat.f.id !== '11') {
+
+      try {
+        let getAllArea = await Vue.resetpost('rs/heat/search', {
+          source: 'this.getParentByType($organization$).getChildByName($区$).getChildren()',
+          userid: Vue.$loginHeat.f.id
+        }, {resolveMsg: null, rejectMsg: null})
+
+        let areaTemp = []
+        for (let i = 0; i < getAllArea.data.length; i++) {
+          let getSliceArea = await Vue.resetpost('rs/heat/search',
+            {source: 'this.getChildren()', userid: getAllArea.data[i].id},
+            {resolveMsg: null, rejectMsg: null})
+          let sliceTemp = []
+          for (let j = 0; j < getSliceArea.data.length; j++) {
+            sliceTemp.push({label: getSliceArea.data[j].name, value: getSliceArea.data[j].name})
+          }
+          areaTemp.push({label: getAllArea.data[i].name, value: sliceTemp})
+        }
+        Vue.$loginHeat.f.f_allArea = areaTemp
+      }catch (error) {
+        Vue.$loginHeat.f.f_allArea =[]
+        console.log('获取区县',error)
+      }
+
+      // 获取抄表员
+      try {
+        let getGasman = await Vue.resetpost('rs/heat/search', {
+          source: 'this.getParentByType($organization$).getChildByName($抄表员$).getUsers()',
+          userid: Vue.$loginHeat.f.id
+        }, {resolveMsg: null, rejectMsg: null})
+        let gasman = []
+        for (let i = 0; i < getGasman.data.length; i++) {
+          gasman.push(getGasman.data[i])
+        }
+        Vue.$loginHeat.f.f_gasman = gasman
+      }catch (error) {
+        Vue.$loginHeat.f.f_gasman = []
+        console.log('抄表员模块',error)
+      }
+
+
+      // 获取安装人
+      try {
+        let getInstallman = await Vue.resetpost('rs/heat/search', {
+          source: 'this.getParentByType($organization$).getChildByName($安装员$).getUsers()',
+          userid: Vue.$loginHeat.f.id
+        }, {resolveMsg: null, rejectMsg: null})
+        console.log('获取安装员', getInstallman)
+        let installman = []
+        for (let i = 0; i < getInstallman.data.length; i++) {
+          installman.push(getInstallman.data[i])
+        }
+        Vue.$loginHeat.f.f_installman = installman
+      }catch (error) {
+        Vue.$loginHeat.f.f_installman =[]
+        console.log('安装人模块',error)
+      }
+
+
+
+      // 获取换表员
+      try {
+        let getChangeMeterman = await Vue.resetpost('rs/heat/search', {
+          source: 'this.getParentByType($organization$).getChildByName($换表员$).getUsers()',
+          userid: Vue.$loginHeat.f.id
+        }, {resolveMsg: null, rejectMsg: null})
+        let changemeterman = []
+        for (let i = 0; i < getChangeMeterman.data.length; i++) {
+          changemeterman.push(getChangeMeterman.data[i])
+        }
+        Vue.$loginHeat.f.f_changemeterman = changemeterman
+      }catch (error) {
+        Vue.$loginHeat.f.f_changemeterman = []
+        console.log('换表员模块',error)
+      }
+
+
+      // 票据使用人
+      try {
+        let getPaperUseman = await Vue.resetpost('rs/heat/search', {
+          source: 'this.getParentByType($organization$).getChildByName($票据使用人$).getUsers()',
+          userid: Vue.$loginHeat.f.id
+        }, {resolveMsg: null, rejectMsg: null})
+        let perperuseman = []
+        for (let i = 0; i < getPaperUseman.data.length; i++) {
+          perperuseman.push(getPaperUseman.data[i])
+        }
+        Vue.$loginHeat.f.f_paperUseman = perperuseman
+      }catch (error) {
+        Vue.$loginHeat.f.f_paperUseman = []
+        console.log('票据使用人模块',error)
+
+      }
+
+
+      // 票据分配人
+      try {
+        let getPaperAllotman = await Vue.resetpost('rs/heat/search', {
+          source: 'this.getParentByType($organization$).getChildByName($票据分配人$).getUsers()',
+          userid: Vue.$loginHeat.f.id
+        }, {resolveMsg: null, rejectMsg: null})
+        let paperallotman = []
+        for (let i = 0; i < getPaperAllotman.data.length; i++) {
+          paperallotman.push(getPaperAllotman.data[i])
+        }
+        Vue.$loginHeat.f.f_paperAllotman = paperallotman
+      }catch (error) {
+        Vue.$loginHeat.f.f_paperAllotman = []
+        console.log('票据分配人模块',error)
+      }
+
+
+      // TODO 处理界面细节
+      try {
+        let viewDetails = await Vue.resetpost('rs/heat/search', {
+          source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
+          userid: Vue.$loginHeat.f.id
+        }, {resolveMsg: null, rejectMsg: null})
+        let r = viewDetails.data
+        Vue.$loginHeat.r = []
+        r.forEach(x => Vue.$loginHeat.r.push(x.name))
+      }catch (error) {
+        Vue.$loginHeat.r = []
+        console.log('加载模块失败',error)
+      }
+
+      // 调用登录后处理
+      for(let proc of Vue.$loginHeat.afterLogin) {
+        await proc(Vue.$loginHeat.f)
+      }
+
+      // 定时发送心跳
+      setInterval(()=> {
+        let http = new HttpResetClass()
+        http.load('GET', `rs/user/access/${Vue.$loginHeat.f.id}`, {}, {resolveMsg: null, rejectMsg: null})
+      }, 2 * 60 * 1000)
+    }
+  } else {
+    let error = {status: 401, data: getLogin.data.states}
+    // 抛出错误
+    throw error
+  }
+}
+
+let GetLoginInfoService = {
+  // 登录后要处理的异步对象
+  afterLogin: [],
+
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.$loginHeat = Vue.prototype.$loginHeat = GetLoginInfoService
+  },
+
+  f: {
+
+  },
+
+  /**
+   * 登录
+   * @param name
+   * @param password
+   */
+  login (name, password) {
+    return loginGen(name, password)
+  },
+
+  getAttendanceState (item, timeToWork, timeToGo) {
+    item.f_state = ''
+    if (!item.f_signin_time || !item.f_knockoff_time) {
+      item.f_state = '缺勤'
+    } else {
+      let signin_time = item.f_signin_time.substring(11, 16)
+      let knockoff_time = item.f_knockoff_time.substring(11, 16)
+      if (signin_time > timeToWork) {
+        item.f_state = '迟到'
+      }
+      if (knockoff_time < timeToGo) {
+        item.f_state = item.f_state + '早退'
+      }
+    }
+    if (!item.f_state) {
+      item.f_state = '正常'
+    }
+  },
+
+  toStandardYearMonth () {
+    let dt = new Date()
+    let month = dt.getMonth() + 1
+    return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month)
+  },
+
+  toStandardYearMonth1 () {
+    let dt = new Date()
+    let month = dt.getMonth() + 1
+    return dt.getFullYear() + (month < 10 ? '0' + month : month)
+  },
+
+  toStandardDateString () {
+    let dt = new Date()
+    let month = dt.getMonth() + 1
+    let date = dt.getDate()
+    return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+  },
+
+  toStartAndEndDateString () {
+    let dt = new Date()
+    let month = dt.getMonth() + 1
+    // let date = dt.getDate()
+    return [dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-01',
+      dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (new Date(dt.getFullYear(), month, 0).getDate())]
+    // return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+  },
+
+  toStandardTimeString () {
+    let dt = new Date()
+    let month = dt.getMonth() + 1
+    let date = dt.getDate()
+    let hour = dt.getHours()
+    let min = dt.getMinutes()
+    let sec = dt.getSeconds()
+    return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
+      ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+  },
+
+  guid () {
+    let buf = new Uint16Array(8)
+    window.crypto.getRandomValues(buf)
+    let S4 = function (num) {
+      let ret = num.toString(16)
+      while (ret.length < 4) {
+        ret = '0' + ret
+      }
+      return ret
+    }
+    return (S4(buf[0]) + S4(buf[1]) + S4(buf[2]) + S4(buf[3]) + S4(buf[4]) + S4(buf[5]) + S4(buf[6]) + S4(buf[7]))
+  },
+
+  choices (role, param, hasBlank = false, blankHint = '请选择') {
+    if (role == 'view') {
+      Vue.getParams(param, [null])
+    } else {
+      let result = []
+      if (hasBlank)
+        result.push({label: blankHint, value: null})
+      if (!Vue.param || !Vue.param[param])
+        result.push({label: '请在系统设置里更新参数', value: '请在系统设置里更新参数'})
+      else {
+        let p = Vue.param[param]
+        p.forEach(function (item) {
+          result.push({label: item.name, value: item.name})
+        })
+      }
+      return result
+    }
+  },
+
+  required (param) {
+    if (typeof param === 'number' && param == 0)
+      return false
+    if (!param)
+      return true
+    param = param + ''
+    param = param.trim()
+    if (!param)
+      return true
+    return false
+  },
+
+  isInt (n) {
+    return !window.isNaN(n) && n % 1 === 0
+  },
+
+  isFloat (n) {
+    return !window.isNaN(n)
+  },
+
+// this will convert all true/false to boolean
+  booleanFilter (paper) {
+    for (let key in paper) {
+      if (!paper.hasOwnProperty(key))
+        continue
+      if (typeof paper[key] == 'object' && paper[key] != null) {
+        booleanFilter(paper[key])
+      } else {
+        if (paper[key] === 'true' || paper[key] == 'false')
+          paper[key] = (paper[key] === 'true')
+      }
+    }
+  },
+// recursively traverse through each path
+  ratifyPics (paper) {
+    for (let key in paper) {
+      if (key.endsWith('_path')) {
+        if (!paper[key]) {
+          paper[key] = 'rs/db/file/nopic.png'
+        } else {
+          paper[key] = 'rs/db/file/' + paper[key]
+        }
+      } else if (paper[key] !== null && typeof (paper[key]) == 'object') {
+        ratifyPics(paper[key])
+      }
+    }
+  },
+
+// load script and other stuff
+  loadscript (type, fileName) {
+    return new Promise((resolve, reject) => {
+      let element
+      if (type == 'css') {
+        element = document.createElement('link')
+        element.setAttribute('rel', 'stylesheet')
+        element.setAttribute('type', 'text/css')
+        element.setAttribute('href', fileName)
+      } else if (type == 'js') {
+        element = document.createElement('script')
+        element.setAttribute('type', 'text/javascript')
+        element.setAttribute('src', fileName)
+      }
+      if (element) {
+        element.setAttribute('async', '')
+        element.setAttribute('defer', '')
+        element.addEventListener('load', function () {
+          resolve(element)
+        }, false)
+        element.addEventListener('error', function () {
+          reject(element)
+        }, false)
+        document.body.appendChild(element)
+      }
+    })
+  },
+// 不能选择器中截取掉多余的字符
+  orgName (name) {
+    return name.substring(10)
+  },
+
+  getNowDate (name) {
+    // 求取当前时间的工具
+    let myweekday = ''
+    let year = ''
+    let mydate = new Date()
+    myweekday = mydate.getDay()
+    let mymonth = mydate.getMonth() + 1
+    let myday = mydate.getDate()
+    let myyear = mydate.getYear()
+    year = (myyear > 200) ? myyear : 1900 + myyear
+    let week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期日', '星期六']
+    // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
+    return year + '年' + mymonth + '月' + myday + '日  ' + week[myweekday]
+  },
+
+  addDate (date, days) {
+    // 求取当前时间的工具
+    let endDate = new Date(date)
+    endDate = endDate.valueOf()
+    endDate = endDate + days * 24 * 60 * 60 * 1000
+    endDate = new Date(endDate)
+    let month = endDate.getMonth() + 1
+    let day = endDate.getDate()
+    let hour = endDate.getHours()
+    let min = endDate.getMinutes()
+    let sec = endDate.getSeconds()
+    return endDate.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) +
+      ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+    // return a
+  },
+
+// 通过地址栏的参数获取参数内容
+  getUrlParames (param) {
+    var query = window.location.search
+    var iLen = param.length
+    var iStart = query.indexOf(param)
+    if (iStart === -1) {
+      return ''
+    }
+    iStart += iLen + 1
+    var iEnd = query.indexOf('&', iStart)
+    if (iEnd === -1) {
+      return query.substring(iStart)
+    }
+    return query.substring(iStart, iEnd)
+  },
+
+// 从地址栏获取加密的参数
+  getUrlCompileParames (param) {
+    console.log('2222222', window.location.search.slice(1, window.location.search.length))
+    let code = unescape(window.location.search.slice(1, window.location.search.length))
+    let query = String.fromCharCode(code.charCodeAt(0) - code.length)
+    for (var i = 1; i < code.length; i++) {
+      query += String.fromCharCode(code.charCodeAt(i) - query.charCodeAt(i - 1))
+    }
+    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)
+  },
+
+// 对字符串进行加密
+  compileStr (code) {
+    let c = String.fromCharCode(code.charCodeAt(0) + code.length)
+    for (let i = 1; i < code.length; i++) {
+      c += String.fromCharCode(code.charCodeAt(i) + code.charCodeAt(i - 1))
+    }
+    return escape(c)
+  },
+// 字符串进行解密
+  uncompileStr (code) {
+    code = unescape(code)
+    let c = String.fromCharCode(code.charCodeAt(0) - code.length)
+    for (var i = 1; i < code.length; i++) {
+      c += String.fromCharCode(code.charCodeAt(i) - c.charCodeAt(i - 1))
+    }
+    return c
+  },
+
+  dateDescripte (date) {
+    let nowTime = new Date().getTime()
+    let oldTime = new Date(date).getTime()
+    let timeDiff = nowTime - oldTime
+    // 规则说明
+    // 小于等于2分钟为刚刚
+    // 大于2分钟小于等于1小时为取整的分钟前（例如：35分钟前）
+    // 大于1小时小于等于24小时为取整的小时前（例如：15小时前）
+    // 大于24小时小于等于30天为取整的天前（例如：12天前）
+    // 大于30天小于等于12月为取整的月前，月份统一为30天一月，不做额外处理（例如：3个月前）
+    // 大于365取整的年前，（例如：2年前）
+    let minute = 1000 * 60
+    let hour = minute * 60
+    let day = hour * 24
+    let month = day * 30
+    let year = month * 12
+    let des = ''
+    if (timeDiff <= minute * 2) {
+      des = '刚刚'
+    } else if (minute * 2 < timeDiff && timeDiff < hour) {
+      des = `${Math.floor(timeDiff / minute)}分钟前`
+    } else if (hour < timeDiff && timeDiff <= day) {
+      des = `${Math.floor(timeDiff / hour)}小时前`
+    } else if (day < timeDiff && timeDiff <= month) {
+      des = `${Math.floor(timeDiff / day)}天前`
+    } else if (month < timeDiff && timeDiff <= year) {
+      des = `${Math.floor(timeDiff / month)}个月前`
+    } else if (year < timeDiff) {
+      des = `${Math.floor(timeDiff / year)}年前`
+    }
+    return des
+  },
+
+  nextMonth20 (date) {
+    let ds = date.split('-')
+    let nextMonth = ds[1] - 0 + 1
+    return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
+  }
+}
+
+export default GetLoginInfoService

package/src/plugins/validation.js

@@ -3,5 +3,5 @@ import Validator from 'vue-validator'
 Vue.use(Validator)
 //密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
 Vue.validator('strongpassword', function (val) {
-  return /^(?:(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
+  return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
 });

package/src/project/State.js

@@ -4,7 +4,7 @@ export default class {
   constructor () {
     this.selected = null
     // 左侧项目树
-    this.projects = new TreeList('/rs/sql/project.sql')
+    this.projects = new TreeList('/api/af-system/sql/project.sql')
   }
 
   select (selected) {

package/src/stores/AppData.js

@@ -9,7 +9,7 @@ let GetAppDataService = {
 
   // 开启卡监听
   load () {
-    return Vue.resetpost('rs/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    return Vue.resetpost('api/af-system/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
         res.data.singleValues.forEach((item) => {
           this.singleValues[item.name] = item.value
         })

package/src/stores/HeatAppData.js

@@ -0,0 +1,38 @@
+import Vue from 'vue'
+
+let GetAppDataService = {
+  install(Vue, options) {
+    // 给vue增添对话框显示方法
+
+    Vue.$appdataHeat = Vue.prototype.$appdataHeat = GetAppDataService
+  },
+
+  // 开启卡监听
+  load () {
+    return Vue.resetpost('rs/heat/logic/getInitData', {data: {f_filialeids: Vue.$loginHeat.f.f_orgids}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.singleValues.forEach((item) => {
+        this.singleValues[item.name] = item.value
+      })
+      res.data.params.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        this.params[item.name] = value
+      })
+    })
+  },
+
+  params: {},
+  singleValues: {},
+
+  getParam(key) {
+    return this.params[key]
+  },
+  getSingleValue(key) {
+    return this.singleValues[key]
+  }
+}
+export default GetAppDataService

package/src/styles/less/aofeng/themeOne/systemStyle.less

@@ -333,7 +333,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left {
     float: left;
-    width: 8%;
+    width: 9%;
     height: 100%;
 
     .system-left-chi {
@@ -760,7 +760,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 9%;
+    width: 10%;
 
     height: 100%;
 
@@ -1193,7 +1193,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height: 100%;
     .system-left-chi{
       height: 96%;
@@ -1610,7 +1610,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height:100%;
     .system-left-chi{
       height: 96%;
@@ -2033,7 +2033,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height: 100%;
     .system-left-chi{
       height: 96%;
@@ -2448,7 +2448,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 12%;
+    width: 13%;
     height: 100%;
     .system-left-chi{
       height: 96%;

package/src/styles/less/aofeng/themeOne.less

@@ -8,7 +8,10 @@
 //功能内容标准
 @import "standard.less";
 
-
+.btn-gn {
+  font-size: 18px!important;
+  padding: 10px 16px!important;
+}
 //div{
 //  font-family: PingFang;
 //}

package/src/styles/less/fonts-list.less

@@ -8,18 +8,18 @@
 
 @font-face {
   font-family: 'PINGFANG-MEDIUM';  //重命名字体名
-  src: url('../fonts/pingfang-medium.ttf');  //引入字体
+  //src: url('../fonts/pingfang-medium.ttf');  //引入字体
 }
 @font-face {
   font-family: 'PINGFANG-BOLD';  //重命名字体名
-  src: url('../fonts/pingfang-bold.ttf');  //引入字体
+  //src: url('../fonts/pingfang-bold.ttf');  //引入字体
 }
 @font-face {
   font-family: 'PINGFANG-REGULAR';  //重命名字体名
-  src: url('../fonts/pingfang-regular.ttf');  //引入字体
+  //src: url('../fonts/pingfang-regular.ttf');  //引入字体
 }
 
 @font-face {
   font-family: PingFang;
-  src:url('../fonts/PingFangSC-Regular.ttf');
+  //src:url('../fonts/PingFangSC-Regular.ttf');
 }

package/src/styles/less/stand.less

@@ -1,7 +1,7 @@
 /*=========================通用样式表=========================*/
 @font-face {
   font-family: PingFang;
-  src:url('../fonts/PingFangSC-Regular.ttf');
+  //src:url('../fonts/PingFangSC-Regular.ttf');
 }
 
 

package/src/system.js

@@ -1,6 +1,11 @@
 import Vue from 'vue'
 import GetLoginInfoService from './plugins/GetLoginInfoService'
 import GetAppDataService from './stores/AppData'
+// 热力
+import HeatGetLoginInfoService from './plugins/HeatGetLoginInfoService'
+import HeatGetAppDataService from './stores/HeatAppData'
+// 热力登陆控制
+Vue.$heatCompatibility  = Vue.prototype.$heatCompatibility = false
 
 // /** **************************登录与主界面相关******************************/
 
@@ -21,6 +26,7 @@ import ResSelectGroup from './components/server/ResSelectGroup'
 //资源选择测试
 import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
+import NewResSelectGroup from "./components/server/NewResSelectGroup.vue";
 export default function (val) {
   //验证码开关赋值
   if(val!=null){
@@ -28,6 +34,8 @@ export default function (val) {
   }
   Vue.use(GetLoginInfoService)
   Vue.use(GetAppDataService)
+  Vue.use(HeatGetLoginInfoService)
+  Vue.use(HeatGetAppDataService)
 
   Vue.component('login', login)
   Vue.component('change-declare', changeDeclare)
@@ -43,6 +51,7 @@ export default function (val) {
   //资源选择
   Vue.component('res-select', ResSelect)
   Vue.component('res-select-group', ResSelectGroup)
+  Vue.component('new-select-group', NewResSelectGroup)
  //资源选择测试
   Vue.component('test-res-select', TestResSelect)