Browse Source

[完善]在线模板增加类型

guangxi
邵佳豪 2 years ago
parent
commit
d0b48c582f
  1. 2
      proxy.config.json
  2. 4
      src/app/pages/login/login.component.ts
  3. 5
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  4. 4
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  5. 8
      src/index.html

2
proxy.config.json

@ -1,6 +1,6 @@
{
"/api": {
"target": "http://121.36.37.70:8201/",
"target": "http://10.81.73.39:8000/",
"secure": false,
"changeOrigin": true
}

4
src/app/pages/login/login.component.ts

@ -74,10 +74,10 @@ export class LoginComponent implements OnInit {
dialogRef.afterClosed().subscribe((data) => {
sessionStorage.setItem('isDefaultPassword', 'false')
this.lookUpdateData()
// this.lookUpdateData()
});
} else {
this.lookUpdateData()
// this.lookUpdateData()
}
}

5
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@ -2304,6 +2304,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
fileData;
iftrue = false;
fileSc(e) {
console.log("你好啊");
this.clickTitleItem(this.planTemplateData[1]);
this.iftrue = true;
const config = new MatSnackBarConfig();
@ -2328,7 +2329,9 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.unitData.buildingTypes[0].name == "影剧院" ||
this.unitData.buildingTypes[0].name == "展览建筑" ||
this.unitData.buildingTypes[0].name == "养老院" ||
this.unitData.buildingTypes[0].name == "会议中心"
this.unitData.buildingTypes[0].name == "会议中心" ||
this.unitData.buildingTypes[0].name == "古建筑" ||
this.unitData.buildingTypes[0].name == "多层"
? 4
: this.unitData.buildingTypes[0].name == "储罐类"
? "StorageTankFivePlan"

4
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@ -987,7 +987,9 @@ export class EntryPlanLookComponent implements OnInit {
this.unitdata.unittype == "影剧院" ||
this.unitdata.unittype == "展览建筑" ||
this.unitdata.unittype == "养老院" ||
this.unitdata.unittype == "会议中心"
this.unitdata.unittype == "会议中心" ||
this.unitdata.unittype == "古建筑" ||
this.unitdata.unittype == "多层"
? 4
: this.unitdata.unittype == "储罐类"
? "StorageTankFivePlan"

8
src/index.html

@ -31,12 +31,12 @@
securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
}
</script>
<!-- <script
src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
<script
src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
<!-- <script
src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
<script src="/assets/html2canvas.js"></script>
<script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
<script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>

Loading…
Cancel
Save