xlsx

src/main/webapp/app/analysis/operation-work/analysis-deal/analysis-deal.component.ts

@@ -141,7 +141,7 @@ export class AnalysisDealComponent implements OnInit {
         this.analysisSer.exportByuser(data).subscribe(
             (data) => {
                 this.isDownload = false;
-                this.commonSer.downloadFile('处理人统计.xls', data);
+                this.commonSer.downloadFile('处理人统计.xlsx', data);
             }
         );
     }

src/main/webapp/app/analysis/operation-work/analysis-event/analysis-event.component.ts

@@ -142,7 +142,7 @@ export class AnalysisEventComponent implements OnInit {
         this.analysisSer.exportByType(data).subscribe(
             (data) => {
                 this.isDownload = false;
-                this.commonSer.downloadFile('事件分类统计.xls', data);
+                this.commonSer.downloadFile('事件分类统计.xlsx', data);
             }
         );
     }

src/main/webapp/app/analysis/operation-work/analysis-status/analysis-status.component.ts

@@ -140,7 +140,7 @@ export class AnalysisStatusComponent implements OnInit {
         this.analysisSer.exportByStatus(data).subscribe(
             (data) => {
                 this.isDownload = false;
-                this.commonSer.downloadFile('解决状态.xls', data);
+                this.commonSer.downloadFile('解决状态.xlsx', data);
             }
         );
     }

src/main/webapp/app/analysis/resource-alarm/resource-alarm.component.ts

