system-clients 3.2.17 → 3.2.18

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 (6) hide show
  1. package/SystemClient.iml +8 -8
  2. package/package.json +104 -104
  3. package/src/filiale/dongguan/Login.vue +376 -8
  4. package/src/filiale/dongguan/system.js +6 -6
  5. package/src/styles/less/fonts-list.less +25 -25
  6. package/static/newStyle/dongguan1.png +0 -0
package/SystemClient.iml CHANGED
@@ -1,9 +1,9 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3
- <component name="NewModuleRootManager" inherit-compiler-output="true">
4
- <exclude-output />
5
- <content url="file://$MODULE_DIR$" />
6
- <orderEntry type="inheritedJdk" />
7
- <orderEntry type="sourceFolder" forTests="false" />
8
- </component>
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
4
+ <exclude-output />
5
+ <content url="file://$MODULE_DIR$" />
6
+ <orderEntry type="inheritedJdk" />
7
+ <orderEntry type="sourceFolder" forTests="false" />
8
+ </component>
9
9
  </module>
package/package.json CHANGED
@@ -1,104 +1,104 @@
1
- {
2
- "name": "system-clients",
3
- "version": "3.2.17",
4
- "description": "系统基础框架",
5
- "main": "src/index.js",
6
- "directories": {
7
- "doc": "doc",
8
- "example": "examples",
9
- "test": "test"
10
- },
11
- "scripts": {
12
- "example": "node build/example-server.js",
13
- "dev": "node build/dev-server.js",
14
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
15
- "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
16
- "e2e": "node test/e2e/runner.js",
17
- "unit": "karma start test/unit/karma.conf.js",
18
- "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
19
- },
20
- "dependencies": {
21
- "base64-js": "^1.3.0",
22
- "js-base64": "^2.4.9",
23
- "less": "^2.7.1",
24
- "less-loader": "^2.2.3",
25
- "nyc": "^15.1.0",
26
- "src": "^1.1.2",
27
- "vue": "^1.0.17"
28
- },
29
- "devDependencies": {
30
- "babel-core": "^6.0.0",
31
- "babel-loader": "^6.0.0",
32
- "babel-plugin-transform-runtime": "^6.0.0",
33
- "babel-preset-es2015": "^6.0.0",
34
- "babel-preset-stage-2": "^6.0.0",
35
- "chai": "^3.5.0",
36
- "connect-history-api-fallback": "^1.1.0",
37
- "cross-env": "^1.0.7",
38
- "cross-spawn": "^2.1.5",
39
- "css-loader": "^0.23.0",
40
- "eslint": "^2.0.0",
41
- "eslint-config-standard": "^5.1.0",
42
- "eslint-friendly-formatter": "^1.2.2",
43
- "eslint-loader": "^1.3.0",
44
- "eslint-plugin-html": "^1.3.0",
45
- "eslint-plugin-promise": "^1.0.8",
46
- "eslint-plugin-standard": "^1.3.2",
47
- "eslint-plugin-vue": "^0.1.1",
48
- "eventsource-polyfill": "^0.9.6",
49
- "express": "^4.13.3",
50
- "extract-text-webpack-plugin": "^1.0.1",
51
- "file-loader": "^0.8.4",
52
- "function-bind": "^1.0.2",
53
- "html-webpack-plugin": "^2.8.1",
54
- "http-proxy-middleware": "^0.11.0",
55
- "inject-loader": "^2.0.1",
56
- "isparta-loader": "^2.0.0",
57
- "jasmine-core": "^2.4.1",
58
- "jquery": "^3.3.1",
59
- "jsencrypt": "^3.0.0-rc.1",
60
- "json-loader": "^0.5.4",
61
- "karma": "^1.4.1",
62
- "karma-chrome-launcher": "^2.2.0",
63
- "karma-coverage": "^1.1.1",
64
- "karma-mocha": "^1.3.0",
65
- "karma-sinon-chai": "^1.3.1",
66
- "karma-sourcemap-loader": "^0.3.7",
67
- "karma-spec-reporter": "0.0.31",
68
- "karma-webpack": "^2.0.2",
69
- "manage-client": "^1.4.20",
70
- "mkdirp": "^0.5.1",
71
- "mocha": "^3.2.0",
72
- "ncp": "^2.0.0",
73
- "nightwatch": "^0.8.18",
74
- "rimraf": "^2.5.0",
75
- "selenium-server": "2.52.0",
76
- "sinon": "^2.1.0",
77
- "sinon-chai": "^2.8.0",
78
- "style": "0.0.3",
79
- "style-loader": "^0.20.3",
80
- "url-loader": "^0.5.7",
81
- "vue-client": "1.24.53",
82
- "vue-hot-reload-api": "^1.2.0",
83
- "vue-html-loader": "^1.0.0",
84
- "vue-loader": "^8.2.1",
85
- "vue-resource": "^1.5.0",
86
- "vue-router": "^0.7.13",
87
- "vue-strap": "^1.0.9",
88
- "vue-style-loader": "^1.0.0",
89
- "vue-validator": "2.1.7",
90
- "webpack": "^1.12.2",
91
- "webpack-dev-middleware": "^1.4.0",
92
- "webpack-hot-middleware": "^2.6.0",
93
- "webpack-merge": "^0.8.3"
94
- },
95
- "repository": {
96
- "type": "git",
97
- "url": "https://gitee.com/aotu/System"
98
- },
99
- "keywords": [
100
- "system_clients"
101
- ],
102
- "author": "杨文宇",
103
- "license": "ISC"
104
- }
1
+ {
2
+ "name": "system-clients",
3
+ "version": "3.2.18",
4
+ "description": "系统基础框架",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "doc": "doc",
8
+ "example": "examples",
9
+ "test": "test"
10
+ },
11
+ "scripts": {
12
+ "example": "node build/example-server.js",
13
+ "dev": "node build/dev-server.js",
14
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
15
+ "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
16
+ "e2e": "node test/e2e/runner.js",
17
+ "unit": "karma start test/unit/karma.conf.js",
18
+ "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
19
+ },
20
+ "dependencies": {
21
+ "base64-js": "^1.3.0",
22
+ "js-base64": "^2.4.9",
23
+ "less": "^2.7.1",
24
+ "less-loader": "^2.2.3",
25
+ "nyc": "^15.1.0",
26
+ "src": "^1.1.2",
27
+ "vue": "^1.0.17"
28
+ },
29
+ "devDependencies": {
30
+ "babel-core": "^6.0.0",
31
+ "babel-loader": "^6.0.0",
32
+ "babel-plugin-transform-runtime": "^6.0.0",
33
+ "babel-preset-es2015": "^6.0.0",
34
+ "babel-preset-stage-2": "^6.0.0",
35
+ "chai": "^3.5.0",
36
+ "connect-history-api-fallback": "^1.1.0",
37
+ "cross-env": "^1.0.7",
38
+ "cross-spawn": "^2.1.5",
39
+ "css-loader": "^0.23.0",
40
+ "eslint": "^2.0.0",
41
+ "eslint-config-standard": "^5.1.0",
42
+ "eslint-friendly-formatter": "^1.2.2",
43
+ "eslint-loader": "^1.3.0",
44
+ "eslint-plugin-html": "^1.3.0",
45
+ "eslint-plugin-promise": "^1.0.8",
46
+ "eslint-plugin-standard": "^1.3.2",
47
+ "eslint-plugin-vue": "^0.1.1",
48
+ "eventsource-polyfill": "^0.9.6",
49
+ "express": "^4.13.3",
50
+ "extract-text-webpack-plugin": "^1.0.1",
51
+ "file-loader": "^0.8.4",
52
+ "function-bind": "^1.0.2",
53
+ "html-webpack-plugin": "^2.8.1",
54
+ "http-proxy-middleware": "^0.11.0",
55
+ "inject-loader": "^2.0.1",
56
+ "isparta-loader": "^2.0.0",
57
+ "jasmine-core": "^2.4.1",
58
+ "jquery": "^3.3.1",
59
+ "jsencrypt": "^3.0.0-rc.1",
60
+ "json-loader": "^0.5.4",
61
+ "karma": "^1.4.1",
62
+ "karma-chrome-launcher": "^2.2.0",
63
+ "karma-coverage": "^1.1.1",
64
+ "karma-mocha": "^1.3.0",
65
+ "karma-sinon-chai": "^1.3.1",
66
+ "karma-sourcemap-loader": "^0.3.7",
67
+ "karma-spec-reporter": "0.0.31",
68
+ "karma-webpack": "^2.0.2",
69
+ "manage-client": "^1.4.20",
70
+ "mkdirp": "^0.5.1",
71
+ "mocha": "^3.2.0",
72
+ "ncp": "^2.0.0",
73
+ "nightwatch": "^0.8.18",
74
+ "rimraf": "^2.5.0",
75
+ "selenium-server": "2.52.0",
76
+ "sinon": "^2.1.0",
77
+ "sinon-chai": "^2.8.0",
78
+ "style": "0.0.3",
79
+ "style-loader": "^0.20.3",
80
+ "url-loader": "^0.5.7",
81
+ "vue-client": "1.24.53",
82
+ "vue-hot-reload-api": "^1.2.0",
83
+ "vue-html-loader": "^1.0.0",
84
+ "vue-loader": "^8.2.1",
85
+ "vue-resource": "^1.5.0",
86
+ "vue-router": "^0.7.13",
87
+ "vue-strap": "^1.0.9",
88
+ "vue-style-loader": "^1.0.0",
89
+ "vue-validator": "2.1.7",
90
+ "webpack": "^1.12.2",
91
+ "webpack-dev-middleware": "^1.4.0",
92
+ "webpack-hot-middleware": "^2.6.0",
93
+ "webpack-merge": "^0.8.3"
94
+ },
95
+ "repository": {
96
+ "type": "git",
97
+ "url": "https://gitee.com/aotu/System"
98
+ },
99
+ "keywords": [
100
+ "system_clients"
101
+ ],
102
+ "author": "杨文宇",
103
+ "license": "ISC"
104
+ }
package/src/filiale/dongguan/Login.vue CHANGED
@@ -1,12 +1,12 @@
1
1
  <template>
