system-clients 1.6.25 → 1.6.26-heat-3

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.
File without changes
@@ -0,0 +1,2 @@
1
+ #Sat Jul 09 19:58:44 CST 2022
2
+ gradle.version=7.1
Binary file
File without changes
@@ -0,0 +1,5 @@
1
+ distributionBase=GRADLE_USER_HOME
2
+ distributionPath=wrapper/dists
3
+ distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
4
+ zipStoreBase=GRADLE_USER_HOME
5
+ zipStorePath=wrapper/dists
package/gradlew ADDED
@@ -0,0 +1,185 @@
1
+ #!/usr/bin/env sh
2
+
3
+ #
4
+ # Copyright 2015 the original author or authors.
5
+ #
6
+ # Licensed under the Apache License, Version 2.0 (the "License");
7
+ # you may not use this file except in compliance with the License.
8
+ # You may obtain a copy of the License at
9
+ #
10
+ # https://www.apache.org/licenses/LICENSE-2.0
11
+ #
12
+ # Unless required by applicable law or agreed to in writing, software
13
+ # distributed under the License is distributed on an "AS IS" BASIS,
14
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ # See the License for the specific language governing permissions and
16
+ # limitations under the License.
17
+ #
18
+
19
+ ##############################################################################
20
+ ##
21
+ ## Gradle start up script for UN*X
22
+ ##
23
+ ##############################################################################
24
+
25
+ # Attempt to set APP_HOME
26
+ # Resolve links: $0 may be a link
27
+ PRG="$0"
28
+ # Need this for relative symlinks.
29
+ while [ -h "$PRG" ] ; do
30
+ ls=`ls -ld "$PRG"`
31
+ link=`expr "$ls" : '.*-> \(.*\)$'`
32
+ if expr "$link" : '/.*' > /dev/null; then
33
+ PRG="$link"
34
+ else
35
+ PRG=`dirname "$PRG"`"/$link"
36
+ fi
37
+ done
38
+ SAVED="`pwd`"
39
+ cd "`dirname \"$PRG\"`/" >/dev/null
40
+ APP_HOME="`pwd -P`"
41
+ cd "$SAVED" >/dev/null
42
+
43
+ APP_NAME="Gradle"
44
+ APP_BASE_NAME=`basename "$0"`
45
+
46
+ # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47
+ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48
+
49
+ # Use the maximum available, or set MAX_FD != -1 to use that value.
50
+ MAX_FD="maximum"
51
+
52
+ warn () {
53
+ echo "$*"
54
+ }
55
+
56
+ die () {
57
+ echo
58
+ echo "$*"
59
+ echo
60
+ exit 1
61
+ }
62
+
63
+ # OS specific support (must be 'true' or 'false').
64
+ cygwin=false
65
+ msys=false
66
+ darwin=false
67
+ nonstop=false
68
+ case "`uname`" in
69
+ CYGWIN* )
70
+ cygwin=true
71
+ ;;
72
+ Darwin* )
73
+ darwin=true
74
+ ;;
75
+ MSYS* | MINGW* )
76
+ msys=true
77
+ ;;
78
+ NONSTOP* )
79
+ nonstop=true
80
+ ;;
81
+ esac
82
+
83
+ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84
+
85
+
86
+ # Determine the Java command to use to start the JVM.
87
+ if [ -n "$JAVA_HOME" ] ; then
88
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89
+ # IBM's JDK on AIX uses strange locations for the executables
90
+ JAVACMD="$JAVA_HOME/jre/sh/java"
91
+ else
92
+ JAVACMD="$JAVA_HOME/bin/java"
93
+ fi
94
+ if [ ! -x "$JAVACMD" ] ; then
95
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
96
+
97
+ Please set the JAVA_HOME variable in your environment to match the
98
+ location of your Java installation."
99
+ fi
100
+ else
101
+ JAVACMD="java"
102
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
103
+
104
+ Please set the JAVA_HOME variable in your environment to match the
105
+ location of your Java installation."
106
+ fi
107
+
108
+ # Increase the maximum file descriptors if we can.
109
+ if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110
+ MAX_FD_LIMIT=`ulimit -H -n`
111
+ if [ $? -eq 0 ] ; then
112
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113
+ MAX_FD="$MAX_FD_LIMIT"
114
+ fi
115
+ ulimit -n $MAX_FD
116
+ if [ $? -ne 0 ] ; then
117
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
118
+ fi
119
+ else
120
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
121
+ fi
122
+ fi
123
+
124
+ # For Darwin, add options to specify how the application appears in the dock
125
+ if $darwin; then
126
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
127
+ fi
128
+
129
+ # For Cygwin or MSYS, switch paths to Windows format before running java
130
+ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133
+
134
+ JAVACMD=`cygpath --unix "$JAVACMD"`
135
+
136
+ # We build the pattern for arguments to be converted via cygpath
137
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138
+ SEP=""
139
+ for dir in $ROOTDIRSRAW ; do
140
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
141
+ SEP="|"
142
+ done
143
+ OURCYGPATTERN="(^($ROOTDIRS))"
144
+ # Add a user-defined pattern to the cygpath arguments
145
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
147
+ fi
148
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
149
+ i=0
150
+ for arg in "$@" ; do
151
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153
+
154
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156
+ else
157
+ eval `echo args$i`="\"$arg\""
158
+ fi
159
+ i=`expr $i + 1`
160
+ done
161
+ case $i in
162
+ 0) set -- ;;
163
+ 1) set -- "$args0" ;;
164
+ 2) set -- "$args0" "$args1" ;;
165
+ 3) set -- "$args0" "$args1" "$args2" ;;
166
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172
+ esac
173
+ fi
174
+
175
+ # Escape application args
176
+ save () {
177
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178
+ echo " "
179
+ }
180
+ APP_ARGS=`save "$@"`
181
+
182
+ # Collect all arguments for the java command, following the shell quoting and substitution rules
183
+ eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
184
+
185
+ exec "$JAVACMD" "$@"
package/gradlew.bat ADDED
@@ -0,0 +1,89 @@
1
+ @rem
2
+ @rem Copyright 2015 the original author or authors.
3
+ @rem
4
+ @rem Licensed under the Apache License, Version 2.0 (the "License");
5
+ @rem you may not use this file except in compliance with the License.
6
+ @rem You may obtain a copy of the License at
7
+ @rem
8
+ @rem https://www.apache.org/licenses/LICENSE-2.0
9
+ @rem
10
+ @rem Unless required by applicable law or agreed to in writing, software
11
+ @rem distributed under the License is distributed on an "AS IS" BASIS,
12
+ @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ @rem See the License for the specific language governing permissions and
14
+ @rem limitations under the License.
15
+ @rem
16
+
17
+ @if "%DEBUG%" == "" @echo off
18
+ @rem ##########################################################################
19
+ @rem
20
+ @rem Gradle startup script for Windows
21
+ @rem
22
+ @rem ##########################################################################
23
+
24
+ @rem Set local scope for the variables with windows NT shell
25
+ if "%OS%"=="Windows_NT" setlocal
26
+
27
+ set DIRNAME=%~dp0
28
+ if "%DIRNAME%" == "" set DIRNAME=.
29
+ set APP_BASE_NAME=%~n0
30
+ set APP_HOME=%DIRNAME%
31
+
32
+ @rem Resolve any "." and ".." in APP_HOME to make it shorter.
33
+ for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34
+
35
+ @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
36
+ set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
37
+
38
+ @rem Find java.exe
39
+ if defined JAVA_HOME goto findJavaFromJavaHome
40
+
41
+ set JAVA_EXE=java.exe
42
+ %JAVA_EXE% -version >NUL 2>&1
43
+ if "%ERRORLEVEL%" == "0" goto execute
44
+
45
+ echo.
46
+ echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47
+ echo.
48
+ echo Please set the JAVA_HOME variable in your environment to match the
49
+ echo location of your Java installation.
50
+
51
+ goto fail
52
+
53
+ :findJavaFromJavaHome
54
+ set JAVA_HOME=%JAVA_HOME:"=%
55
+ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
56
+
57
+ if exist "%JAVA_EXE%" goto execute
58
+
59
+ echo.
60
+ echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61
+ echo.
62
+ echo Please set the JAVA_HOME variable in your environment to match the
63
+ echo location of your Java installation.
64
+
65
+ goto fail
66
+
67
+ :execute
68
+ @rem Setup the command line
69
+
70
+ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
71
+
72
+
73
+ @rem Execute Gradle
74
+ "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
75
+
76
+ :end
77
+ @rem End local scope for the variables with windows NT shell
78
+ if "%ERRORLEVEL%"=="0" goto mainEnd
79
+
80
+ :fail
81
+ rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
82
+ rem the _cmd.exe /c_ return code!
83
+ if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84
+ exit /b 1
85
+
86
+ :mainEnd
87
+ if "%OS%"=="Windows_NT" endlocal
88
+
89
+ :omega
package/package.json CHANGED
@@ -1,102 +1,102 @@
1
- {
2
- "name": "system-clients",
3
- "version": "1.6.25",
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.18.5",
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": "^3.0.0-alpha.2",
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": "1.6.26-heat-3",
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.18.5",
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": "^3.0.0-alpha.2",
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
+ }
@@ -54,3 +54,8 @@
54
54
  // Utility classes
