Skip to content

L
luqiao-admin-mobile
Commit 4d424452 by 牛晓林
Options

merge

parents ba0ba029 d801bd8c
Showing with 308 additions and 129 deletions
.gitignore
......@@ -43,4 +43,8 @@ yarn-error.log
# System Files
.DS_Store
Thumbs.db
<<<<<<< HEAD
/src/proxy.config.json
=======
/src/proxy.config.json
>>>>>>> d801bd8c63a68261cf527d8eaba6cc0d6dc71f07
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
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 0 → 100644
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/assets/tmp/app-data.json
{
"app": {
"name": "Alain",
"description": "Ng-zorro admin panel front-end framework"
"name": "资产管理系统",
"description": "路桥资产管理系统"
},
"user": {
"name": "Admin",
"avatar": "./assets/tmp/img/avatar.jpg",
"email": "cipchk@qq.com"
},
"menu": [{
"menu": [
{
"text": "导航",
"group": true,
"hideInBreadcrumb": true,
"icon": "anticon anticon-dashboard",
"children": [{
"text": "用户中心"
}, {
"children": [
{
"text": "用户中心",
"children": [
{
"text": "土地",
"children": [
{
"text": "土地信息",
"link": "/admin/intangible-assets/land"
}
]
},
{
"text": "软件",
"children": [
{
"text": "软件管理",
"link": "/admin/intangible-assets/software"
}
]
},
{
"text": "专利",
"children": [
{
"text": "专利管理",
"link": "/admin/intangible-assets/patent"
}
]
}
]
},
{
"text": "无形资产",
"children": [{
"children": [
{
"text": "土地",
"children": [{
"children": [
{
"text": "土地信息",
"link": "/admin/intangible-assets/land"
}]
}, {
}
]
},
{
"text": "软件",
"children": [{
"children": [
{
"text": "软件管理",
"link": "/admin/intangible-assets/software"
}]
}, {
}
]
},
{
"text": "专利",
"children": [{
"children": [
{
"text": "专利管理",
"link": "/admin/intangible-assets/patent"
}]
}]
}, {
}
]
}
]
},
{
"text": "(类)固定资产",
"children": [{
"children": [
{
"text": "资产信息",
"children": [{
"children": [
{
"text": "固定资产台账",
"link": "/admin/fixed-assets/assets-info/fixed-assets"
},
{
"text": "类固定资产台账",
"link": "/admin/fixed-assets/assets-info/cate-fixed-assets"
}, {
},
{
"text": "资产分类",
"link": "/admin/fixed-assets/assets-info/assets-cate"
}, {
},
{
"text": "房屋",
"link": "/admin/fixed-assets/assets-info/house"
}, {
},
{
"text": "一键折旧",
"link": "/admin/fixed-assets/assets-info/depreciate"
}, {
},
{
"text": "资产折旧记录",
"link": "/admin/fixed-assets/assets-info/depreciation-record"
}, {
},
{
"text": "资产性质",
"link": "/admin/fixed-assets/assets-info/assets-nature"
},
{
"text": "特种设备事故记录",
"link": "/admin/fixed-assets/assets-info/plant-accident"
}, {
},
{
"text": "特种设备运行故障",
"link": "/admin/fixed-assets/assets-info/plant-operate"
}, {
},
{
"text": "车辆/特种设备检定",
"link": "/admin/fixed-assets/assets-info/plant-verify"
}, {
},
{
"text": "附件表",
"link": "/admin/fixed-assets/assets-info/parts"
},
{
"text": "自定义字段",
"link": "/admin/fixed-assets/assets-info/custom"
}, {
},
{
"text": "附属设备及配件",
"link": "/admin/fixed-assets/assets-info/anlage"
}
......@@ -87,72 +141,94 @@
},
{
"text": "资产使用",
"children": [{
"children": [
{
"text": "采购申请管理",
"link": "/admin/fixed-assets/assets-use/apply"
},
{
"text": "采购合同管理",
"link": "/admin/fixed-assets/assets-use/contract"
}, {
},
{
"text": "采购支付管理",
"link": "/admin/fixed-assets/assets-use/pay"
}, {
},
{
"text": "验收记录",
"link": "/admin/fixed-assets/assets-use/check"
}, {
},
{
"text": "领用记录",
"link": "/admin/fixed-assets/assets-use/receive"
}, {
},
{
"text": "设备租出",
"link": "/admin/fixed-assets/assets-use/lease"
}, {
},
{
"text": "资产调遣",
"link": "/admin/fixed-assets/assets-use/dispatch"
}, {
},
{
"text": "资产调拨",
"link": "/admin/fixed-assets/assets-use/allot"
}, {
},
{
"text": "资产使用记录",
"link": "/admin/fixed-assets/assets-use/use"
}, {
},
{
"text": "资产盘点计划",
"link": "/admin/fixed-assets/assets-use/take-stock"
}, {
},
{
"text": "资产人员变更",
"link": "/admin/fixed-assets/assets-use/personal-change"
}, {
},
{
"text": "资产退库",
"link": "/admin/fixed-assets/assets-use/cancel-stock"
}, {
},
{
"text": "资产封存",
"link": "/admin/fixed-assets/assets-use/remembered"
}, {
},
{
"text": "资产产权变更记录",
"link": "/admin/fixed-assets/assets-use/property-change"
}, {
},
{
"text": "报废处置",
"link": "/admin/fixed-assets/assets-use/scrap"
}
]
}, {
},
{
"text": "资产租赁",
"children": [{
"children": [
{
"text": "设备租入",
"link": "/admin/fixed-assets/assets-lease/assess"
}, {
},
{
"text": "租入设备考核记录",
"link": "/admin/fixed-assets/assets-lease/rent"
}, {
},
{
"text": "房屋租赁",
"link": "/admin/fixed-assets/assets-lease/house"
}, {
},
{
"text": "分包商及租入特种设备管理",
"link": "/admin/fixed-assets/assets-lease/sub-contractor"
}]
}, {
}
]
},
{
"text": "设备维保",
"children": [{
"children": [
{
"text": "维修保养计划",
"link": "/admin/fixed-assets/device-maintain/service-plan"
},
......@@ -161,21 +237,28 @@
"link": "/admin/fixed-assets/device-maintain/service-record"
}
]
}, {
},
{
"text": "单机车核算",
"children": [{
"children": [
{
"text": "单机车核算",
"link": "/admin/fixed-assets/single-machine/single"
}, {
},
{
"text": "燃料消耗记录",
"link": "/admin/fixed-assets/single-machine/consume"
}, {
},
{
"text": "机械设备燃料核算标准",
"link": "/admin/fixed-assets/single-machine/business"
}]
}, {
}
]
},
{
"text": "资产保险",
"children": [{
"children": [
{
"text": "保险登记",
"link": "/admin/fixed-assets/assets-insurance/insurance"
},
......@@ -184,106 +267,135 @@
"link": "/admin/fixed-assets/assets-insurance/danger"
}
]
}, {
},
{
"text": "证件管理",
"children": [{
"children": [
{
"text": "员工证件表",
"link": "/admin/fixed-assets/identity-manager/staff"
}, {
},
{
"text": "设备证件",
"link": "/admin/fixed-assets/identity-manager/device"
}, {
},
{
"text": "用户证件附件",
"link": "/admin/fixed-assets/identity-manager/user"
}, {
},
{
"text": "证件类型",
"link": "/admin/fixed-assets/identity-manager/type"
}]
}, {
}
]
},
{
"text": "搅拌站配比"
},
{
"text": "制造厂商",
"children": [{
"children": [
{
"text": "制造厂商",
"link": "/admin/fixed-assets/canon/vendor"
}]
}
]
}, {
}
]
},
{
"text": "周转材料低值易耗",
"children": [{
"children": [
{
"text": "周转材料",
"children": [{
"children": [
{
"text": "周转材料台账",
"link": "/admin/revolving-material/revolve/stand"
}, {
},
{
"text": "周转材料验收记录",
"link": "/admin/revolving-material/revolve/check-record"
}, {
},
{
"text": "周转材料领用记录",
"link": "/admin/revolving-material/revolve/receive-record"
}, {
},
{
"text": "周转材料租出",
"link": "/admin/revolving-material/revolve/lease"
}, {
},
{
"text": "周转材料分类",
"link": "/admin/revolving-material/revolve/category"
}, {
},
{
"text": "周转材料租入",
"link": "/admin/revolving-material/revolve/rent"
}, {
},
{
"text": "周转材料清理",
"link": "/admin/revolving-material/revolve/clear"
}, {
},
{
"text": "周转材料核算与摊销",
"link": "/admin/revolving-material/revolve/market"
}]
}, {
}
]
},
{
"text": "低值易耗",
"children": [{
"children": [
{
"text": "低值易耗台账",
"link": "/admin/revolving-material/consume/stand"
}, {
},
{
"text": "低值易耗验收记录",
"link": "/admin/revolving-material/consume/check-record"
}, {
},
{
"text": "低值易耗领用",
"link": "/admin/revolving-material/consume/receive"
}]
}, {
}
]
},
{
"text": "仓库管理",
"children": [{
"children": [
{
"text": "物资消耗记录",
"link": "/admin/revolving-material/warehouse/goods-consume"
}]
}]
}, {
}
]
}
]
},
{
"text": "产权管理",
"link": "/dashboard/v1",
"children": [
]
}, {
"children": []
},
{
"text": "闲置共享",
"link": "/admin/idle-shared/share-list"
}, {
},
{
"text": "数据分析与展示",
"link": "/dashboard/v1",
"children": [
]
}, {
"children": []
},
{
"text": "文件资料",
"link": "/dashboard/v1",
"children": []
}, {
},
{
"text": "系统设置",
"link": "/dashboard/v1",
"children": [
"children": []
}
]
}]
},
{
......@@ -291,11 +403,13 @@
"i18n": "menu.main",
"group": true,
"hideInBreadcrumb": true,
"children": [{
"children": [
{
"text": " 用户中心",
"i18n": "menu.dashboard",
"icon": "anticon anticon-dashboard",
"children": [{
"children": [
{
"text": "仪表盘V1",
"link": "/dashboard/v1",
"i18n": "menu.dashboard.v1"
......@@ -338,11 +452,13 @@
"i18n": "menu.alain",
"group": true,
"hideInBreadcrumb": true,
"children": [{
"children": [
{
"text": "样式",
"i18n": "menu.style",
"icon": "anticon anticon-info",
"children": [{
"children": [
{
"text": "Typography",
"link": "/style/typography",
"i18n": "menu.style.typography",
......@@ -364,7 +480,8 @@
"text": "Delon",
"i18n": "menu.delon",
"icon": "anticon anticon-bulb",
"children": [{
"children": [
{
"text": "Dynamic Form",
"link": "/delon/form",
"i18n": "menu.delon.form"
......@@ -430,12 +547,14 @@
"i18n": "menu.pro",
"group": true,
"hideInBreadcrumb": true,
"children": [{
"children": [
{
"text": "Form Page",
"i18n": "menu.form",
"link": "/pro/form",
"icon": "anticon anticon-edit",
"children": [{
"children": [
{
"text": "Basic Form",
"link": "/pro/form/basic-form",
"i18n": "menu.form.basicform",
......@@ -457,7 +576,8 @@
"text": "List",
"i18n": "menu.list",
"icon": "anticon anticon-appstore",
"children": [{
"children": [
{
"text": "Table List",
"link": "/pro/list/table-list",
"i18n": "menu.list.searchtable",
......@@ -476,7 +596,8 @@
{
"text": "Search List",
"i18n": "menu.list.searchlist",
"children": [{
"children": [
{
"link": "/pro/list/articles",
"i18n": "menu.list.searchlist.articles"
},
......@@ -497,7 +618,8 @@
"text": "Profile",
"i18n": "menu.profile",
"icon": "anticon anticon-profile",
"children": [{
"children": [
{
"text": "Basic",
"link": "/pro/profile/basic",
"i18n": "menu.profile.basic"
......@@ -514,7 +636,8 @@
"text": "Result",
"i18n": "menu.result",
"icon": "anticon anticon-check-circle",
"children": [{
"children": [
{
"text": "Success",
"link": "/pro/result/success",
"i18n": "menu.result.success"
......@@ -531,7 +654,8 @@
"i18n": "menu.exception",
"link": "/",
"icon": "anticon anticon-exception",
"children": [{
"children": [
{
"text": "403",
"link": "/exception/403",
"i18n": "menu.exception.not-permission",
......@@ -555,7 +679,8 @@
"text": "Account",
"i18n": "menu.account",
"icon": "anticon anticon-user",
"children": [{
"children": [
{
"text": "center",
"link": "/pro/account/center",
"i18n": "menu.account.center"
......@@ -574,23 +699,27 @@
"i18n": "menu.more",
"group": true,
"hideInBreadcrumb": true,
"children": [{
"children": [
{
"text": "Report",
"i18n": "menu.report",
"icon": "anticon anticon-cloud",
"children": [{
"children": [
{
"text": "Relation",
"link": "/data-v/relation",
"i18n": "menu.report.relation",
"reuse": false
}]
}
]
},
{
"text": "Extras",
"i18n": "menu.extras",
"link": "/extras",
"icon": "anticon anticon-link",
"children": [{
"children": [
{
"text": "Help Center",
"link": "/extras/helpcenter",
"i18n": "menu.extras.helpcenter"
......
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment