merge

.gitignore

@@ -43,4 +43,8 @@ yarn-error.log
 # System Files
 .DS_Store
 Thumbs.db
-/src/proxy.config.json
\ No newline at end of file
+<<<<<<< HEAD
+/src/proxy.config.json
+=======
+/src/proxy.config.json
+>>>>>>> d801bd8c63a68261cf527d8eaba6cc0d6dc71f07

package.json

@@ -42,16 +42,9 @@
     "@angular/platform-browser": "~7.2.0",
     "@angular/platform-browser-dynamic": "~7.2.0",
     "@angular/router": "~7.2.0",
-    "core-js": "^2.5.4",
-    "rxjs": "~6.3.3",
-    "tslib": "^1.9.0",
-    "zone.js": "~0.8.26",
     "@antv/data-set": "^0.10.2",
     "@antv/g2": "^3.5.1",
     "@antv/g2-plugin-slider": "^2.1.1",
-    "@ngx-translate/core": "^11.0.1",
-    "@ngx-translate/http-loader": "^4.0.0",
-    "ajv": "^6.9.2",
     "@delon/abc": "^7.2.0",
     "@delon/acl": "^7.2.0",
     "@delon/auth": "^7.2.0",
@@ -61,13 +54,21 @@
     "@delon/mock": "^7.2.0",
     "@delon/theme": "^7.2.0",
     "@delon/util": "^7.2.0",
+    "@ngx-translate/core": "^11.0.1",
+    "@ngx-translate/http-loader": "^4.0.0",
+    "@zxing/ngx-scanner": "^1.3.0",
+    "ajv": "^6.9.2",
+    "core-js": "^2.5.4",
     "file-saver": "^2.0.0",
     "ng-zorro-antd": "^7.2.0",
     "ngx-countdown": "^3.2.0",
     "ngx-tinymce": "^7.0.0",
     "ngx-ueditor": "^2.1.3",
+    "qrious": "^4.0.2",
+    "rxjs": "~6.3.3",
     "screenfull": "^4.2.0",
-    "qrious": "^4.0.2"
+    "tslib": "^1.9.0",
+    "zone.js": "~0.8.26"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.13.0",

src/app/app.component.html

 <!--The content below is only a placeholder and can be replaced.-->
+
 <router-outlet></router-outlet>

src/app/app.module.ts

@@ -2,7 +2,7 @@ import { NgModule, LOCALE_ID, APP_INITIALIZER } from '@angular/core';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-
+import { ZXingScannerModule } from '@zxing/ngx-scanner';
 // #region default language
 // 参考：https://ng-alain.com/docs/i18n
 import { default as ngLang } from '@angular/common/locales/zh';
@@ -96,6 +96,7 @@ import { LayoutModule } from './layout/layout.module';
 @NgModule({
   declarations: [AppComponent],
   imports: [
+    ZXingScannerModule,
     BrowserModule,
     BrowserAnimationsModule,
     HttpClientModule,

src/app/core/services/list/list.service.ts

+import { Injectable } from '@angular/core';
+import { _HttpClient } from '@delon/theme';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ListService {
+  constructor(private http: _HttpClient) {}
+
+  /**
+   *获取资产台账列表
+   *
+   * @param {number} kindAsset  1为类固定 2固定
+   * @returns
+   * @memberof ListService
+   */
+  getKindAssetList(kindAsset: number) {
+    const url = 'asset/a/asset/assets/data?kindAsset=' + kindAsset;
+    return this.http.get(url);
+  }
+}

src/app/layout/passport/passport.component.less

 @import '~@delon/theme/styles/default';
+
 :host {
   ::ng-deep {
     .container {
@@ -7,11 +8,13 @@
       min-height: 100%;
       background: #f0f2f5;
     }
+
     .langs {
       text-align: right;
       width: 100%;
       height: 40px;
       line-height: 44px;
+
       .anticon {
         margin-top: 24px;
         margin-right: 24px;
@@ -20,10 +23,12 @@
         cursor: pointer;
       }
     }
+
     .wrap {
       padding: 32px 0;
       flex: 1;
     }
+
     .ant-form-item {
       margin-bottom: 24px;
     }
@@ -35,32 +40,39 @@
         background-position: center 110px;
         background-size: 100%;
       }
+
       .wrap {
         padding: 32px 0 24px;
       }
     }
+
     .top {
       text-align: center;
     }
+
     .header {
       height: 44px;
       line-height: 44px;
+
       a {
         text-decoration: none;
       }
     }
+
     .logo {
       height: 44px;
       margin-right: 16px;
     }
+
     .title {
-      font-size: 33px;
+      font-size: 2em;
       color: @heading-color;
       font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
       font-weight: 600;
       position: relative;
       vertical-align: middle;
     }
+
     .desc {
       font-size: @font-size-base;
       color: @text-color-secondary;

src/app/routes/passport/login/login.component.less

 @import '~@delon/theme/styles/default';
+
 :host {
   display: block;
   width: 368px;
   margin: 0 auto;
+
   ::ng-deep {
     .ant-tabs .ant-tabs-bar {
       border-bottom: 0;
       margin-bottom: 24px;
       text-align: center;
     }
+
     .ant-tabs-tab {
       font-size: 16px;
       line-height: 24px;
     }
+
     .ant-input-affix-wrapper .ant-input:not(:first-child) {
       padding-left: 34px;
     }
+
     .icon {
       font-size: 24px;
       color: rgba(0, 0, 0, 0.2);
@@ -23,17 +28,21 @@
       vertical-align: middle;
       cursor: pointer;
       transition: color 0.3s;
+
       &:hover {
         color: @primary-color;
       }
     }
+
     .other {
       text-align: left;
       margin-top: 24px;
       line-height: 22px;
+
       nz-tooltip {
         vertical-align: middle;
       }
+
       .register {
         float: right;
       }

src/app/routes/passport/login/login.component.ts

@@ -116,6 +116,7 @@ export class UserLoginComponent implements OnDestroy {
         this.reuseTabService.clear();
         // 设置用户Token信息
         res.body.token=res.body.JSESSIONID;
+        document.cookie=`JSESSIONID=${res.body.token}`;
         this.tokenService.set(res.body);
         // 重新获取 StartupService 内容，我们始终认为应用信息一般都会受当前用户授权范围而影响
         this.startupSrv.load().then(() => {

src/app/routes/pro/list/basic-list/basic-list.component.ts

@@ -29,7 +29,7 @@ export class ProBasicListComponent implements OnInit {
 
   getData() {
     this.loading = true;
-    this.http.get('/api/list', { count: 5 }).subscribe((res: any) => {
+    this.http.get('api/list', { count: 5 }).subscribe((res: any) => {
       this.data = res;
       this.loading = false;
       this.cdr.detectChanges();

src/proxy.config.json

 {
   "/asset/*": {
-    "target": "http://192.168.19.200:8080/",
+    "target": "http://192.168.19.200:8081/",
     "secure": false,
     "logLevel": "debug",
     "changeOrigin": false