55
55
  @import "utilities.less";
56
56
  @import "responsive-utilities.less";
57
+
58
+ @font-face {
59
+ font-family: 'PingFangSC-Regular'; //重命名字体名
60
+ src: url('../fonts/PingFangSC-Regular.ttf'); //引入字体
61
+ }
@@ -94,12 +94,13 @@
94
94
  // border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;
95
95
  // }
96
96
  // 修改后
97
- color: #B3B4B4; // 原本是#777
97
+ color: #999999; // 原本是#777
98
98
  margin-right: 2px;
99
99
  padding:10px 20px;
100
100
  font-size:12px;
101
101
  line-height: @line-height-base;
102
102
  font-weight: 600;
103
+ background-color: #f0efef;
103
104
  // border: 2px solid #ddd; // 原本为0px solid #F6F6F6;
104
105
  // border-width: 2px 2px 0px 2px ;
105
106
  // border-style: solid;
@@ -127,11 +128,11 @@
127
128
  // border-bottom-color: transparent;
128
129
  // cursor: default;
129
130
  // 修改后
130
- color: #8492A6;
131
+ color: #4094e3;
131
132
  cursor: default;
132
133
  font-weight: 600;
133
- background-color: #fff;
134
- border-bottom: 2px solid #00A3F0;
134
+ background-color: #f0efef;
135
+ border-bottom: 2px solid #4094e3;
135
136
  // border-bottom: : 3px solid @global-color;
