system-clients 3.2.1-14 → 3.2.1-17

package/src/system.js

@@ -1,105 +1,109 @@
-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
-
-// /** **************************登录与主界面相关******************************/
-
-import login from './components/server/Login'
-import changeDeclare from './components/server/ChangeDeclare'
-import addChangemsg from './components/server/AddChangeMsg'
-import homePage from './components/Main'
-import leftTree from './components/server/LeftTree'
-import iconTree from './components/server/IconTree'
-import modifyPw from './components/server/ModifyPw'
-import LoadData from './components/server/LoadData'
-import RightTree from './components/server/RightTree'
-import TestRightTree from './components/server/TestRightTree'
-//资源选择
-import ResSelect from './components/server/ResSelect'
-import ResSelectGroup from './components/server/ResSelectGroup'
-
-//资源选择测试
-import TestResSelect from './components/server/TestResSelect'
-import RoleSelector from "./components/server/RoleSelector";
-export default function (val,filiale,showLogin) {
-  console.log(val,filiale,showLogin)
-  //验证码开关赋值
-  if(val!=null){
-    GetLoginInfoService.Verification=val
-  }
-  //登录提示赋值
-  if(showLogin!=null){
-    GetLoginInfoService.depPrompt=showLogin
-  }
-  Vue.use(GetLoginInfoService)
-  Vue.use(GetAppDataService)
-  Vue.use(HeatGetLoginInfoService)
-  Vue.use(HeatGetAppDataService)
-
-  Vue.component('login', login)
-  Vue.component('change-declare', changeDeclare)
-  Vue.component('add-changemsg', addChangemsg)
-  Vue.component('home-page', homePage)
-  Vue.component('left-tree', leftTree)
-  Vue.component('icon-tree', iconTree)
-  Vue.component('modify-pw', modifyPw)
-  Vue.component('load-data', LoadData)
-  Vue.component('right-tree', RightTree)
-  Vue.component('test-right-tree', TestRightTree)
-  Vue.component('role-selector', RoleSelector)
-  //资源选择
-  Vue.component('res-select', ResSelect)
-  Vue.component('res-select-group', ResSelectGroup)
- //资源选择测试
-  Vue.component('test-res-select', TestResSelect)
-
-  // 参数管理(新)
-  Vue.component('param-manage', (resolve) => { require(['./components/parammanage/ParamManage'], resolve) })
-  // 参数管理
-  Vue.component('param-page', (resolve) => { require(['./components/parammanage/ParamPage'], resolve) })
-  // 参数管理
-  Vue.component('single-page', (resolve) => { require(['./components/parammanage/SinglePage'], resolve) })
-
-  // 参数管理(旧)
-  Vue.component('param-manages', (resolve) => { require(['./components/parammanage/ParamManages'], resolve) })
-  // 参数管理
-  Vue.component('param-pages', (resolve) => { require(['./components/parammanage/ParamPages'], resolve) })
-  // 参数管理
-  Vue.component('single-pages', (resolve) => { require(['./components/parammanage/SinglePages'], resolve) })
-
-  // 终端管理
-  Vue.component('equipment-manage', (resolve) => { require(['./components/equipment/EquipmentManage'], resolve) })
-  // pc端控制
-  Vue.component('pc-manage', (resolve) => { require(['./components/equipment/PcManage'], resolve) })
-  // phone端控制
-  Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
-  // pos端控制
-  Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
-  // pos管理
-  Vue.component('pos-manage-both', (resolve) => { require(['./components/equipment/PosManageBoth'], resolve) })
-  // pos参数管理
-  Vue.component('pos-param-manage', (resolve) => { require(['./components/equipment/PosParamManage'], resolve) })
-
-  // 材料字典
-  Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
-  Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
-  // 图片查看器
-  Vue.component('image-viewer', (resolve) => { require(['./components/server/ImageViewer'], resolve) })
-  // 测试图片查看器
-  Vue.component('image-viewer-test', (resolve) => { require(['./components/server/ImageVieweTest'], resolve) })
-
-  //省市区、街道、小区、楼栋级联查询
-  Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
-
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/system`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
-}
+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
+
+// /** **************************登录与主界面相关******************************/
+
+import login from './components/server/Login'
+import changeDeclare from './components/server/ChangeDeclare'
+import addChangemsg from './components/server/AddChangeMsg'
+import homePage from './components/Main'
+import leftTree from './components/server/LeftTree'
+import iconTree from './components/server/IconTree'
+import modifyPw from './components/server/ModifyPw'
+import LoadData from './components/server/LoadData'
+import RightTree from './components/server/RightTree'
+import TestRightTree from './components/server/TestRightTree'
+//资源选择
+import ResSelect from './components/server/ResSelect'
+import ResSelectGroup from './components/server/ResSelectGroup'
+
+//资源选择测试
+import TestResSelect from './components/server/TestResSelect'
+import RoleSelector from "./components/server/RoleSelector";
+export default function (val,filiale,showLogin,show_daiBan) {
+  console.log(val,filiale,showLogin)
+  //验证码开关赋值
+  if(val!=null){
+    GetLoginInfoService.Verification=val
+  }
+  //登录提示赋值
+  if(showLogin!=null){
+    GetLoginInfoService.depPrompt=showLogin
+  }
+  //展示待办赋值
+  if(show_daiBan!=null){
+    GetLoginInfoService.showDaiBan=!!show_daiBan
+  }
+  Vue.use(GetLoginInfoService)
+  Vue.use(GetAppDataService)
+  Vue.use(HeatGetLoginInfoService)
+  Vue.use(HeatGetAppDataService)
+
+  Vue.component('login', login)
+  Vue.component('change-declare', changeDeclare)
+  Vue.component('add-changemsg', addChangemsg)
+  Vue.component('home-page', homePage)
+  Vue.component('left-tree', leftTree)
+  Vue.component('icon-tree', iconTree)
+  Vue.component('modify-pw', modifyPw)
+  Vue.component('load-data', LoadData)
+  Vue.component('right-tree', RightTree)
+  Vue.component('test-right-tree', TestRightTree)
+  Vue.component('role-selector', RoleSelector)
+  //资源选择
+  Vue.component('res-select', ResSelect)
+  Vue.component('res-select-group', ResSelectGroup)
+ //资源选择测试
+  Vue.component('test-res-select', TestResSelect)
+
+  // 参数管理(新)
+  Vue.component('param-manage', (resolve) => { require(['./components/parammanage/ParamManage'], resolve) })
+  // 参数管理
+  Vue.component('param-page', (resolve) => { require(['./components/parammanage/ParamPage'], resolve) })
+  // 参数管理
+  Vue.component('single-page', (resolve) => { require(['./components/parammanage/SinglePage'], resolve) })
+
+  // 参数管理(旧)
+  Vue.component('param-manages', (resolve) => { require(['./components/parammanage/ParamManages'], resolve) })
+  // 参数管理
+  Vue.component('param-pages', (resolve) => { require(['./components/parammanage/ParamPages'], resolve) })
+  // 参数管理
+  Vue.component('single-pages', (resolve) => { require(['./components/parammanage/SinglePages'], resolve) })
+
+  // 终端管理
+  Vue.component('equipment-manage', (resolve) => { require(['./components/equipment/EquipmentManage'], resolve) })
+  // pc端控制
+  Vue.component('pc-manage', (resolve) => { require(['./components/equipment/PcManage'], resolve) })
+  // phone端控制
+  Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
+  // pos端控制
+  Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
+  // pos管理
+  Vue.component('pos-manage-both', (resolve) => { require(['./components/equipment/PosManageBoth'], resolve) })
+  // pos参数管理
+  Vue.component('pos-param-manage', (resolve) => { require(['./components/equipment/PosParamManage'], resolve) })
+
+  // 材料字典
+  Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
+  Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
+  // 图片查看器
+  Vue.component('image-viewer', (resolve) => { require(['./components/server/ImageViewer'], resolve) })
+  // 测试图片查看器
+  Vue.component('image-viewer-test', (resolve) => { require(['./components/server/ImageVieweTest'], resolve) })
+
+  //省市区、街道、小区、楼栋级联查询
+  Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
+
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/system`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/yarn-error.log

@@ -1,130 +1,130 @@
-Arguments: 
-  D:\Tools\NodeJs\node.exe C:\Users\Zhang\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js install
-
-PATH: 
-  E:\app\product\11.2.0\dbhome_1\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;D:\Tools\NodeJs\;D:\Tools\Git\cmd;D:\Tools\Java\bin;D:\Tools\Java\jre\bin;D:\Tools\platform-tools;D:\Tools\Go\bin;E:\goProject;D:\Tools\apache-maven-3.8.1\bin\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;D:\Tools\platform-tools_r31.0.3-windows\platform-tools\;C:\Users\Zhang\AppData\Local\Microsoft\WindowsApps;C:\Users\Zhang\AppData\Roaming\npm;C:\Program Files\Bandizip\;D:\Program Files\JetBrains\WebStorm\bin;;D:\Program Files\JetBrains\DataGrip\bin;;D:\Program Files\JetBrains\IntelliJ IDEA 212.4746.2\bin;;D:\Program Files\Microsoft VS Code\bin;C:\Users\Zhang\go\bin;D:\Program Files\JetBrains\GoLand 2021.1.3\bin;;;D:\Program Files\Fiddler
-
-Yarn version: 
-  1.22.10
-
-Node version: 
-  14.17.2
-
-Platform: 
-  win32 x64
-
-Trace: 
-  Error: read ECONNRESET
-      at TLSWrap.onStreamRead (internal/stream_base_commons.js:209:20)
-
-npm manifest: 
-  {
-    "name": "system-clients",
-    "version": "3.1.89-20",
-    "description": "系统基础框架",
-    "main": "src/index.js",
-    "directories": {
-      "example": "examples",
-      "test": "test"
-    },
-    "scripts": {
-      "example": "node build/example-server.js",
-      "dev": "node build/dev-server.js",
-      "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-      "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-      "e2e": "node test/e2e/runner.js",
-      "unit": "karma start test/unit/karma.conf.js",
-      "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
-    },
-    "dependencies": {
-      "base64-js": "^1.3.0",
-      "js-base64": "^2.4.9",
-      "jsencrypt": "^3.0.0-rc.1",
-      "less": "^2.7.1",
-      "less-loader": "^2.2.3",
-      "src": "^1.1.2",
-      "vue": "^1.0.17"
-    },
-    "devDependencies": {
-      "babel-core": "^6.0.0",
-      "babel-loader": "^6.0.0",
-      "babel-plugin-transform-runtime": "^6.0.0",
-      "babel-preset-es2015": "^6.0.0",
-      "babel-preset-stage-2": "^6.0.0",
-      "chai": "^3.5.0",
-      "connect-history-api-fallback": "^1.1.0",
-      "cross-env": "^1.0.7",
-      "cross-spawn": "^2.1.5",
-      "css-loader": "^0.23.0",
-      "eslint": "^2.0.0",
-      "eslint-config-standard": "^5.1.0",
-      "eslint-friendly-formatter": "^1.2.2",
-      "eslint-loader": "^1.3.0",
-      "eslint-plugin-html": "^1.3.0",
-      "eslint-plugin-promise": "^1.0.8",
-      "eslint-plugin-standard": "^1.3.2",
-      "eslint-plugin-vue": "^0.1.1",
-      "eventsource-polyfill": "^0.9.6",
-      "express": "^4.13.3",
-      "extract-text-webpack-plugin": "^1.0.1",
-      "file-loader": "^0.8.4",
-      "function-bind": "^1.0.2",
-      "html-webpack-plugin": "^2.8.1",
-      "http-proxy-middleware": "^0.11.0",
-      "inject-loader": "^2.0.1",
-      "isparta-loader": "^2.0.0",
-      "jasmine-core": "^2.4.1",
-      "jquery": "^3.3.1",
-      "json-loader": "^0.5.4",
-      "karma": "^1.4.1",
-      "karma-chrome-launcher": "^2.2.0",
-      "karma-coverage": "^1.1.1",
-      "karma-mocha": "^1.3.0",
-      "karma-sinon-chai": "^1.3.1",
-      "karma-sourcemap-loader": "^0.3.7",
-      "karma-spec-reporter": "0.0.31",
-      "karma-webpack": "^2.0.2",
-      "manage-client": "^1.4.20",
-      "mkdirp": "^0.5.1",
-      "mocha": "^3.2.0",
-      "ncp": "^2.0.0",
-      "nightwatch": "^0.8.18",
-      "rimraf": "^2.5.0",
-      "selenium-server": "2.52.0",
-      "sinon": "^2.1.0",
-      "sinon-chai": "^2.8.0",
-      "style": "0.0.3",
-      "style-loader": "^0.20.3",
-      "url-loader": "^0.5.7",
-      "vue-client": "1.24.33",
-      "vue-hot-reload-api": "^1.2.0",
-      "vue-html-loader": "^1.0.0",
-      "vue-loader": "^8.2.1",
-      "vue-resource": "^1.5.0",
-      "vue-router": "^0.7.13",
-      "vue-strap": "^1.0.9",
-      "vue-style-loader": "^1.0.0",
-      "vue-validator": "2.1.7",
-      "webpack": "^1.12.2",
-      "webpack-dev-middleware": "^1.4.0",
-      "webpack-hot-middleware": "^2.6.0",
-      "webpack-merge": "^0.8.3"
-    },
-    "repository": {
-      "type": "git",
-      "url": "https://gitee.com/aotu/System"
-    },
-    "keywords": [
-      "system_clients"
-    ],
-    "author": "杨文宇",
-    "license": "ISC"
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
+Arguments: 
+  D:\Tools\NodeJs\node.exe C:\Users\Zhang\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js install
+
+PATH: 
+  E:\app\product\11.2.0\dbhome_1\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;D:\Tools\NodeJs\;D:\Tools\Git\cmd;D:\Tools\Java\bin;D:\Tools\Java\jre\bin;D:\Tools\platform-tools;D:\Tools\Go\bin;E:\goProject;D:\Tools\apache-maven-3.8.1\bin\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;D:\Tools\platform-tools_r31.0.3-windows\platform-tools\;C:\Users\Zhang\AppData\Local\Microsoft\WindowsApps;C:\Users\Zhang\AppData\Roaming\npm;C:\Program Files\Bandizip\;D:\Program Files\JetBrains\WebStorm\bin;;D:\Program Files\JetBrains\DataGrip\bin;;D:\Program Files\JetBrains\IntelliJ IDEA 212.4746.2\bin;;D:\Program Files\Microsoft VS Code\bin;C:\Users\Zhang\go\bin;D:\Program Files\JetBrains\GoLand 2021.1.3\bin;;;D:\Program Files\Fiddler
+
+Yarn version: 
+  1.22.10
+
+Node version: 
+  14.17.2
+
+Platform: 
+  win32 x64
+
+Trace: 
+  Error: read ECONNRESET
+      at TLSWrap.onStreamRead (internal/stream_base_commons.js:209:20)
+
+npm manifest: 
+  {
+    "name": "system-clients",
+    "version": "3.1.89-20",
+    "description": "系统基础框架",
+    "main": "src/index.js",
+    "directories": {
+      "example": "examples",
+      "test": "test"
+    },
+    "scripts": {
+      "example": "node build/example-server.js",
+      "dev": "node build/dev-server.js",
+      "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+      "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+      "e2e": "node test/e2e/runner.js",
+      "unit": "karma start test/unit/karma.conf.js",
+      "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
+    },
+    "dependencies": {
+      "base64-js": "^1.3.0",
+      "js-base64": "^2.4.9",
+      "jsencrypt": "^3.0.0-rc.1",
+      "less": "^2.7.1",
+      "less-loader": "^2.2.3",
+      "src": "^1.1.2",
+      "vue": "^1.0.17"
+    },
+    "devDependencies": {
+      "babel-core": "^6.0.0",
+      "babel-loader": "^6.0.0",
+      "babel-plugin-transform-runtime": "^6.0.0",
+      "babel-preset-es2015": "^6.0.0",
+      "babel-preset-stage-2": "^6.0.0",
+      "chai": "^3.5.0",
+      "connect-history-api-fallback": "^1.1.0",
+      "cross-env": "^1.0.7",
+      "cross-spawn": "^2.1.5",
+      "css-loader": "^0.23.0",
+      "eslint": "^2.0.0",
+      "eslint-config-standard": "^5.1.0",
+      "eslint-friendly-formatter": "^1.2.2",
+      "eslint-loader": "^1.3.0",
+      "eslint-plugin-html": "^1.3.0",
+      "eslint-plugin-promise": "^1.0.8",
+      "eslint-plugin-standard": "^1.3.2",
+      "eslint-plugin-vue": "^0.1.1",
+      "eventsource-polyfill": "^0.9.6",
+      "express": "^4.13.3",
+      "extract-text-webpack-plugin": "^1.0.1",
+      "file-loader": "^0.8.4",
+      "function-bind": "^1.0.2",
+      "html-webpack-plugin": "^2.8.1",
+      "http-proxy-middleware": "^0.11.0",
+      "inject-loader": "^2.0.1",
+      "isparta-loader": "^2.0.0",
+      "jasmine-core": "^2.4.1",
+      "jquery": "^3.3.1",
+      "json-loader": "^0.5.4",
+      "karma": "^1.4.1",
+      "karma-chrome-launcher": "^2.2.0",
+      "karma-coverage": "^1.1.1",
+      "karma-mocha": "^1.3.0",
+      "karma-sinon-chai": "^1.3.1",
+      "karma-sourcemap-loader": "^0.3.7",
+      "karma-spec-reporter": "0.0.31",
+      "karma-webpack": "^2.0.2",
+      "manage-client": "^1.4.20",
+      "mkdirp": "^0.5.1",
+      "mocha": "^3.2.0",
+      "ncp": "^2.0.0",
+      "nightwatch": "^0.8.18",
+      "rimraf": "^2.5.0",
+      "selenium-server": "2.52.0",
+      "sinon": "^2.1.0",
+      "sinon-chai": "^2.8.0",
+      "style": "0.0.3",
+      "style-loader": "^0.20.3",
+      "url-loader": "^0.5.7",
+      "vue-client": "1.24.33",
+      "vue-hot-reload-api": "^1.2.0",
+      "vue-html-loader": "^1.0.0",
+      "vue-loader": "^8.2.1",
+      "vue-resource": "^1.5.0",
+      "vue-router": "^0.7.13",
+      "vue-strap": "^1.0.9",
+      "vue-style-loader": "^1.0.0",
+      "vue-validator": "2.1.7",
+      "webpack": "^1.12.2",
+      "webpack-dev-middleware": "^1.4.0",
+      "webpack-hot-middleware": "^2.6.0",
+      "webpack-merge": "^0.8.3"
+    },
+    "repository": {
+      "type": "git",
+      "url": "https://gitee.com/aotu/System"
+    },
+    "keywords": [
+      "system_clients"
+    ],
+    "author": "杨文宇",
+    "license": "ISC"
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
   # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
   # yarn lockfile v1
   
@@ -6893,4 +6893,4 @@ Lockfile:
   
   yeast@0.1.2:
     version "0.1.2"
-    resolved "http://registry.npm.taobao.org/yeast/download/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+    resolved "http://registry.npm.taobao.org/yeast/download/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"