system-clients 3.0.47 → 3.0.48-fanxian

package/src/plugins/GetLoginInfoService.js

@@ -9,17 +9,28 @@ let loginGen = async function (name, password) {
   encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
   console.log(data)
 
-  let getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null}, 'RSA')
+  const  getLogin = await Vue.resetpost('/rs/logic/getLogin', data, {resolveMsg: null, rejectMsg: null}, 'RSA')
   if (getLogin.data.states === '登录成功') {
     // 调用远程登录服务，获取所有有权访问的功能
     data = {username: name, password: password}
     data = encrypt.encrypt(JSON.stringify(data))
-    let resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
+    const resource = await Vue.resetpost(`/rs/user/userLogin/客服系统`, data, {
       resolveMsg: null,
       rejectMsg: null
     })
+    // 兼容旧版ldao
+    if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg && resource.data.code !== 200) {
+      throw {status: 555, data: resource.data.msg}
+    }
+
     console.log('登陆获取Util', JSON.stringify(resource.data))
-    Vue.$login.f = resource.data
+    // 兼容旧版ldao，旧版不返回code
+    if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg) {
+      Vue.$login.f = resource.data.data
+    } else {
+      Vue.$login.f = resource.data
+    }
+
     //获取jwt
     Vue.$login.jwt = getLogin.data.jwt
     // 把登录用户添加到cookie里
