system-clients 3.1.94 → 3.1.95-aode

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/.eslintrc.js +16 -16
  2. package/build/webpack.base.conf.js +10 -17
  3. package/package.json +102 -102
  4. package/src/components/Main.vue +30 -107
  5. package/src/components/equipment/EquipmentManage.vue +1 -1
  6. package/src/components/equipment/PcAdd.vue +5 -5
  7. package/src/components/equipment/PcList.vue +5 -5
  8. package/src/components/equipment/PhoneAdd.vue +4 -4
  9. package/src/components/equipment/PhoneList.vue +4 -4
  10. package/src/components/equipment/PosAdd.vue +45 -231
  11. package/src/components/equipment/PosList.vue +68 -198
  12. package/src/components/equipment/PosManage.vue +9 -80
  13. package/src/components/parammanage/ParamManage.vue +2 -2
  14. package/src/components/parammanage/ParamPage.vue +7 -7
  15. package/src/components/parammanage/SinglePage.vue +4 -4
  16. package/src/components/server/Login.vue +42 -48
  17. package/src/components/server/ResSelect.vue +0 -5
  18. package/src/components/server/ResSelectGroup.vue +159 -196
  19. package/src/components/server/RightTree.vue +257 -262
  20. package/src/plugins/GetLoginInfoService.js +7 -7
  21. package/src/styles/less/aofeng/standard.less +60 -446
  22. package/src/styles/less/aofeng/themeOne/BinaryTemplate.less +686 -686
  23. package/src/styles/less/aofeng/themeOne/systemStyle.less +6 -6
  24. package/src/styles/less/tables.less +0 -50
  25. package/src/styles/less/type.less +3 -16
  26. package/src/styles/less/variables.less +3 -6
  27. package/src/system.js +0 -10
  28. package/static/aodelogo.png +0 -0
  29. package/static/aodenewlogo.png +0 -0
  30. package/static/{logo.png → ewmlogo.png} +0 -0
  31. package/.gradle/4.4/fileChanges/last-build.bin +0 -0
  32. package/.gradle/4.4/fileHashes/fileHashes.bin +0 -0
  33. package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
  34. package/.gradle/5.2.1/gc.properties +0 -0
  35. package/.gradle/vcs-1/gc.properties +0 -0
  36. package/src/components/TabButton.vue +0 -201
  37. package/src/components/Tabs.vue +0 -67
  38. package/src/components/equipment/PosManageBoth.vue +0 -125
  39. package/src/components/equipment/PosParamAdd.vue +0 -236
  40. package/src/components/equipment/PosParamList.vue +0 -121
  41. package/src/components/equipment/PosParamManage.vue +0 -51
  42. package/src/components/server/ImageVieweTest.vue +0 -56
  43. package/src/components/server/ImageViewer.vue +0 -350
  44. package/src/components/server/PcdBuildingSelect.vue +0 -241
  45. package/src/styles/less/manageStyle/manageStyle/manageChile.less +0 -180
  46. package/src/styles/less/manageStyle/manageStyle/manageStyle.less +0 -1102
  47. package/src/styles/less/manageStyle/manageStyle/safeStyle.less +0 -498
  48. package/static/newStyle/about-us.png +0 -0
  49. package/yarn-error.log +0 -6896
package/.eslintrc.js CHANGED
@@ -1,16 +1,16 @@
1
- // module.exports = {
2
- // root: true,
3
- // // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
4
- // extends: 'standard',
5
- // // required to lint *.vue files
6
- // plugins: [
7
- // 'eslint-plugin-html'
8
- // ],
9
- // // add your custom rules here
10
- // 'rules': {
11
- // // allow paren-less arrow functions
12
- // 'arrow-parens': 0,
13
- // // allow debugger during development
14
- // 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
15
- // }
16
- // }
1
+ module.exports = {
2
+ root: true,
3
+ // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
4
+ extends: 'standard',
5
+ // required to lint *.vue files
6
+ plugins: [
7
+ 'eslint-plugin-html'
8
+ ],
9
+ // add your custom rules here
10
+ 'rules': {
11
+ // allow paren-less arrow functions
12
+ 'arrow-parens': 0,
13
+ // allow debugger during development
14
+ 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
15
+ }
16
+ }
package/build/webpack.base.conf.js CHANGED
@@ -7,16 +7,16 @@ module.exports = {
7
7
  app: './src/main.js'
8
8
  },