@@ -391,7 +391,7 @@ export class ResourceAlarmComponent implements OnInit {
                     this.workSer.downloadTemplate('commonProblemTop',res.data).subscribe(
                         (data)=>{
                             this.isDownload1 = false;
-                            this.commonSer.downloadFile('常见问题top10.xls',data)
+                            this.commonSer.downloadFile('常见问题top10.xlsx',data)
                         }
                     )
                 }else{
@@ -421,7 +421,7 @@ export class ResourceAlarmComponent implements OnInit {
                     this.workSer.downloadTemplate('statisticalReport',res.data).subscribe(
                         (data)=>{
                             this.isDownload2 = false;
-                            this.commonSer.downloadFile('统计报告.xls',data)
+                            this.commonSer.downloadFile('统计报告.xlsx',data)
                         }
                     )
                 }else{

src/main/webapp/app/analysis/resource-usabil/resource-usabil.component.ts

@@ -252,7 +252,7 @@ export class ResourceUsabilComponent implements OnInit {
                     this.workSer.downloadTemplate('failureRate',res.data).subscribe(
                         (data)=>{
                             this.isDownload = false;
-                            this.commonSer.downloadFile('资源可用性统计.xls',data)
+                            this.commonSer.downloadFile('资源可用性统计.xlsx',data)
                         }
                     )
                 }else{

src/main/webapp/app/system/group/group.component.ts

@@ -283,7 +283,7 @@ export class GroupComponent implements OnInit {
     downLoad(){
       this.systemSer.downloadTemplate("",SERVER_API_URL_COMS + "/user/downloadTemplate/").subscribe(
           data=>{
-              this.commonSer.downloadFile("模版.xls",data)
+              this.commonSer.downloadFile("模版.xlsx",data)
           }
       );
     }

src/main/webapp/app/work/asset-part/asset-part.component.ts

@@ -174,7 +174,7 @@ export class AssetPartComponent implements OnInit {
     downLoad(){
         this.systemSer.downloadTemplate("inventory",SERVER_API_URL + "/api/template/download/").subscribe(
             (data)=>{
-                this.commonSer.downloadFile("资产模版.xls",data);
+                this.commonSer.downloadFile("资产模版.xlsx",data);
             }
         )
     }

src/main/webapp/app/work/asset-part/child-assets/child-assets.component.ts

@@ -151,7 +151,7 @@ export class ChildAssetsComponent implements OnInit {
     downLoad(){
         this.systemSer.downloadTemplate("inventory",SERVER_API_URL + "/api/template/download/").subscribe(
             (data)=>{
-                this.commonSer.downloadFile("资产模版.xls",data);
+                this.commonSer.downloadFile("资产模版.xlsx",data);
             }
         )
     }
@@ -172,7 +172,7 @@ export class ChildAssetsComponent implements OnInit {
                 (res)=>{
                     this.workSer.downloadTemplate("inventory",res.data).subscribe(
                         (data)=>{
-                            this.commonSer.downloadFile("文件.xls",data)
+                            this.commonSer.downloadFile("文件.xlsx",data)
                         }
                     )
                 }

src/main/webapp/app/work/modal/look-plan/look-plan.component.ts

@@ -40,7 +40,7 @@ export class LookPlanComponent implements OnInit {
     downLoad() {
         this.workSer.downloadTemplate('plan', this.planId).subscribe(
             (data) => {
-                this.commonSer.downloadFile(this.plan.fileName+".xls", data);
+                this.commonSer.downloadFile(this.plan.fileName+".xlsx", data);
             }
         );
     }

src/main/webapp/app/work/work-handle/Event/event.component.html

@@ -9,7 +9,7 @@
                         <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="title">事件标题</nz-form-label>
                         <nz-form-control [nzSpan]="14">
                             <input id="title" nz-input placeholder="事件标题" name="title" formControlName="title">
-                            <nz-form-explain *ngIf="validateForm.get('title').dirty && validateForm.get('title').errors">请输入事件标题</nz-form-explain>
+                            <nz-form-explain *ngIf="validateForm.get('title').dirty && validateForm.get('title').errors">最多输入20个字</nz-form-explain>
                         </nz-form-control>
                     </nz-form-item>
                 </div>
@@ -37,7 +37,7 @@
                     <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="requester">请求人</nz-form-label>
                     <nz-form-control [nzSpan]="14">
                         <input id="requester" nz-input placeholder="请求人" name="requester" formControlName="requester">
-                        <nz-form-explain *ngIf="validateForm.get('requester').dirty && validateForm.get('requester').errors">请输入请求人</nz-form-explain>
+                        <nz-form-explain *ngIf="validateForm.get('requester').dirty && validateForm.get('requester').errors">最多输入10个字</nz-form-explain>
 
                     </nz-form-control>
                 </nz-form-item>
@@ -49,7 +49,7 @@
                     </nz-form-label>
                     <nz-form-control [nzSpan]="14">
                         <input id="requesterPhone" nz-input placeholder="联系电话" name="requesterPhone" formControlName="requesterPhone">
-                        <nz-form-explain *ngIf="validateForm.get('requesterPhone').dirty && validateForm.get('requesterPhone').errors">请输入联系电话</nz-form-explain>
+                        <nz-form-explain *ngIf="validateForm.get('requesterPhone').dirty && validateForm.get('requesterPhone').errors">请输入13位联系电话</nz-form-explain>
 
                     </nz-form-control>
                 </nz-form-item>

src/main/webapp/app/work/work-handle/Event/event.component.ts

@@ -36,8 +36,8 @@ export class EventComponent implements OnInit {
                 title: [null, [Validators.required,Validators.maxLength(20)]],
                 description: [null,Validators.maxLength(300)],
                 type: [null, [Validators.required]],
-                requester: [null, [Validators.required]],
-                requesterPhone: [null, [Validators.required]],
+                requester: [null, [Validators.required,Validators.maxLength(10)]],
+                requesterPhone: [null, [Validators.required,Validators.maxLength(13)]],
                 operators: [null],
             }
         );

src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.ts

@@ -53,7 +53,7 @@ export class HandleDetailComponent implements OnInit {
     downLoad(){
         this.workSer.downloadTemplate("event",this.eventId).subscribe(
             (data)=>{
-                this.commonSer.downloadFile(this.event.fileName+".xls",data)
+                this.commonSer.downloadFile(this.event.fileName+".xlsx",data)
             }
         )
     }

src/main/webapp/app/work/work-handle/handle-event/handle-event.component.ts

@@ -139,7 +139,7 @@ export class HandleEventComponent implements OnInit {
     downLoad(){
         this.workSer.downloadTemplate("event",this.eventId).subscribe(
             (data)=>{
-                this.commonSer.downloadFile(this.event.fileName+".xls",data)
+                this.commonSer.downloadFile(this.event.fileName+".xlsx",data)
             }
         )
     }

src/main/webapp/content/css/global.css

@@ -351,3 +351,6 @@ ui bootstrap tweaks
     font-weight: 400 !important;
     color:#6097b7;
 }
+.ant-menu-inline .ant-menu-item, .ant-menu-inline .ant-menu-submenu-title{
+    width: auto;
+}

src/main/webapp/content/javascript/jtopo/js/jtopo-editor.js

@@ -29,7 +29,6 @@ TopologyPanel.prototype.saveTopology = function (url) {
     }
     // 获取json
     var topologyJSON = editor.stage.toJson();
-    console.log(topologyJSON);
     return topologyJSON;
     // 保存拓扑图数据
 }
@@ -775,7 +774,6 @@ TopologyEditor.prototype.init = function (topologyGuid, backImg, topologyJson,ca
                     self.link.lineWidth = self.config.linkDefaultWidth
                     self.link.shadow = self.config.linkShadow
                     self.link.strokeColor = JTopo.util.randomColor()
-                    console.log(self.link);
                     this.add(self.link)
                     self.tempNodeA.setLocation(event.x, event.y)
                     self.tempNodeZ.setLocation(event.x, event.y)
@@ -1080,7 +1078,7 @@ editor.utils = {
         var node = new JTopo.Node()
         node.fontColor = editor.config.nodeFontColor
         // 节点坐标
-        node.setBound(320, -200, 50, 50);
+        node.setBound(-800, -500, 50, 50);
 
         // 默认节点图片
         node.setImage(img);