2
- <div class="syslogin">
2
+ <div class="syslogin" style="background-image: url(../static/newStyle/dongguan1.png)">
3
3
  <div class="login-title" >
4
4
  <div class="row auto">
5
5
  <marquee style="width:80%;margin-top:25px"><span style="font-size: 1.8rem;color: white;">{{notice}}</span></marquee>
6
6
  <div class="login-title-chi" style="white-space: nowrap;margin-right:-5%">
7
7
  <div v-if="titleShow">
8
8
  <img src="../../../static/newStyle/login-info.png"/>
9
- <span @click="showus=true">关于我们</span>
9
+ <span style="color:#7D7D7D;font-weight: bold;" @click="showus=true">关于我们</span>
10
10
  </div>
11
11
  <!-- <img src="../../../static/newStyle/login-con.png"/>-->
12
12
  <!-- <span>联系我们</span>-->
@@ -29,16 +29,16 @@
29
29
  <p class="logofooter">(仅浏览器扫描)</p>
30
30
  </div>
31
31
  <!--输入框-->
32
- <div class="loginmain" style="margin: 8% 3% 6% 73%;width: 22%;height: 48%;">
32
+ <div class="loginmain" style="margin: 8% 3% 6% 73%;width: 22%;height: 48%;background-color: #00A8E9">
33
33
  <!-- <img src="../../../static/login_title1.png" alt="图片加载未完成" class="img-responsive" style="margin: 0 auto; padding-top: 150px;" /> -->