9
9
  output: {
10
- path: path.resolve(__dirname, '../dist/mergeUser'),
11
- publicPath: 'mergeUser/',
10
+ path: path.resolve(__dirname, '../dist/static'),
11
+ publicPath: 'static/',
12
12
  filename: '[name].js'
13
13
  },
14
14
  resolve: {
15
15
  extensions: ['', '.js', '.vue'],
16
16
  fallback: [path.join(__dirname, '../node_modules')],
17
17
  alias: {
18
- 'src': path.resolve(__dirname, '../src'),
19
- 'test': path.resolve(__dirname, '../test')
18
+ 'test': path.resolve(__dirname, '../test'),
19
+ 'src': path.resolve(__dirname, '../src')
20
20
  }
21
21
  },
22
22
  resolveLoader: {
@@ -32,15 +32,12 @@ module.exports = {
32
32
  test: /\.js$/,
33
33
  loader: 'babel',
34
34
  include: [
35
- /src/,
36
- /build/,
37
- /examples/,
38
- /test/,
39
- /node_modules\/vue-client\/src/,
40
- /node_modules\/vue-strap\/src/,
41
- /node_modules\/system-clients\/src/,
42
- /node_modules\/ldap-clients\/src/,
43
- /node_modules\/address-client\/src/
35
+ `${projectRoot}\\src`,
36
+ `${projectRoot}\\build`,
37
+ `${projectRoot}\\examples`,
38
+ `${projectRoot}\\test`,
39
+ `${projectRoot}\\node_modules\\vue-client\\src`,
40
+ `${projectRoot}\\node_modules\\vue-strap\\src`
44
41
  ],
45
42
  options: {
46
43
  presets: ['es2015']
@@ -58,10 +55,6 @@ module.exports = {
58
55
  test: /\.less$/,
59
56
  loader: 'style!css!less'
60
57
  },
61
- {
62
- test: /\.css$/,
63
- loader: 'style!css'
64
- },
65
58
  {
66
59
  test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
67
60
  loader: 'url',
package/package.json CHANGED
@@ -1,102 +1,102 @@
1
- {
2
- "name": "system-clients",
3
- "version": "3.1.94",
4
- "description": "系统基础框架",
5
- "main": "src/index.js",
6
- "directories": {
7
- "example": "examples",
8
- "test": "test"
9
- },
10
- "scripts": {
11
- "example": "node build/example-server.js",
12
- "dev": "node build/dev-server.js",
13
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
14
- "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
15
- "e2e": "node test/e2e/runner.js",
16
- "unit": "karma start test/unit/karma.conf.js",
17
- "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
18
- },
19
- "dependencies": {
20
- "base64-js": "^1.3.0",
21
- "js-base64": "^2.4.9",
22
- "jsencrypt": "^3.0.0-rc.1",
23
- "less": "^2.7.1",
24
- "less-loader": "^2.2.3",
25
- "src": "^1.1.2",
26
- "vue": "^1.0.17"
27
- },
28
- "devDependencies": {
29
- "babel-core": "^6.0.0",
30
- "babel-loader": "^6.0.0",
31
- "babel-plugin-transform-runtime": "^6.0.0",
32
- "babel-preset-es2015": "^6.0.0",
33
- "babel-preset-stage-2": "^6.0.0",
34
- "chai": "^3.5.0",
35
- "connect-history-api-fallback": "^1.1.0",
36
- "cross-env": "^1.0.7",
37
- "cross-spawn": "^2.1.5",
38
- "css-loader": "^0.23.0",
39
- "eslint": "^2.0.0",
40
- "eslint-config-standard": "^5.1.0",
41
- "eslint-friendly-formatter": "^1.2.2",
42
- "eslint-loader": "^1.3.0",
43
- "eslint-plugin-html": "^1.3.0",
44
- "eslint-plugin-promise": "^1.0.8",
45
- "eslint-plugin-standard": "^1.3.2",
46
- "eslint-plugin-vue": "^0.1.1",
47
- "eventsource-polyfill": "^0.9.6",
48
- "express": "^4.13.3",
49
- "extract-text-webpack-plugin": "^1.0.1",
50
- "file-loader": "^0.8.4",
51
- "function-bind": "^1.0.2",
52
- "html-webpack-plugin": "^2.8.1",
53
- "http-proxy-middleware": "^0.11.0",
54
- "inject-loader": "^2.0.1",
55
- "isparta-loader": "^2.0.0",
56
- "jasmine-core": "^2.4.1",
57
- "jquery": "^3.3.1",
58
- "json-loader": "^0.5.4",
59
- "karma": "^1.4.1",
60
- "karma-chrome-launcher": "^2.2.0",
61
- "karma-coverage": "^1.1.1",
62
- "karma-mocha": "^1.3.0",
63
- "karma-sinon-chai": "^1.3.1",
64
- "karma-sourcemap-loader": "^0.3.7",
65
- "karma-spec-reporter": "0.0.31",
66
- "karma-webpack": "^2.0.2",
67
- "manage-client": "^1.4.20",
68
- "mkdirp": "^0.5.1",
69
- "mocha": "^3.2.0",
70
- "ncp": "^2.0.0",
71
- "nightwatch": "^0.8.18",
72
- "rimraf": "^2.5.0",
73
- "selenium-server": "2.52.0",
74
- "sinon": "^2.1.0",
75
- "sinon-chai": "^2.8.0",
76
- "style": "0.0.3",
77
- "style-loader": "^0.20.3",
78
- "url-loader": "^0.5.7",
79
- "vue-client": "1.24.33",
80
- "vue-hot-reload-api": "^1.2.0",
81
- "vue-html-loader": "^1.0.0",
82
- "vue-loader": "^8.2.1",
83
- "vue-resource": "^1.5.0",
84
- "vue-router": "^0.7.13",
85
- "vue-strap": "^1.0.9",
86
- "vue-style-loader": "^1.0.0",
87
- "vue-validator": "2.1.7",
88
- "webpack": "^1.12.2",
89
- "webpack-dev-middleware": "^1.4.0",
90
- "webpack-hot-middleware": "^2.6.0",
91
- "webpack-merge": "^0.8.3"
92
- },
93
- "repository": {
94
- "type": "git",
95
- "url": "https://gitee.com/aotu/System"
96
- },
97
- "keywords": [
98
- "system_clients"
99
- ],
100
- "author": "杨文宇",
101
- "license": "ISC"
102
- }
1
+ {
2
+ "name": "system-clients",
3
+ "version": "3.1.95-aode",
4
+ "description": "系统基础框架",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "example": "examples",
8
+ "test": "test"
9
+ },
10
+ "scripts": {
11
+ "example": "node build/example-server.js",
12
+ "dev": "node build/dev-server.js",
13
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
14
+ "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
15
+ "e2e": "node test/e2e/runner.js",
16
+ "unit": "karma start test/unit/karma.conf.js",
17
+ "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
18
+ },
19
+ "dependencies": {
20
+ "base64-js": "^1.3.0",
21
+ "js-base64": "^2.4.9",
22
+ "less": "^2.7.1",
23
+ "less-loader": "^2.2.3",
24
+ "src": "^1.1.2",
25
+ "vue": "^1.0.17"
26
+ },
27
+ "devDependencies": {
28
+ "babel-core": "^6.0.0",
29
+ "babel-loader": "^6.0.0",
30
+ "babel-plugin-transform-runtime": "^6.0.0",
31
+ "babel-preset-es2015": "^6.0.0",
32
+ "babel-preset-stage-2": "^6.0.0",
33
+ "chai": "^3.5.0",
34
+ "connect-history-api-fallback": "^1.1.0",
35
+ "cross-env": "^1.0.7",
36
+ "cross-spawn": "^2.1.5",
37
+ "css-loader": "^0.23.0",
38
+ "eslint": "^2.0.0",
39
+ "eslint-config-standard": "^5.1.0",
40
+ "eslint-friendly-formatter": "^1.2.2",
41
+ "eslint-loader": "^1.3.0",
42
+ "eslint-plugin-html": "^1.3.0",
43
+ "eslint-plugin-promise": "^1.0.8",
44
+ "eslint-plugin-standard": "^1.3.2",
45
+ "eslint-plugin-vue": "^0.1.1",
46
+ "eventsource-polyfill": "^0.9.6",
47
+ "express": "^4.13.3",
48
+ "extract-text-webpack-plugin": "^1.0.1",
49
+ "file-loader": "^0.8.4",
50
+ "function-bind": "^1.0.2",
51
+ "html-webpack-plugin": "^2.8.1",
52
+ "http-proxy-middleware": "^0.11.0",
53
+ "inject-loader": "^2.0.1",
54
+ "isparta-loader": "^2.0.0",
55
+ "jasmine-core": "^2.4.1",
56
+ "jquery": "^3.3.1",
57
+ "json-loader": "^0.5.4",
58
+ "karma": "^1.4.1",
59
+ "karma-chrome-launcher": "^2.2.0",
60
+ "karma-coverage": "^1.1.1",
61
+ "karma-mocha": "^1.3.0",
62
+ "karma-sinon-chai": "^1.3.1",
63
+ "karma-sourcemap-loader": "^0.3.7",
64
+ "karma-spec-reporter": "0.0.31",
65
+ "karma-webpack": "^2.0.2",
66
+ "manage-client": "^1.4.20",
67
+ "mkdirp": "^0.5.1",
68
+ "mocha": "^3.2.0",
69
+ "ncp": "^2.0.0",
70
+ "nightwatch": "^0.8.18",
71
+ "rimraf": "^2.5.0",
72
+ "selenium-server": "2.52.0",
73
+ "sinon": "^2.1.0",
74
+ "sinon-chai": "^2.8.0",
75
+ "style": "0.0.3",
76
+ "style-loader": "^0.20.3",
77
+ "url-loader": "^0.5.7",
78
+ "vue-client": "1.21.60",
79
+ "vue-hot-reload-api": "^1.2.0",
80
+ "vue-html-loader": "^1.0.0",
81
+ "vue-loader": "^8.2.1",
82
+ "vue-resource": "^1.5.0",
83
+ "vue-router": "^0.7.13",
84
+ "vue-strap": "^1.0.9",
85
+ "vue-style-loader": "^1.0.0",
86
+ "vue-validator": "^3.0.0-alpha.2",
87
+ "webpack": "^1.12.2",
88
+ "jsencrypt": "3.0.0-rc.1",
89
+ "webpack-dev-middleware": "^1.4.0",
90
+ "webpack-hot-middleware": "^2.6.0",
91
+ "webpack-merge": "^0.8.3"
92
+ },
93
+ "repository": {
94
+ "type": "git",
95
+ "url": "https://gitee.com/aotu/System"
96
+ },
97
+ "keywords": [
98
+ "system_clients"
99
+ ],
100
+ "author": "杨文宇",
101
+ "license": "ISC"
102
+ }
package/src/components/Main.vue CHANGED
@@ -1,76 +1,25 @@
1
1
  <template>
2
- <div @click="hindsetting1()" :class="{'with-watermark':showwatermakeflag}">
3
- <!-- <div class="system-main" id="box" v-el:box v-if="!isManger">-->
4
- <!-- <div class="system-logo" style="height: auto">-->
5
- <!-- <img :src="imgs.logoimg" alt=""/>-->
6
- <!-- <label>{{systemname}}</label>-->
7
- <!-- <div class="system-logo-chi" >-->
8
- <!-- <div v-if="userpane" class="auto system-logo-prompt" style="float: right">-->
9
- <!-- <span>{{orgpathnames}}</span>-->
10
- <!-- </div>-->
11
- <!-- &lt;!&ndash;<div class="system-logo-chi-img1" style="float: right" @mouseenter="mouseenteruser()" @mouseleave="mouseleaveuser()"></div>&ndash;&gt;-->
12
- <!-- <span style="float: right; padding-top: 2px" @mouseenter="mouseenteruser()" @mouseleave="mouseleaveuser()" class="system-logo-chi-span-1">{{$login.f.name}}</span>-->
13
- <!-- <span style="border-left: 1px solid;float: right;padding-top: 2px" class="system-logo-chi-span-1"> <img src="../../static/newStyle/login-f.png" height="20" width="20"> </span>-->
14
- <!-- <a href="index.html" onclick="return confirm('您确定要退出系统吗？');" style="float: right;padding-top: 2px">-->
15
- <!-- <img src="../../static/newStyle/system-off.png" alt="" >-->
16
- <!-- <span class="system-logo-chi-span-1">退出系统</span>-->
17
- <!-- </a>-->
18
- <!-- <div style="float: right" :class="{'dropstyle':setting,'dropstyle-1':!setting}">-->
19
- <!-- <dropdown class="auto" >-->
20
- <!-- <span data-toggle="dropdown" @click="hindsetting()" >-->
21
- <!-- <img :src="srcsetting" alt=""><span>系统设置</span>-->
22
- <!-- </span>-->
23
- <!-- <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-up dropstyle-chi" >-->
24
- <!-- &lt;!&ndash; <li>系统信息及设置</li>&ndash;&gt;-->
25
- <!-- <li style="color: #ffffff;white-space: nowrap" @click="show=true">修改密码</li>-->
26
- <!-- <li style="color: #ffffff;white-space: nowrap" @click="AddChangeMsgShow=true">系统版本</li>-->
27
- <!-- </ul>-->
28
- <!-- </dropdown>-->
29
- <!-- </div>-->
2
+ <div @click="hindsetting1()">
30
3
 
31
- <!-- </div>-->
32
- <!-- </div>-->
33
- <!-- <div class="system-left tree-flex" :class="{'system-left-1': !treeOrIcon}" id="top" v-el:top >-->
34
- <!-- <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}" >-->
35
- <!-- <div class="span system-left-tree" >-->
36
- <!-- <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" :treeOrIcon="treeOrIcon" :tabs="tabs" v-ref:tree></left-tree>-->
37
- <!-- &lt;!&ndash; <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
38
- <!-- </div>-->
39
- <!-- </div>-->
40
- <!-- <div class="system-foot-stretch" >-->
41
- <!-- <a @click="changeShow()"><img src="../../static/images/lefticon/菜单伸缩.png" alt=""></a>-->
42
- <!-- </div>-->
43
- <!-- </div>-->
44
-
45
-
46
- <!-- <div class="system-right" :class="{'system-right-1': !treeOrIcon}" id="bottom" v-el:bottom>-->
47
- <!-- <div class="span">-->
48
- <!-- <echarts-box v-if="$refs.mic.tabs.length === 0"></echarts-box>-->
49
- <!-- <dynamic :comps='[]' :showup="true" :showhide="false" name='main' :selecttab.sync="selecttab" @tab-changed="tabChange" @tabscg="tabcg" v-ref:mic v-show="!($refs.mic.tabs.length === 0)"></dynamic>-->
50
- <!-- </div>-->
51
- <!-- </div>-->
52
- <!-- <div class="system-foot" v-el:bottom>-->
53
-
54
- <!-- <div class="system-foot-box">-->
55
-
56
- <!-- </div>-->
57
- <!-- </div>-->
58
- <!-- </div>-->
59
4
  <div class='flex-row system-main' id="box" v-el:box v-if="!isManger">
5
+
60
6
  <div class="auto " :class="{'login-operator1':$refs.mic.tabs.length === 0,'login-operator':$refs.mic.tabs.length != 0}">
61
- <span>
62
- <img
63
- src="../assets/people.png" height="15" width="15">
64
- 登录人：</span>
65
- <label>{{orgpathnames}}</label>
7
+ <span class="glyphicon glyphicon-asterisk" style="color:#a1d0f5"></span>
8
+ <span>组织编码:</span>
9
+ <label style="margin-right:14px;">{{$login.f.number}}</label>
10
+ <span class="glyphicon glyphicon-user" style="color:#a1d0f5"></span>
11
+ <span>登录人：</span>
12
+ <label>{{orgpathnames}}</label>
66
13
  </div>
67
14
  <div class="system-left tree-flex" :class="{'tree-flex-icon': !treeOrIcon}" id="top" v-el:top >
68
15
  <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}" >
69
16
  <div class="span system-left-tree " style="height:85%">
70
- <h3>{{systemname}}</h3>
17
+ <div class="logopicaode" >
18
+ <div class="aodeloginedlogo"></div>
19
+ </div>
20
+ <h3 style="margin-bottom: 12px;height: 35px;">&nbsp;&nbsp;</h3>
71
21
  <!-- <div class="span" style="margin-bottom:10px;padding-bottom:5px;padding-top:5px;flex: 1;border-top: 1px solid #e5e5e5;border-bottom: 1px solid #e5e5e5;">-->
72
22
  <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" v-show="treeOrIcon" :tabs="tabs" v-ref:tree></left-tree>
73
- <!--&lt;!&ndash; <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
74
23
  </div>
75
24
 
76
25
  <div class="tree-flex-footer">
@@ -85,6 +34,7 @@
85
34
  <!-- <li>{{name}}</li> -->
86
35
  <li>{{date}}</li>
87
36
  <li @click="show=true">修改密码</li>
37
+ <li @click="clearCache">清除缓存</li>
88
38
  <li @click="AddChangeMsgShow=true">系统版本:1.0.0</li>
89
39
  </ul>
90
40
 
@@ -121,47 +71,6 @@
121
71
  import vue from 'vue'
122
72
  import co from 'co'
123
73
 
124
- let getwartermakr = async function(self){
125
- let param = {
126
- tablename:'t_singlevalue',
127
- condition: " 1=1 and name=\'水印内容\'"
128
- };
129
- let result =await self.$resetpost('rs/sql/saleSingleTable',{data:param},{resolveMsg: null, rejectMsg: null});
130
- if(result && result.data.length>0){
131
- self.showwatermakeflag = true;
132
- createWaterMark(result.data[0].value);
133
- }else{
134
- self.showwatermakeflag = false;
135
- }
136
- }
137
-
138
- let createWaterMark = function(userName){
139
- let style;
140
- if (style) style.remove();
141
- let width = window.parseInt(document.body.clientWidth);
142
- let canvasWidth = width / window.parseInt(width / 320);
143
- let fontFamily = window.getComputedStyle(document.body)["font-family"];
144
- let canvas = document.createElement("canvas");
145
- canvas.width = canvasWidth;
146
- canvas.height = 200;
147
- let ctx = canvas.getContext("2d");
148
- ctx.rotate((-20 * Math.PI) / 180);
149
- ctx.font = `20px ${fontFamily}`;
150
- ctx.fillStyle = "rgba(8,8,8,.1)";
151
- ctx.fillText(userName, 50, 200);
152
- let imgSrc = canvas.toDataURL("image/png");
153
- style = document.createElement("style");
154
- style.innerHTML = `.with-watermark:before{
155
- content: "";
156
- width: 100%;
157
- height: 100%;
158
- display: block;
159
- position: absolute;
160
- background-image: url("${imgSrc}");
161
- }`;
162
- (document.head.append || document.head.appendChild).apply(document.head, [style]);
163
- }
164
-
165
74
  window.onunload = () => {
166
75
  vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
167
76
  }
@@ -191,8 +100,8 @@
191
100
  tabs:[], //已初始化页签数组
192
101
  selecttab:'',
193
102
  setting:true,
194
- srcsetting:'../../static/newStyle/setting.png',
195
- showwatermakeflag:false,
103
+ srcsetting:'../../static/newStyle/setting.png'
104
+
196
105
  // headerHint: true, // 右侧顶部提示信息
197
106
  // value: 25645.26,
198
107
  // AddChangeMsgShow: false,
@@ -200,7 +109,6 @@
200
109
  }