136
137
  // background-image: -moz-linear-gradient(top, #fefeff, #dae4f2);
137
138
  // background-image: -ms-linear-gradient(top, #fefeff, #dae4f2);
@@ -266,7 +267,7 @@
266
267
  // padding: 0px 15px 0px 15px;
267
268
  // 原本没有,自己添加
268
269
  padding-top: 10px;
269
- background: #FFF; // 原本,之前修改的为#FCFEEE
270
+ background: #f0efef; // 原本,之前修改的为#FCFEEE
270
271
  }
271
272
  > .active {
272
273
  display: block;
@@ -7,7 +7,7 @@
7
7
  // padding-left: 0;
8
8
  // margin: @line-height-computed 0;
9
9
  padding: 5px;
10
- background: #F2F6FA;
10
+ background: #d2e4f5;
11
11
  list-style: none;
12
12
  text-align: center;
13
13
  &:extend(.clearfix all);
@@ -37,7 +37,7 @@ th {
37
37
  text-align: left;// 原本没有
38
38
  color: #304A66;
39
39
  // 原本没有,自己添加
40
- font-family: 微软雅黑;
40
+ font-family: PingFangSC-Regular;
41
41
 
42
42
  }
43
43
  }
@@ -128,19 +128,19 @@ th {
128
128
  // 一下原本没有,自己添加,添加繁琐,有待修改
129
129
  .table-striped {
130
130
  > tbody > tr:nth-of-type(even) {
131
- background-color: #fff;
131
+ background-color: #e8f1f9;
132
132
  }
133
133
  }
134
134
  // 一下自己添加
135
135
  .table-striped thead tr th {
136
- background-color: #00A3F0;
136
+ background-color: #cae0f4;
137
137
  padding:10px;
138
138
  border-left:solid 0px #dae4f2;
139
139
  border-top:solid 1px #dae4f2;
140
140
  border-right: none;
141
141
  border-bottom: none;
142
142
  text-align:center;
143
- color:white;
143
+ color: #333333;
144
144
  }
145
145
  // Hover effect
146
146
  //
@@ -26,7 +26,7 @@
26
26
  //## Settings for some of the most global styles.
27
27
 
28
28
  //** Background color for `<body>`.
29
- @body-bg: #fff;
29
+ @body-bg: #f0efef;
30
30
  //** Global text color on `<body>`.
31
31
  @text-color: #304A66; // @gray-dark;
32
32
 
@@ -60,7 +60,7 @@
60
60
  @font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
61
61
 
62
62
  //** Unit-less `line-height` for use in components like buttons.
63
- @line-height-base: 1.428571429; // 20/14
63
+ @line-height-base: 1.728571429; // 20/14
64
64
  //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
65
65
  @line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
66
66
 
@@ -131,7 +131,7 @@
131
131
  //** Background color used for `.table-striped`.
132
132
  @table-bg-accent: #F2FAFE; // 原本是#f9f9f9
133
133
  //** Background color used for `.table-hover`.
134
- @table-bg-hover: #f5f5f5;
134
+ @table-bg-hover: #d3e5f4;
135
135
  @table-bg-active: @table-bg-hover;
136
136
 
137
137
  //** Border color for table and cell borders.
@@ -517,7 +517,7 @@
517
517
  @state-success-border: darken(spin(@state-success-bg, -10), 5%);
518
518
 
519
519
  @state-info-text: #31708f;
520
- @state-info-bg: #F2F6FA; // 原本为 #d9edf7
520
+ @state-info-bg: #e8f1f9; // 原本为 #d9edf7
521
521
  @state-info-border: #F2F6FA; // darken(spin(@state-info-bg, -10), 7%);
522
522
 
523
523
  @state-warning-text: #8a6d3b;
@@ -692,7 +692,7 @@
692
692
  // 修改前
693
693
  // @list-group-bg: #fff;
694
694
  // 修改后
695
- @list-group-bg: #4C637B;
695
+ @list-group-bg: #4a7cae;
696
696
  //** `.list-group-item` border color
697
697
  @list-group-border: #697D93;
698
698
  //** List group border radius
@@ -1,18 +1,13 @@
1
1
  <template>
2
2
  <div>
3
- <div class='flex-row' id="box" v-el:box v-if="!isManger">
3
+ <div class='flex-row aaa' id="box" v-el:box v-if="!isManger">
4
4
  <div class="auto" style="position: fixed;right: 30px;top: 20px;color: #333">
5
- <span>
6
- <img
7
- src="../assets/people.png" height="15" width="15">
8
- 登录人:</span>
5
+ <span><img src="../assets/people.png" height="15" width="15">登录人:</span>
9
6
  <label>{{$login.f.name}}</label>
10
- <img
11
- src="../assets/arrow.png" height="6" width="10"
12
- @click="clickuser()"
13
- >
7
+ <img src="../assets/arrow.png" height="6" width="10" @mouseenter="mouseenteruser()" @mouseleave="mouseleaveuser()">
8
+ <button @click="reload" type="button" class="btn btn-primary btn-sm">首页</button>
14
9
  </div>
15
- <div v-if="userpane" class="auto userpanel">
10
+ <div v-if="userpane" class="auto userpanel">
16
11
  <span>{{orgpathnames}}</span>
17
12
  </div>
18
13
  <div class="flex tree-flex" :class="{'tree-flex-icon': !treeOrIcon}" id="top" v-el:top >
@@ -46,7 +41,7 @@
46
41
 
47
42
  <!-- <div class="line" id="line" v-show="treeOrIcon" v-el:line></div> -->
48
43
 
49
- <div class="flex right-bg" id="bottom" v-el:bottom>
44
+ <div class="flex right-bg" id="bottom" v-el:bottom v-if="pageshow">
50
45
  <!-- <operator-badge></operator-badge> -->
51
46
  <div class="span">
52
47
  <echarts-box v-if="$refs.mic.tabs.length === 0"></echarts-box>
@@ -81,6 +76,7 @@
81
76
  props: ['functions', 'userid'],
82
77
  data () {
83
78
  return {
79
+ pageshow: true,
84
80
  // 左侧树下部三个小图标
85
81
  imgs: {
86
82
  open: '/images/mainicon/treeopen.png',
@@ -149,11 +145,20 @@
149
145
  this.changeShow()
150
146
  },
151
147
  methods: {
148
+ reload () {
149
+ this.pageshow = false
150
+ this.$nextTick(() => {
151
+ this.pageshow = true
152
+ })
153
+ },
152
154
  isnodo(val){
153
155
  this.selecttab = val
154
156
  },
155
- clickuser(){
156
- this.userpane=!this.userpane
157
+ mouseenteruser(){
158
+ this.userpane=true
159
+ },
160
+ mouseleaveuser(){
161
+ this.userpane=false
157
162
  },
158
163
  unfurl () {
159
164
  if(this.showsum){
@@ -94,7 +94,7 @@
94
94
  if (ret.status === 0) {
95
95
  msg = '服务连接错误,请确认服务状态'
96
96
  } else {
97
- msg = '用户名或密码错误,请重试!'
97
+ msg = '此账号已在其他地方登录,请确认!'
98
98
  }
99
99
  self.createCode()
100
100
  self.picLyanzhengma=''
@@ -0,0 +1,569 @@
1
+ @import "./bootstrap/less/variables.less";
2
+
3
+ @form-text-fout-size: @font-size-base;//引用bootstrap的字体大小
4
+ @form-text-padding: 10px;//右padding
5
+ /**
6
+ 文本表单flex布局实现固定label
7
+ */
8
+ .form-fix-width{
9
+ display: -webkit-box;
10
+ display: -webkit-flex;
11
+ display: -ms-flexbox;
12
+ display:flex;
13
+ }
14
+ .form-fix-width>:first-child{
15
+ width: @form-text-padding+@form-text-fout-size*5;
16
+ -webkit-box-flex:none;
17
+ -webkit-flex:none;
18
+ -ms-flexbox-flex:none;
19
+ flex:none;
20
+ }
21
+ .form-fix-width>:last-child{
22
+ flex:1;
23
+ -webkit-box-flex:1;
24
+ -webkit-flex:1;
25
+ -ms-flexbox-flex:1;
26
+ }
27
+ /**
28
+ 固定checkbox的一些属性 后续继续扩增
29
+ */
30
+ .checkbox-fix-width {
31
+ width: @form-text-fout-size*4+@form-text-padding+20px;
32
+ text-align: left;
33
+ margin-left: 0px !important;
34
+ }
35
+
36
+ #android-app {
37
+ font-size: 16px;
38
+ }
39
+
40
+ /* 解决chrome最小字体为12px问题 */
41
+ .chrome_adjust {
42
+ font-size: 10px;
43
+ -webkit-transform: scale(0.85);
44
+ -o-transform: scale(1); //针对能识别-webkit的opera browser设置
45
+ }
46
+
47
+ /* 表单内输入框 */
48
+ .form-input-group-large {
49
+ display: -webkit-box;
50
+ display: -webkit-flex;
51
+ display: -ms-flexbox;
52
+ display: flex;
53
+ .control-label {
54
+ width: 100px;
55
+ line-height: @input-height-base;
56
+ text-align: right;
57
+ + * {
58
+ -webkit-box-flex:1;
59
+ -webkit-flex:1;
60
+ -ms-flexbox-flex:1;
61
+ flex: 1;
62
+ width: 100px; // 随意给的宽度,将有flex重新计算
63
+ box-sizing: border-box;
64
+ vertical-align:middle;
65
+ }
66
+ }
67
+ }
68
+ .form-input-group {
69
+ display: -webkit-box;
70
+ display: -webkit-flex;
71
+ display: -ms-flexbox;
72
+ display: flex;
73
+ .control-label {
74
+ // 居中对齐
75
+ // line-height: @input-height-base;
76
+ width: 90px;
77
+ // padding-top: 6px;
78
+ text-align: right;
79
+ vertical-align: middle;
80
+ + * {
81
+ -webkit-box-flex:1;
82
+ -webkit-flex:1;
83
+ -ms-flexbox-flex:1;
84
+ flex: 1;
85
+ width: 100px; // 随意给的宽度,将有flex重新计算
86
+ box-sizing: border-box;
87
+ vertical-align:middle;
88
+ }
89
+ }
90
+ }
91
+ .form-input-group-small {
92
+ display: -webkit-box;
93
+ display: -webkit-flex;
94
+ display: -ms-flexbox;
95
+ display: flex;
96
+ label {
97
+ width: 50px;
98
+ line-height: @input-height-base;
99
+ text-align: right;
100
+ + * {
101
+ -webkit-box-flex:1;
102
+ -webkit-flex:1;
103
+ -ms-flexbox-flex:1;
104
+ flex: 1;
105
+ width: 100px; // 随意给的宽度,将有flex重新计算
106
+ box-sizing: border-box;
107
+ vertical-align:middle;
108
+ }
109
+ }
110
+ }
111
+ .bg-white {
112
+ background-color: white;
113
+ }
114
+ .mgb-5 {
115
+ margin-bottom: 5px;
116
+ }
117
+ .pdl-12 {
118
+ padding-left: 12px;
119
+ }
120
+ // 字体加粗
121
+ .fwb {
122
+ font-weight: bold;
123
+ }
124
+ // 浮动右对齐
125
+ .fr {
126
+ float: right;
127
+ }
128
+ .pl-12 {
129
+ padding-left: 12px;
130
+ }
131
+ .p-10 {
132
+ padding: 10px;
133
+ }
134
+ .pt-8 {
135
+ padding-top: 8px;
136
+ }
137
+ // 下拉选择框占据剩余全部空间
138
+ .select-overspread {
139
+ .form-group {
140
+ // margin: 0px 5px 10px 0px;
141
+ .form-control {
142
+ margin-right: 0px;
143
+ }
144
+ }
145
+ .btn-group, .btn-group-vertical {
146
+ // width: 100%;
147
+ // padding-right: 5px;
148
+ button {
149
+ width: 100%;
150
+ display: flex;
151
+ justify-content: space-between;
152
+ align-items: center;
153
+ }
154
+ }
155
+ .dropdown-menu {
156
+ min-width: 100%
157
+ }
158
+ }
159
+ .app-bg {
160
+ background: #F5F5F5;
161
+ }
162
+ .app-input {
163
+ background: #FFF;
164
+ border-bottom: 1px solid #ccc;
165
+ }
166
+ .app-input input, .app-input label {
167
+ padding: 8px 10px;
168
+ border: none;
169
+ outline: none;
170
+ margin: 0px;
171
+ }
172
+ .app-textarea {
173
+ display: block;
174
+ padding: 10px 15px;
175
+ border: 0;
176
+ resize: none;
177
+ width: 100%;
178
+ color: inherit;
179
+ font-size: 1em;
180
+ line-height: inherit;
181
+ outline: 0;
182
+ }
183
+ .app-cells {
184
+ height: auto;
185
+ background-color: #FFFFFF;
186
+ font-size: 1.2em;
187
+ overflow: hidden;
188
+ position: relative;
189
+ }
190
+ .app-cells label {
191
+ padding: 10px;
192
+ margin: 0px;
193
+ color: #999999;
194
+ font-weight: normal;
195
+ }
196
+ .app-cells * + * {
197
+ border-top: 1px solid #D5D5D6;
198
+ }
199
+ .app-btn {
200
+ display: flex;
201
+ width: 100%;
202
+ }
203
+ .app-btn button{
204
+ flex: 1;
205
+ border-radius: 17px;
206
+ margin: 10px;
207
+ }
208
+ .app-btn button:focus, .app-btn button::selection {
209
+ outline: none;
210
+ }
211
+ .app-list {
212
+ margin-top: 8px;
213
+ background: #FFF;
214
+ }
215
+ .app-list div {
216
+ padding: 6px 10px;
217
+ }
218
+ .app-list div:first-child{
219
+ border-bottom: 1px solid #ccc;
220
+ }
221
+ .app-input .datepicker-input[readonly] {
222
+ border: none;
223
+ background: none;
224
+ }
225
+ div[contenteditable=true]{
226
+ height: 80px;
227
+ width: 100%;
228
+ outline: none;
229
+ padding: 8px;
230
+ overflow: scroll;
231
+ }
232
+
233
+ .flex-between {
234
+ display: flex;
235
+ justify-content: space-between;
236
+ align-items: center;
237
+ }
238
+ .flex-between span {
239
+ padding-right: 10px;
240
+ }
241
+ .flex-full {
242
+ flex: 1;
243
+ }
244
+ /* app卡片样式 */
245
+ .app-preview {
246
+ position: relative;
247
+ background-color: #FFF;
248
+ height: auto;
249
+ }
250
+ .app-preview > .head > * {
251
+ padding: 0px;
252
+ margin: 0px;
253
+ }
254
+ .app-preview > .head {
255
+ display: flex;
256
+ justify-content: space-between;
257
+ padding: 10px 15px;
258
+ line-height: 2.5em;
259
+ border-bottom: 1px solid #D5D5D6;
260
+ }
261
+ .app-preview-btn-default {
262
+ color: #999999;
263
+ }
264
+ .app-preview-btn-success {
265
+ color: #3CC51F;
266
+ }
267
+ .app-preview > .body {
268
+ padding: 10px 15px;
269
+ border-bottom: 1px solid #D5D5D6;
270
+
271
+ }
272
+ .app-preview > .body > div > label {
273
+ text-align: justify;
274
+ text-align-last: justify;
275
+ min-width: 70px;
276
+ }
277
+ .app-preview > .foot {
278
+ display: flex;
279
+ height: 50px;
280
+ }
281
+ .app-preview > .foot > * {
282
+ flex: 1;
283
+ display: block;
284
+ flex: 1;
285
+
286
+ text-align: center;
287
+ }
288
+ .app-preview > .foot > * + * {
289
+ border-left: 1px solid #D5D5D6;
290
+ }
291
+ // 为工单列表样式
292
+ .compatible {
293
+ padding: 8px;
294
+ }
295
+ .compatible .form-input-group {
296
+ margin: 3px 0px;
297
+ padding: 0 8px;
298
+ }
299
+ @media screen and (min-width:992px) {
300
+ .hd-disappear{
301
+ display: none;
302
+ }
303
+ }
304
+
305
+ #work-history ul {
306
+ padding: 0px;
307
+ }
308
+
309
+ // 从order文件夹拷贝
310
+ // 为blockquote写的通用样式
311
+ // 大背景
312
+ .repair-bg {
313
+ background: #DBDBDB;
314
+ }
315
+ // 头部信息提示
316
+ .bq-parent {
317
+ height: auto;
318
+ background: #FFF;
319
+ padding: 10px 15px;
320
+ >blockquote {
321
+ padding: 0px;
322
+ padding-left: 8px;
323
+ margin: 0px;
324
+ font-size: 18px;
325
+ font-weight: bold;
326
+ border-left-color: #4C647A;
327
+ }
328
+ }
329
+ // 为移动端提供左侧修饰性边框
330
+ .lb-left {
331
+ padding-left: 8px;
332
+ border: none;
333
+ border-left: 5px solid #A2C2EB;
334
+ }
335
+ // 内容块
336
+ .repair-info-content {
337
+ margin: 15px;
338
+ background: #FFF;
339
+ border-radius: 5px;
340
+ }
341
+ @media screen and (max-width:768px) {
342
+ .repair-info-content {
343
+ margin: 0px;
344
+ padding: 8px;
345
+ background: #FFF;
346
+ border-radius: 0px;
347
+ }
348
+ }
349
+ // 为a标签:berfor伪元素写的通用样式
350
+ .tab-befor-img (@url) {
351
+ content: '';
352
+ background-image: url("@{url}");
353
+ background-size: 30px;
354
+ display: inline-block;
355
+ margin-right: 8px;
356
+ height: 30px;
357
+ width: 30px;
358
+ vertical-align: -35%;
359
+ }
360
+ .android-repair-order {
361
+ > div {
362
+ > ul {
363
+ background: #4C647A;
364
+ overflow: auto;
365
+ li {
366
+ display: block;
367
+ width: 100%;
368
+ }
369
+ > .active {
370
+ a {
371
+ background: #7599C4!important;
372
+ color: #FFF!important;
373
+ border: none;
374
+ display: block;
375
+ font-weight: bold;
376
+ &::after {
377
+ content: "";
378
+ width: 0px;
379
+ height: 0px;
380
+ border-width: 8px 8px 8px 0px;
381
+ border-color: transparent #FFF;
382
+ border-style: solid;
383
+ position: absolute;
384
+ right: 0;
385
+ top: 50%;
386
+ transform: translateY(-50%);
387
+ }
388
+ &:focus {
389
+ color: #FFF;
390
+ background: none;
391
+ }
392
+ }
393
+ }
394
+ a {
395
+ font-size: 18px;
396
+ color: #FFF;
397
+ padding: 13px 16px;
398
+ }
399
+ }
400
+ }
401
+ }
402
+
403
+ // 从app中考出
404
+ .no-close .nav-tabs a {
405
+ padding: 5px 12px;
406
+ }
407
+ /* checkbox和radio的样式 */
408
+ .magic-radio,
409
+ .magic-checkbox {
410
+ position: absolute;
411
+ display: none;
412
+ }
413
+
414
+ .magic-radio[disabled],
415
+ .magic-checkbox[disabled] {
416
+ cursor: not-allowed;
417
+ }
418
+
419
+ .magic-radio + label,
420
+ .magic-checkbox + label {
421
+ position: relative;
422
+ display: block;
423
+ padding-left: 30px;
424
+ cursor: pointer;
425
+ vertical-align: middle;
426
+ text-align: left;
427
+ }
428
+
429
+ .magic-radio + label:hover:before,
430
+ .magic-checkbox + label:hover:before {
431
+ animation-duration: 0.4s;
432
+ animation-fill-mode: both;
433
+ animation-name: hover-color;
434
+ }
435
+
436
+ .magic-radio + label:before,
437
+ .magic-checkbox + label:before {
438
+ position: absolute;
439
+ top: 0;
440
+ left: 0;
441
+ display: inline-block;
442
+ width: 20px;
443
+ height: 20px;
444
+ content: '';
445
+ border: 1px solid #c0c0c0;
446
+ }
447
+
448
+ .magic-radio + label:after,
449
+ .magic-checkbox + label:after {
450
+ position: absolute;
451
+ display: none;
452
+ content: '';
453
+ }
454
+
455
+ .magic-radio[disabled] + label,
456
+ .magic-checkbox[disabled] + label {
457
+ cursor: not-allowed;
458
+ color: #e4e4e4;
459
+ }
460
+
461
+ .magic-radio[disabled] + label:hover, .magic-radio[disabled] + label:before, .magic-radio[disabled] + label:after,
462
+ .magic-checkbox[disabled] + label:hover,
463
+ .magic-checkbox[disabled] + label:before,
464
+ .magic-checkbox[disabled] + label:after {
465
+ cursor: not-allowed;
466
+ }
467
+
468
+ .magic-radio[disabled] + label:hover:before,
469
+ .magic-checkbox[disabled] + label:hover:before {
470
+ border: 1px solid #e4e4e4;
471
+ animation-name: none;
472
+ }
473
+
474
+ .magic-radio[disabled] + label:before,
475
+ .magic-checkbox[disabled] + label:before {
476
+ border-color: #e4e4e4;
477
+ }
478
+
479
+ .magic-radio:checked + label:before,
480
+ .magic-checkbox:checked + label:before {
481
+ animation-name: none;
482
+ }
483
+
484
+ .magic-radio:checked + label:after,
485
+ .magic-checkbox:checked + label:after {
486
+ display: block;
487
+ }
488
+
489
+ .magic-radio + label:before {
490
+ border-radius: 50%;
491
+ }
492
+
493
+ .magic-radio + label:after {
494
+ top: 4px;
495
+ left: 4px;
496
+ width: 12px;
497
+ height: 12px;
498
+ border-radius: 50%;
499
+ background: #7697c4;
500
+ }
501
+
502
+ .magic-radio:checked + label:before {
503
+ border: 2px solid #7697c4;
504
+ }
505
+
506
+ .magic-radio:checked[disabled] + label:before {
507
+ border: 2px solid #c9e2f9;
508
+ }
509
+
510
+ /*.magic-radio:checked[disabled] + label:after {
511
+ background: #c9e2f9; }*/
512
+
513
+ .magic-checkbox + label:before {
514
+ border-radius: 3px;
515
+ }
516
+
517
+ .magic-checkbox + label:after {
518
+ top: 2px;
519
+ left: 7px;
520
+ box-sizing: border-box;
521
+ width: 6px;
522
+ height: 12px;
523
+ transform: rotate(45deg);
524
+ border-width: 2px;
525
+ border-style: solid;
526
+ border-color: #fff;
527
+ border-top: 0;
528
+ border-left: 0;
529
+ }
530
+
531
+ .magic-checkbox:checked + label:before {
532
+ border: #7697c4;
533
+ background: #7697c4;
534
+ }
535
+
536
+ .magic-checkbox:checked[disabled] + label:before {
537
+ border: #c9e2f9;
538
+ background: #c9e2f9;
539
+ }
540
+ /* 滚动条样式 */
541
+ /*---滚动条默认显示样式--*/
542
+ ::-webkit-scrollbar-thumb{
543
+ // display: none;
544
+ background-color:rgba(0,0,0,0.2);
545
+ height:50px;
546
+ outline-offset:-2px;
547
+ /*outline:2px solid #fff;*/
548
+ -webkit-border-radius:4px;
549
+ /*border: 2px solid #fff;*/
550
+ }
551
+
552
+ /*---鼠标点击滚动条显示样式--*/
553
+ ::-webkit-scrollbar-thumb:hover{
554
+ // display: inherit;
555
+ background-color:rgba(0,0,0,0.4);
556
+ height:50px;
557
+ -webkit-border-radius:4px;
558
+ }
559
+ /*---滚动条大小--*/
560
+ ::-webkit-scrollbar{
561
+ width:8px;
562
+ height:8px;
563
+ }
564
+ /*---滚动框背景样式--*/
565
+ ::-webkit-scrollbar-track-piece{
566
+ /* 全透明,不显示 */
567
+ background-color:rgba(255,255,255,0);
568
+ -webkit-border-radius:0;
569
+ }