Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/babylon/controller/serve-manager.ts

@@ -216,6 +216,19 @@ export class ServeManager {
 
     }
 
+    /**
+     * 删除模板
+     */
+    deleteSandBoxTemplate(id: number, onSuccess?: () => void) {
+        this.buildingBISrv.deleteSandBoxTemplate(id).subscribe(data => {
+            console.log("删除模板" + id, data);
+            if (onSuccess) {
+                onSuccess();
+            }
+        }, error => {
+            console.error("deleteSandBoxTemplate", error);
+        })
+    }
 
     //#endregion
 

src/app/babylon/view/mark-window/mark-window.ts

@@ -1635,11 +1635,22 @@ export class MarkWindow extends UIBase {
         let id: number = Math.ceil(new Date().getTime() * 0.001);
         let instance = this;
         ServeManager.instance.saveOneMarkTemplate(id, name, data, (data: string) => {
-
+            instance.getAllSandBoxTemplate();
         });
 
     }
 
+    /**
+     * 删除模板
+     * @param id 
+     */
+    deleteSandBoxTemplate(id: number) {
+        let instance = this;
+        ServeManager.instance.deleteSandBoxTemplate(id, () => {
+            instance.getAllSandBoxTemplate();
+        });
+    }
+
 
 
     //#endregion

src/app/pages/oil-station-info/oil-station-info.component.ts

@@ -144,7 +144,7 @@ export class OilStationInfoComponent implements OnInit {
       const link = document.createElement('a');
       const blob = new Blob([data], { type: 'application/vnd.ms-excel' });
       link.setAttribute('href', window.URL.createObjectURL(blob));
-      link.setAttribute('download', '统计信息' + '.xls');
+      link.setAttribute('download', this.httpBody.stationName + '基本信息' + '.xls');
       link.style.visibility = 'hidden';
       document.body.appendChild(link);
       link.click();

src/app/service/babylon/building-basic-infos.service.ts

@@ -114,6 +114,14 @@ export class BuildingBasicInfosService {
     return this.postInfos(this.api_sandBoxTemplate, data, { name: name, "id": id });
   }
 
+  /**
+   * 删除信息
+   * @param id 
+   */
+  deleteSandBoxTemplate(id: number) {
+    return this.deleteInfos(this.api_sandBoxTemplate, { "Id": id });
+  }
+
 
 
 
@@ -127,6 +135,11 @@ export class BuildingBasicInfosService {
    */
   readonly c_post = "/PostOrPut";
 
+  /**
+   * 删除信息
+   */
+  readonly c_delete = "/Delete";
+
   /**
    * 通用消息头
    */
@@ -163,6 +176,18 @@ export class BuildingBasicInfosService {
         catchError((err) => this.handleError(err))
       );
   }
+
+  /**
+   * 删除信息
+   * @param api 
+   * @param params 
+   */
+  deleteInfos(api: string, params = {}) {
+    return this.http.get<string>(api + this.c_delete, { params: params }).pipe(
+      catchError((err) => this.handleError(err))
+    );
+
+  }
   //#endregion