Browse Source

[完善]完善同步单位信息的bug

非煤矿山灾害智能感知和预警系统
邵佳豪 2 years ago
parent
commit
0cabb64f88
  1. 4
      proxy.config.json
  2. 8
      src/app/home/basic-info/unit-details/unit-details.component.html
  3. 2
      src/app/home/basic-info/unit-details/unit-details.component.ts
  4. 6
      src/app/http-interceptors/base-interceptor.ts

4
proxy.config.json

@ -1,11 +1,11 @@
{
"/api": {
"target": "https://121.36.37.70:8204",
"target": "https://fx.anxincloud.cn",
"secure": false,
"changeOrigin": true
},
"/hubs": {
"target": "https://121.36.37.70:8204",
"target": "https://fx.anxincloud.cn",
"secure": false,
"ws": true,
"logLevel": "debug"

8
src/app/home/basic-info/unit-details/unit-details.component.html

@ -679,7 +679,7 @@
<p style="margin:0pt; text-align:center"><span
style="font-family:'Times New Roman'; font-size:9pt">
<textarea
[(ngModel)]="datas.other.listdata[3].data[0].value + datas.other.listdata[3].data[1].value" nz-input
[(ngModel)]="datas.other.listdata[3].data[0].value" nz-input
style="width: 100%" type="text"></textarea></span>
</p>
</td>F
@ -694,7 +694,7 @@
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; vertical-align:middle; width:82.05pt">
<p style="margin:0pt; text-align:center"><span
style="font-family:'Times New Roman'; font-size:9pt"><textarea
[(ngModel)]="datas.other.listdata[4].data[0].value+ datas.other.listdata[4].data[1].value"
[(ngModel)]="datas.other.listdata[4].data[0].value"
nz-input style="width: 100%" type="text"></textarea></span></p>
</td>
<td colspan="4"
@ -708,7 +708,7 @@
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; vertical-align:middle; width:65.6pt">
<p style="margin:0pt; text-align:center"><span
style="font-family:'Times New Roman'; font-size:9pt"><textarea
[(ngModel)]="datas.other.listdata[5].data[0].value+ datas.other.listdata[5].data[1].value"
[(ngModel)]="datas.other.listdata[5].data[0].value"
nz-input style="width:100%" type="text"></textarea></span></p>
</td>
</tr>
@ -734,7 +734,7 @@
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; vertical-align:middle; width:191.1pt">
<p style="margin:0pt; text-align:center"><span
style="font-family:'Times New Roman'; font-size:9pt"><textarea
[(ngModel)]="datas.other.listdata[6].data[0].value+ datas.other.listdata[6].data[1].value"
[(ngModel)]="datas.other.listdata[6].data[0].value"
nz-input style="width:100%" type="text"></textarea></span>
</p>
</td>

2
src/app/home/basic-info/unit-details/unit-details.component.ts

@ -1511,7 +1511,7 @@ export class UnitDetailsComponent implements OnInit {
this.http.get('/api/Companies/' + this.id).subscribe((data: any) => {
console.log('当前单位信息', data);
this.olddata = data
if (data.data && data.data != "{}") {
if (data.data && data.data != "{}" && !JSON.parse(data.data).KeyParts) {
this.datas = JSON.parse(data.data)
if (!this.datas.ewai) {
this.datas.ewai = {

6
src/app/http-interceptors/base-interceptor.ts

@ -64,6 +64,12 @@ export class BaseInterceptor implements HttpInterceptor {
this.message.create('error', `无权限!`);
return
}
if(error.status === 404 && error.url.indexOf('GetCompanyLastTask') != -1){
this.message.create('info', `没有关于该单位的任务`);
return
}
if (error.error instanceof ErrorEvent) {
// 发生客户端或网络错误。相应处理。
console.error('An error occurred:', error.message);

Loading…
Cancel
Save