@@ -111,21 +122,6 @@ let loginGen = async function (name, password) {
       }catch (error) {
         Vue.$login.f.f_changemeterman = []
         console.log('换表员模块',error)
-      }
-	   // 获取资源服务权限
-      try {
-        let getLic = await Vue.resetpost('/rs/search', {data: {
-		  source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($资源操作$) != -1)',
-		  userid: Vue.$login.f.id
-		}}, {resolveMsg: null, rejectMsg: null})
-		let arry=[]
-		getLic.data.forEach((item) => {
-		  arry.push(item.name)
-		})
-		Vue.$login.f.lics=arry
-      }catch (error) {
-        Vue.$login.f.f_gasman = []
-        console.log('资源服务权限',error)
       }
       // 票据使用人
       try {

package/src/system.js

@@ -59,6 +59,8 @@ export default function (val) {
   Vue.component('param-pages', (resolve) => { require(['./components/parammanage/ParamPages'], resolve) })
   // 参数管理
   Vue.component('single-pages', (resolve) => { require(['./components/parammanage/SinglePages'], resolve) })
+  // 异常报警信息
+  Vue.component('alarm-information', (resolve) => { require(['./components/parammanage/AlarmInformation'], resolve) })
 
   // 终端管理
   Vue.component('equipment-manage', (resolve) => { require(['./components/equipment/EquipmentManage'], resolve) })

package/test/unit/karma.conf.js

@@ -1,49 +1,49 @@
-// This is a karma config file. For more details see
-//   http://karma-runner.github.io/0.13/config/configuration-file.html
-// we are also using it with karma-webpack
-//   https://github.com/webpack/karma-webpack
-
-var webpackConfig = require('../../build/webpack.test.conf')
-
-module.exports = function (config) {
-  config.set({
-    customContextFile: './test.html',
-    // to run in additional browsers:
-    // 1. install corresponding karma launcher
-    //    http://karma-runner.github.io/0.13/config/browsers.html
-    // 2. add it to the `browsers` array below.
-    browsers: ['Chrome_without_security'],
-    customLaunchers: {
-      Chrome_without_security: {
-        base: 'Chrome',
-        flags: ['--disable-web-security']
-      }
-    },
-    proxies: {
-      //'/rs': 'http://202.108.65.218:9001/rs',
-      // '/rs': 'http://127.0.0.1:8080/rs',
-      '/rs': 'http://192.168.50.222:8300/rs',
-      //'/rs/report': 'http://127.0.0.1:8080/rs/report',
-      //'/rs/logic/getLogin': 'http://127.0.0.1:8080/rs/logic/getLogin'
-      // '/rs/logic': 'http://127.0.0.1:8888/product/rs/logic',
-    },
-    autoWatch: true,
-    frameworks: ['mocha', 'sinon-chai'],
-    reporters: ['spec', 'coverage'],
-    files: ['./index.js'],
-    preprocessors: {
-      './index.js': ['webpack', 'sourcemap']
-    },
-    webpack: webpackConfig,
-    webpackMiddleware: {
-      noInfo: true
-    },
-    coverageReporter: {
-      dir: './coverage',
-      reporters: [
-        { type: 'lcov', subdir: '.' },
-        { type: 'text-summary' }
-      ]
-    }
-  })
-}
+// This is a karma config file. For more details see
+//   http://karma-runner.github.io/0.13/config/configuration-file.html
+// we are also using it with karma-webpack
+//   https://github.com/webpack/karma-webpack
+
+var webpackConfig = require('../../build/webpack.test.conf')
+
+module.exports = function (config) {
+  config.set({
+    customContextFile: './test.html',
+    // to run in additional browsers:
+    // 1. install corresponding karma launcher
+    //    http://karma-runner.github.io/0.13/config/browsers.html
+    // 2. add it to the `browsers` array below.
+    browsers: ['Chrome_without_security'],
+    customLaunchers: {
+      Chrome_without_security: {
+        base: 'Chrome',
+        flags: ['--disable-web-security']
+      }
+    },
+    proxies: {
+      //'/rs': 'http://202.108.65.218:9001/rs',
+      // '/rs': 'http://127.0.0.1:8080/rs',
+      '/rs': 'http://192.168.50.222:8300/rs',
+      //'/rs/report': 'http://127.0.0.1:8080/rs/report',
+      //'/rs/logic/getLogin': 'http://127.0.0.1:8080/rs/logic/getLogin'
+      // '/rs/logic': 'http://127.0.0.1:8888/product/rs/logic',
+    },
+    autoWatch: true,
+    frameworks: ['mocha', 'sinon-chai'],
+    reporters: ['spec', 'coverage'],
+    files: ['./index.js'],
+    preprocessors: {
+      './index.js': ['webpack', 'sourcemap']
+    },
+    webpack: webpackConfig,
+    webpackMiddleware: {
+      noInfo: true
+    },
+    coverageReporter: {
+      dir: './coverage',
+      reporters: [
+        { type: 'lcov', subdir: '.' },
+        { type: 'text-summary' }
+      ]
+    }
+  })
+}

package/test/unit/specs/components/parammanage/ParamPage.spec.js

@@ -1,20 +1,20 @@
-import Vue from 'vue'
-import init from 'test/unit/init'
-import { TestUtil } from 'vue-client'
-
-import ParamPage from 'src/components/parammanage/ParamPage'
-
-describe('ParamPage: 参数管理', () => {
-  let vm = null
-  before(async function () {
-    init()
-    await Vue.$login.login('cdy', '1')
-  })
-
-  it.only('正确显示', async function() {
-    vm = await TestUtil.createAsyncTest(ParamPage, {
-    })
-  })
-
-})
-
+import Vue from 'vue'
+import init from 'test/unit/init'
+import { TestUtil } from 'vue-client'
+
+import ParamPage from 'src/components/parammanage/ParamPage'
+
+describe('ParamPage: 参数管理', () => {
+  let vm = null
+  before(async function () {
+    init()
+    await Vue.$login.login('cdy', '1')
+  })
+
+  it.only('正确显示', async function() {
+    vm = await TestUtil.createAsyncTest(ParamPage, {
+    })
+  })
+
+})
+

package/test/unit/specs/components/server/LeftTree/LeftTree.spec.js

@@ -1,22 +1,22 @@
-import Vue from 'vue'
-import init from 'test/unit/init'
-import { TestUtil } from 'vue-client'
-import App from './App'
-
-describe('LeftTree: 功能树', () => {
-  let vm = null
-
-  before(async function() {
-    init()
-    await Vue.$login.login('hns', '1')
-  })
-
-  it('正确显示', function() {
-    vm = TestUtil.createTest(App, {})
-    let row = {data: {navigate: 'http://127.0.0.1:8084', name: '百度'}}
-    vm.$refs.tree.open(row)
-  })
-})
-
-// also see example testing a component with mocks at
-// https://github.com/vuejs/vue-loader-example/blob/master/test/unit/a.spec.js#L24-L49
+import Vue from 'vue'
+import init from 'test/unit/init'
+import { TestUtil } from 'vue-client'
+import App from './App'
+
+describe('LeftTree: 功能树', () => {
+  let vm = null
+
+  before(async function() {
+    init()
+    await Vue.$login.login('hns', '1')
+  })
+
+  it('正确显示', function() {
+    vm = TestUtil.createTest(App, {})
+    let row = {data: {navigate: 'http://127.0.0.1:8084', name: '百度'}}
+    vm.$refs.tree.open(row)
+  })
+})
+
+// also see example testing a component with mocks at
+// https://github.com/vuejs/vue-loader-example/blob/master/test/unit/a.spec.js#L24-L49