system-clients 3.1.81 → 3.1.82-xianyang

package/src/plugins/validation.js

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

package/src/stores/HeatAppData.js

@@ -1,38 +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
+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/system.js

@@ -26,11 +26,15 @@ import ResSelectGroup from './components/server/ResSelectGroup'
 //资源选择测试
 import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
-export default function (val) {
+export default function (val,version) {
   //验证码开关赋值
   if(val!=null){
     GetLoginInfoService.Verification=val
   }
+  //版本号赋值
+  if(val!=null){
+    GetLoginInfoService.version=version
+  }
   Vue.use(GetLoginInfoService)
   Vue.use(GetAppDataService)
   Vue.use(HeatGetLoginInfoService)
@@ -75,6 +79,8 @@ export default function (val) {
   Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
   // pos端控制
   Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
+  // pos端控制
+  Vue.component('qc-manage', (resolve) => { require(['./components/equipment/QCManage'], resolve) })
 
   // 材料字典
   Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], 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

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Mar 13 10:30:51 GMT+08:00 2020
-gradle.version=3.5

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-