34
34
  <!-- <div class="loginmain-left">-->
35
35
  <!-- <img class="loginmain-left-img" src="../../../static/newStyle/login-left.png">-->
36
36
  <!-- </div>-->
37
37
  <div class="loginmain-right" style="float:none;padding:4% 4% 2% 4%;width:80%">
38
38
 
39
- <p @click="theme()" style="white-space: nowrap;font-weight:bold;text-align: center">{{config.title}}</p>
39
+ <p @click="theme()" style="white-space: nowrap;font-weight:bold; text-align: center;font-size: 4rem;color:white">{{config.title}}</p>
40
40
 
41
- <form v-show="!login">
41
+ <form v-show="!login" class="login-form">
42
42
  <!-- <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
43
43
  <div class="login-input" style="opacity: 0;position:absolute;width:0;height:0;">
44
44
  <img src="../../../static/newStyle/login-user.png"/>
@@ -85,8 +85,8 @@
85
85
  </div>
86
86
  </div>
87
87
  </div>
88
- <div class="login-foot" style="margin-top:10%" v-show="true">
89
- 技术支持：东莞市伊米斯智能科技有限公司
88
+ <div class="login-foot" style="margin-top:11%;font-weight: bold;color:#7D7D7D" v-show="true">
89
+ 技术支持：东莞市伊米斯智能科技有限公司 粤ICP备2022095777号-1
90
90
  </div>