201
110
  },
202
111
  ready () {
203
- getwartermakr(this);
204
112
  let component = this.$login.getUrlCompileParames('component')
205
113
  if (component) {
206
114
  this.isManger = true
@@ -327,6 +235,9 @@
327
235
  window.location.reload()
328
236
  }
329
237
  })
238
+ },
239
+ clearCache() {
240
+ this.$resetpost('/rs/search/clearCache', { userid: this.$login.f.id }, { resolveMsg: '清除缓存成功', rejectMsg: '清除缓存失败，请重试' })
330
241
  }
331
242
  },
332
243
  computed: {
@@ -546,6 +457,18 @@
546
457
  .tree-img {
547
458
  font-size: 1.2em;
548
459
  }
460
+ .aodeloginedlogo {
461
+ background:url(../../static/aodenewlogo.png);
462
+ background-size:80%;
463
+ background-repeat: no-repeat;
464
+ }
465
+ .logopicaode{
466
+ width: 100%;
467
+ height: 61px;
468
+ float: left;
469
+ margin-left: 2.5%;
470
+ margin-top: 10px;
471
+ }
549
472
 
550
473
  /*将较长信息截断显示，鼠标悬停显示全部信息*/
551
474
  .cutout50 {
package/src/components/equipment/EquipmentManage.vue CHANGED
@@ -4,7 +4,7 @@
4
4
  <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
5
5
  <div class="row">
6
6
  <div class="col-sm-2 form-group">
7
- <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
7
+ <label class="font_normal_body">终端类型</label>
8
8
  <v-select id="f_charge_type"
9
9
  v-model="model.f_equipment_type"
10
10
  placeholder='终端类型'
package/src/components/equipment/PcAdd.vue CHANGED
@@ -1,23 +1,23 @@
1
1
  <template>
2
- <div class="row select-overspread">
2
+ <div class="auto select-overspread">
3
3
  <validator name='v'>
4
4
  <ul class="nav nav-tabs" >
5
5
  <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
6
6
  </ul>
7
7
  <form class="form-horizontal">
8
- <div class="col-sm-6 form-group">
8
+ <div class="col-sm-6">
9
9
  <label class="font_normal_body">使用人员</label>
10
10
  <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
11
11
  </div>
12
- <div class="col-sm-6 form-group">
12
+ <div class="col-sm-6">
13
13
  <label class="font_normal_body">所属地址</label>
14
14
  <input type="text" style="width: 60%" class="input_search" v-model="model.f_mac_outlets" placeholder="所属地址" >
15
15
  </div>
16
- <div class="col-sm-6 form-group">
16
+ <div class="col-sm-6">
17
17
  <label class="font_normal_body">mac地址</label>
18
18
  <input type="text" style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址" >
19
19
  </div>
20
- <div class="col-sm-6 form-group">
20
+ <div class="col-sm-6">
21
21
  <label class="font_normal_body">使用公司</label>
22
22
 
23
23
  <res-select restype='organization'
package/src/components/equipment/PcList.vue CHANGED
@@ -4,7 +4,7 @@
4
4
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
6
  <div class="row">
7
- <div class="col-sm-3 form-group">
7
+ <div class="col-sm-3">
8
8
  <label class="font_normal_body">使用公司</label>
9
9
  <res-select restype='organization'
10
10
  is-mul="false"
@@ -13,12 +13,12 @@
13
13
  </res-select>
14
14
  </div>
15
15
 
16
- <div class="col-sm-3 form-group" >
16
+ <div class="col-sm-3" >
17
17
  <label class="font_normal_body">使用人员</label>
18
18
  <input type="text" class="input_search" style="width:60%" v-model="model.f_username"
19
19
  condition="f_username like '%{}%'" placeholder="使用人员">
20
20
  </div>
21
- <div class="col-sm-3 form-group" >
21
+ <div class="col-sm-3" >
22
22
  <label class="font_normal_body">所属地址</label>
23
23
  <input type="text" class="input_search" style="width:60%" v-model="model.f_mac_outlets"
24
24
  condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
@@ -31,7 +31,7 @@
31
31
  </div>
32
32
  </div>
33
33
  <div class="row" v-show="$parent.$parent.criteriaShow">
34
- <div class="col-sm-3 form-group" >
34
+ <div class="col-sm-3" >
35
35
  <label class="font_normal_body">MAC地址</label>
36
36
  <input type="text" class="input_search" style="width:60%" v-model="model.f_mac_number"
37
37
  condition="f_mac_number like '%{}%'" placeholder="MAC地址">
@@ -58,7 +58,7 @@
58
58
  <td style="text-align:center">{{row.f_mac_outlets}}</td>
59
59
  <td style="text-align:center">{{row.f_mac_number}}</td>
60
60
  <td style="text-align:center">
61
- <button class="btn btn-danger" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
61
+ <button class="btn btn-link" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
62
62
  </td>
63
63
  </tr>
64
64
  </template>
package/src/components/equipment/PhoneAdd.vue CHANGED
@@ -1,20 +1,20 @@
1
1
  <template>
2
- <div class="row select-overspread">
2
+ <div class="auto select-overspread">
3
3
  <validator name='v'>
4
4
  <ul class="nav nav-tabs" >
5
5
  <li role="presentation" class="active"><a href="#">Phone端设备号</a></li>
6
6
  </ul>
7
7
  <form class="form-horizontal">
8
8
 
9
- <div class="col-sm-6 form-group">
9
+ <div class="col-sm-6">
10
10
  <label class="font_normal_body">使用人员</label>
11
11
  <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
12
12
  </div>
13
- <div class="col-sm-6 form-group">
13
+ <div class="col-sm-6">
14
14
  <label class="font_normal_body">设备号</label>
15
15
  <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
16
16
  </div>
17
- <div class="col-sm-6 form-group">
17
+ <div class="col-sm-6">
18
18
  <label class="font_normal_body">使用公司</label>
19
19
  <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
20
20
  </div>
package/src/components/equipment/PhoneList.vue CHANGED
@@ -4,17 +4,17 @@
4
4
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
6
  <div class="row">
7
- <div class="col-sm-3 form-group">
7
+ <div class="col-sm-3">
8
8
  <label class="font_normal_body">使用公司</label>
9
9
  <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes" > </right-tree>
10
10
  </div>
11
11
 
12
- <div class="col-sm-3 form-group" >
12
+ <div class="col-sm-3" >
13
13
  <label class="font_normal_body">使用人员</label>
14
14
  <input type="text" class="input_search" style="width:60%" v-model="model.f_username"
15
15
  condition="f_username like '%{}%'" placeholder="使用人员">
16
16
  </div>
17
- <div class="col-sm-3 form-group" >
17
+ <div class="col-sm-3" >
18
18
  <label class="font_normal_body">设备号</label>
19
19
  <input type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
20
20
  condition="f_terminal_number like '%{}%'" placeholder="设备号">
@@ -41,7 +41,7 @@
41
41
  <td style="text-align:center">{{row.f_username}}</td>
42
42
  <td style="text-align:center">{{row.f_terminal_number}}</td>
43
43
  <td style="text-align:center">
44
- <button class="btn btn-danger" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
44
+ <button class="btn btn-link" @click.stop="$parent.$parent.$parent.del(row)">删除</button>
45
45
  </td>
46
46
  </tr>
47
47
  </template>