91
91
  <div class="login-foot" v-show="$login.BAinformation">
92
92
  {{{ $login.BAinformation }}}
@@ -311,7 +311,7 @@ export default {
311
311
  isMac: false,
312
312
  depPrompt: false,
313
313
  weakPassword: false,
314
- title: 'AiGAS CLOUD',
314
+ title: '伊米斯燃气云',
315
315
  distanceLogin: false,
316
316
  // 那些角色可以定时获取预约提示
317
317
  isTip : false,
@@ -529,4 +529,372 @@ export default {
529
529
  display:flex;
530
530
  justify-content: center;
531
531
  }
532
+ <<<<<<< HEAD
533
+ body {
534
+ font-family: 'Source Sans Pro', sans-serif;
535
+ color: white;
536
+ font-weight: 400;
537
+ }
538
+
539
+ body ::-webkit-input-placeholder {
540
+ /* WebKit browsers */
541
+ font-family: 'Source Sans Pro', sans-serif;
542
+ color: white;
543
+ font-weight: 400;
544
+ }
545
+
546
+ body :-moz-placeholder {
547
+ /* Mozilla Firefox 4 to 18 */
548
+ font-family: 'Source Sans Pro', sans-serif;
549
+ color: white;
550
+ opacity: 1;
551
+ font-weight: 400;
552
+ }
553
+
554
+ body ::-moz-placeholder {
555
+ /* Mozilla Firefox 19+ */
556
+ font-family: 'Source Sans Pro', sans-serif;
557
+ color: white;
558
+ opacity: 1;
559
+ font-weight: 400;
560
+ }
561
+
562
+ body :-ms-input-placeholder {
563
+ /* Internet Explorer 10+ */
564
+ font-family: 'Source Sans Pro', sans-serif;
565
+ color: white;
566
+ font-weight: 400;
567
+ }
568
+
569
+ .wrapper {
570
+ /*background: #2D83BA;
571
+ background: -webkit-linear-gradient(top left, #2D83BA 0%, #2D83BA 100%);
572
+ background: linear-gradient(to bottom right, #2D83BA 0%, #2D83BA 100%);
573
+ opacity: 0.8;*/
574
+ position: absolute;
575
+ top: 50%;
576
+ right: -60px;
577
+ width: 40%;
578
+ height: 400px;
579
+ margin-top: -150px;
580
+ overflow: hidden;
581
+
582
+ }
583
+
584
+ .wrapper.form-success .container h3 {
585
+ -webkit-transform: translateY(85px);
586
+ -ms-transform: translateY(85px);
587
+ transform: translateY(85px);
588
+ }
589
+
590
+ .container {
591
+ max-width: 350px;
592
+ margin: 0 auto;
593
+ padding: 30px 100px 50px 100px;
594
+ height: 400px;
595
+ text-align: center;
596
+ /*以下增加*/
597
+ background: #2D83BA;
598
+ background: -webkit-linear-gradient(top left, #2D83BA 0%, #2D83BA 100%);
599
+ background: linear-gradient(to bottom right, #2D83BA 0%, #2D83BA 100%);
600
+ opacity: 0.8;
601
+ }
602
+
603
+ .container h3 {
604
+ font-size: 40px;
605
+ -webkit-transition-duration: 1s;
606
+ transition-duration: 1s;
607
+ -webkit-transition-timing-function: ease-in-put;
608
+ transition-timing-function: ease-in-put;
609
+ font-weight: 200;
610
+ }
611
+
612
+ .form {
613
+ padding: 20px 0;
614
+ position: relative;
615
+ z-index: 2;
616
+ }
617
+
618
+ .form input {
619
+ -webkit-appearance: none;
620
+ -moz-appearance: none;
621
+ appearance: none;
622
+ outline: 0;
623
+ border: 1px solid #50ABE6;
624
+ background-color: #50ABE6;
625
+ width: 250px;
626
+ border-radius: 3px;
627
+ padding: 10px 15px;
628
+ margin: 0 auto 10px auto;
629
+ display: block;
630
+ text-align: center;
631
+ font-size: 18px;
632
+ color: white;
633
+ -webkit-transition-duration: 0.25s;
634
+ transition-duration: 0.25s;
635
+ font-weight: 400;
636
+ }
637
+
638
+ .form input:hover {
639
+ background-color: rgba(255, 255, 255, 0.4);
640
+ }
641
+
642
+ .form input:focus {
643
+ background-color: white;
644
+ width: 300px;
645
+ color: #53e3a6;
646
+ }
647
+
648
+ .usericon {
649
+ background-image: url(../../../static/usericon.png);
650
+ background-repeat: no-repeat;
651
+ background-size: 30px;
652
+ background-position-x: 8px;
653
+ background-position-y: 8px;
654
+ }
655
+
656
+ .psicon {
657
+ background-image: url(../../../static/psicon.png);
658
+ background-repeat: no-repeat;
659
+ background-size: 30px;
660
+ background-position-x: 8px;
661
+ background-position-y: 8px;
662
+ }
663
+
664
+ .form button {
665
+ -webkit-appearance: none;
666
+ -moz-appearance: none;
667
+ appearance: none;
668
+ outline: 0;
669
+ background-color: white;
670
+ border: 0;
671
+ padding: 10px 15px;
672
+ color: #253830;
673
+ border-radius: 3px;
674
+ width: 250px;
675
+ cursor: pointer;
676
+ font-size: 18px;
677
+ -webkit-transition-duration: 0.25s;
678
+ transition-duration: 0.25s;
679
+ }
680
+
681
+ .form button:hover {
682
+ background-color: #f5f7f9;
683
+ }
684
+
685
+ /*注册字体样式*/
686
+ .form span {
687
+ color: #fff;
688
+ display: table-footer-group;
689
+ position: absolute;
690
+ right: 10px;
691
+ margin-top: 10px;
692
+ cursor: pointer;
693
+ }
694
+
695
+ .logotitle {
696
+ color: #fff;
697
+ position: absolute;
698
+ top: 50px;
699
+ left: 50px;
700
+ font-size: 50px;
701
+ }
702
+
703
+ /*注册模态框界面样式*/
704
+ .modifystyle {
705
+ background: #FCFEEE;
706
+ }
707
+
708
+ .modifystyle div {
709
+ height: auto;
710
+ margin-bottom: 15px;
711
+ /*text-align: center;*/
712
+ /*margin-left: 20%;*/
713
+ }
714
+
715
+ /*bootstrap字体图标要手动调整，所以使用字体图标的span必须紧跟在input后面，负责会错位*/
716
+ .modifystyle div input + span {
717
+ top: 0 !important;
718
+ right: 32%;
719
+ }
720
+
721
+ .modifystyle span {
722
+ color: red;
723
+ }
724
+
725
+ /* 通告区内容 */
726
+ .notice-board {
727
+ height: auto;
728
+ position: absolute;
729
+ top: 50%;
730
+ margin-top: -150px;
731
+ margin-left: 100px;
732
+ color: #fff;
733
+ }
734
+
735
+ /*修改密码底部按钮部分样式*/
736
+ .footerbtn {
737
+ text-align: center;
738
+ padding: 15px;
739
+ }
740
+
741
+ .footerbtn button {
742
+ width: 100px;
743
+ margin-left: 20px;
744
+ }
745
+
746
+ .bg-bubbles {
747
+ position: absolute;
748
+ top: 0;
749
+ left: 0;
750
+ width: 100%;
751
+ height: 100%;
752
+ z-index: 1;
753
+ }
754
+
755
+ .bg-bubbles li {
756
+ position: absolute;
757
+ list-style: none;
758
+ display: block;
759
+ width: 40px;
760
+ height: 40px;
761
+ background-color: rgba(255, 255, 255, 0.15);
762
+ bottom: -160px;
763
+ -webkit-animation: square 25s infinite;
764
+ animation: square 25s infinite;
765
+ -webkit-transition-timing-function: linear;
766
+ transition-timing-function: linear;
767
+ }
768
+
769
+ .bg-bubbles li:nth-child(1) {
770
+ left: 10%;
771
+ }
772
+
773
+ .bg-bubbles li:nth-child(2) {
774
+ left: 20%;
775
+ width: 80px;
776
+ height: 80px;
777
+ -webkit-animation-delay: 2s;
778
+ animation-delay: 2s;
779
+ -webkit-animation-duration: 17s;
780
+ animation-duration: 17s;
781
+ }
782
+
783
+ .bg-bubbles li:nth-child(3) {
784
+ left: 25%;
785
+ -webkit-animation-delay: 4s;
786
+ animation-delay: 4s;
787
+ }
788
+
789
+ .bg-bubbles li:nth-child(4) {
790
+ left: 40%;
791
+ width: 60px;
792
+ height: 60px;
793
+ -webkit-animation-duration: 22s;
794
+ animation-duration: 22s;
795
+ background-color: rgba(255, 255, 255, 0.25);
796
+ }
797
+
798
+ .bg-bubbles li:nth-child(5) {
799
+ left: 70%;
800
+ }
801
+
802
+ .bg-bubbles li:nth-child(6) {
803
+ left: 80%;
804
+ width: 120px;
805
+ height: 120px;
806
+ -webkit-animation-delay: 3s;
807
+ animation-delay: 3s;
808
+ background-color: rgba(255, 255, 255, 0.2);
809
+ }
810
+
811
+ .bg-bubbles li:nth-child(7) {
812
+ left: 32%;
813
+ width: 160px;
814
+ height: 160px;
815
+ -webkit-animation-delay: 7s;
816
+ animation-delay: 7s;
817
+ }
818
+
819
+ .bg-bubbles li:nth-child(8) {
820
+ left: 55%;
821
+ width: 20px;
822
+ height: 20px;
823
+ -webkit-animation-delay: 15s;
824
+ animation-delay: 15s;
825
+ -webkit-animation-duration: 40s;
826
+ animation-duration: 40s;
827
+ }
828
+
829
+ .bg-bubbles li:nth-child(9) {
830
+ left: 25%;
831
+ width: 10px;
832
+ height: 10px;
833
+ -webkit-animation-delay: 2s;
834
+ animation-delay: 2s;
835
+ -webkit-animation-duration: 40s;
836
+ animation-duration: 40s;
837
+ background-color: rgba(255, 255, 255, 0.3);
838
+ }
839
+
840
+ .bg-bubbles li:nth-child(10) {
841
+ left: 90%;
842
+ width: 160px;
843
+ height: 160px;
844
+ -webkit-animation-delay: 11s;
845
+ animation-delay: 11s;
846
+ }
847
+ .logofooter{
848
+ font-size: 12px;
849
+ color:#fff;
850
+ width:150px;
851
+ margin-left: 17px;
852
+ }
853
+ .logocontent{
854
+ font-size: 14px;
855
+ color:#fff;
856
+ width:150px;
857
+ margin: 3px -15px;
858
+ }
859
+ .imglogo {
860
+ background:url(../../../static/logo.png);
861
+ background-size:100%;
862
+ }
863
+ .login-form{
864
+ border-radius: 10px;
865
+ margin: 0 -12%;
866
+ background: white;
867
+ padding: 5%;
868
+ }
869
+ .logoew {
870
+ width:120px;
871
+ height:120px;
872
+ float:right;
873
+ margin-right:8.5%;
874
+ margin-top:10px;
875
+ }
876
+
877
+ @-webkit-keyframes square {
878
+ 0% {
879
+ -webkit-transform: translateY(0);
880
+ transform: translateY(0);
881
+ }
882
+ 100% {
883
+ -webkit-transform: translateY(-700px) rotate(600deg);
884
+ transform: translateY(-700px) rotate(600deg);
885
+ }
886
+ }
887
+
888
+ @keyframes square {
889
+ 0% {
890
+ -webkit-transform: translateY(0);
891
+ transform: translateY(0);
892
+ }
893
+ 100% {
894
+ -webkit-transform: translateY(-700px) rotate(600deg);
895
+ transform: translateY(-700px) rotate(600deg);
896
+ }
897
+ }
898
+ =======
899
+ >>>>>>> 382a61a3a07eee14016c5939f13dae1bd80de65a
532
900
  </style>
package/src/filiale/dongguan/system.js CHANGED
@@ -1,6 +1,6 @@
1
- // 分公司特殊组件页面注册
2
-
3
- exports.specialComp = {
4
- 'home-page': (resolve) => require(['./Main'], resolve),
5
- 'login': (resolve) => require(['./Login'], resolve)
6
- }
1
+ // 分公司特殊组件页面注册
2
+
3
+ exports.specialComp = {
4
+ 'home-page': (resolve) => require(['./Main'], resolve),
5
+ 'login': (resolve) => require(['./Login'], resolve)
6
+ }
package/src/styles/less/fonts-list.less CHANGED
@@ -1,25 +1,25 @@
1
-
2
-
3
- @font-face {
4
- font-family: 'TRENDSTRENDS'; //重命名字体名
5
- //src: url('../fonts/trendstrends.ttf'); //引入字体
6
- }
7
-
8
-
9
- @font-face {
10
- font-family: 'PINGFANG-MEDIUM'; //重命名字体名
11
- //src: url('../fonts/pingfang-medium.ttf'); //引入字体
12
- }
13
- @font-face {
14
- font-family: 'PINGFANG-BOLD'; //重命名字体名
15
- //src: url('../fonts/pingfang-bold.ttf'); //引入字体
16
- }
17
- @font-face {
18
- font-family: 'PINGFANG-REGULAR'; //重命名字体名
19
- //src: url('../fonts/pingfang-regular.ttf'); //引入字体
20
- }
21
-
22
- @font-face {
23
- font-family: PingFang;
24
- //src:url('../fonts/PingFangSC-Regular.ttf');
25
- }
1
+
2
+
3
+ @font-face {
4
+ font-family: 'TRENDSTRENDS'; //重命名字体名
5
+ //src: url('../fonts/trendstrends.ttf'); //引入字体
6
+ }
7
+
8
+
9
+ @font-face {
10
+ font-family: 'PINGFANG-MEDIUM'; //重命名字体名
11
+ //src: url('../fonts/pingfang-medium.ttf'); //引入字体
12
+ }
13
+ @font-face {
14
+ font-family: 'PINGFANG-BOLD'; //重命名字体名
15
+ //src: url('../fonts/pingfang-bold.ttf'); //引入字体
16
+ }
17
+ @font-face {
18
+ font-family: 'PINGFANG-REGULAR'; //重命名字体名
19
+ //src: url('../fonts/pingfang-regular.ttf'); //引入字体
20
+ }
21
+
22
+ @font-face {
23
+ font-family: PingFang;
24
+ //src:url('../fonts/PingFangSC-Regular.ttf');
25
+ }
package/static/newStyle/dongguan1.png ADDED
Binary file