配置jks以及日常提交

docker/Dockerfile

+# Http Server
+# Version: 2.4.33
+
+FROM registry.cn-hangzhou.aliyuncs.com/witcloud/docker-httpd:latest
+
+# Maintainers
+MAINTAINER Carit Zhu "carit.zhu@witium.com"
+
+RUN rm -rf /usr/local/apache2/htdocs/*
+
+# Add dist package
+ADD dist.tar.gz /usr/local/apache2/htdocs/
+

package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build",
+    "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"

src/app/main/sensor-detail/sensor-detail.component.html

@@ -108,13 +108,10 @@
               <th nz-th><span>{{'wayAlias' | translate}}</span></th>
               <th nz-th><span>{{'per' | translate}}</span></th>
               <th nz-th><span>{{'wayType' | translate}}</span></th>
+              <th nz-th><span>{{'updateTime' | translate}}</span></th>
+              <th nz-th><span>{{'updateData' | translate}}</span></th>
               <th nz-th><span>{{'max' | translate}}</span></th>
               <th nz-th><span>{{'min' | translate}}</span></th>
-              <th nz-th><span>{{'alarmMax' | translate}}</span></th>
-              <th nz-th><span>{{'alarmMaxMax' | translate}}</span></th>
-              <th nz-th><span>{{'alarmMin' | translate}}</span></th>
-              <th nz-th><span>{{'alarmMinMin' | translate}}</span></th>
-              <th nz-th><span>{{'isAlarm' | translate}}</span></th>
               <th nz-th><span>{{'oper' | translate}}</span></th>
             </tr>
             </thead>
@@ -124,17 +121,12 @@
               <td nz-td>{{one.alias}}</td>
               <td nz-td>{{one.unit}}</td>
               <td nz-td>{{one.type}}</td>
+              <td nz-td>{{one.time | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
+              <td nz-td>{{one.value}}</td>
               <td nz-td>{{one.rangeMax}}</td>
               <td nz-td>{{one.rangeMin}}</td>
-              <td nz-td>{{one.alarmUp}}</td>
-              <td nz-td>{{one.upperAlarmLimit}}</td>
-              <td nz-td>{{one.alarmDown}}</td>
-              <td nz-td>{{one.lowerAlarmLimit}}</td>
-              <td nz-td>{{one.isAlarm === 1 ? '是': '否'}}</td>
               <td nz-td>
-                <span class="editSpan" (click)="update2(one)">{{'update' | translate}}</span>
-                <nz-divider nzType="vertical"></nz-divider>
-                <span class="deleteFontColor" (click)="deleteConfirm2(one)">{{'delete' | translate}}</span>
+                <span class="editSpan" (click)="toSee(one)">{{'see' | translate}}</span>
               </td>
             </tr>
             </tbody>
@@ -142,15 +134,15 @@
         </nz-tab>
         <nz-tab nzTitle="图表">
           <div class="cards">
-            <div class="card" *ngFor="let one of items">
+            <div class="card" *ngFor="let one of actualData">
               <div class="title">
                 {{one.name}}
-                <div class="rightSpan canClick">查看数据</div>
+                <div class="rightSpan canClick" (click)="isClose = true">查看数据</div>
               </div>
               <div class="middle">
-                <div class="left">{{one.data}}{{one.per}}</div>
+                <div class="left">{{one.value}}{{one.unit === '-' ? '' : one.unit}}</div>
                 <div class="right">
-                  {{one.min}}{{one.per}} - {{one.max}}{{one.per}}
+                  {{one.rangeMin}}{{one.unit === '-' ? '' : one.unit}} - {{one.rangeMax}}{{one.unit === '-' ? '' : one.unit}}
                 </div>
               </div>
               <div class="bottom">
@@ -158,7 +150,7 @@
               </div>
             </div>
           </div>
-          <div class="charts">
+          <div class="charts" *ngIf="isClose">
             <div style="width: calc(100% - 80px);display: inline-block;vertical-align: top;padding-left: 15px;">
               <app-search-select inModal="true" [label]="'selectTime' | translate" [(value)]="selectTime3"
                                  optL="a" optV="b" [data]="[{a: '1小时', b: 1}, {a: '24小时', b: 24}, {a: '7天', b: 144}, {a: '自定义', b: 0}]"></app-search-select>
@@ -174,7 +166,7 @@
               <nz-tab nzTitle="图表">222</nz-tab>
             </nz-tabset>
             <div class="btnLine">
-              <button nz-button [nzType]="'default'" [nzLoading]="isLoading" (click)="close()">
+              <button nz-button [nzType]="'default'" [nzLoading]="isLoading" (click)="isClose = false;">
                 <span>{{'close' | translate}}</span></button>
             </div>
           </div>

src/app/main/sensor-detail/sensor-detail.component.ts

@@ -25,34 +25,12 @@ export class SensorDetailComponent implements OnInit {
   isUC2 = false;
   isMC = false;
   isUpdate = false;
-  isUpdate2 = false;
   probsModels = [];
   topicModels = [];
   actualData = [];
   wayData = [];
   selectTime3 = 24;
-  items = [{
-    name: '液位',
-    data: '1',
-    per: '℃',
-    max: '2',
-    min: '0',
-    time: new Date().getTime()
-  }, {
-    name: '液位',
-    data: '1',
-    per: '℃',
-    max: '2',
-    min: '0',
-    time: new Date().getTime()
-  }, {
-    name: '液位',
-    data: '1',
-    per: '℃',
-    max: '2',
-    min: '0',
-    time: new Date().getTime()
-  }];
+  isClose = false;
   constructor(private api: ApiService, private message: NzMessageService, private router: Router,
               private ac: ActivatedRoute, private modalService: NzModalService, private translate: TranslateService) { }
 
@@ -75,12 +53,15 @@ export class SensorDetailComponent implements OnInit {
   }
 
   next = (data) => {
-    if (data && data.constructor === Array) {
-    } else if (data.code === 1) {
+    if (data && data.code === 1) {
       this.message.success(data && data.message ? data.message : '操作成功');
       this.cancel();
       this.getTopicData();
-    } else if (data.code === 0) {
+      this.getProbsModels();
+      this.getTopicModels();
+      this.getProbs();
+      this.getCurrent();
+    } else if (data && data.code === 0) {
       this.message.error(data && data.message ? data.message : '操作失败');
     } else {
       this.message.error(data && data.message ? data.message : '获取数据失败');
@@ -215,7 +196,7 @@ export class SensorDetailComponent implements OnInit {
 
 
   add2() {
-    this.isUpdate2 = false;
+    this.isUpdate = false;
     this.req2 = {};
     this.req2.deviceNo = this.deviceNo;
     this.isUC2 = true;
@@ -223,8 +204,8 @@ export class SensorDetailComponent implements OnInit {
 
   update2(one) {
     this.req2 = {...one};
-    this.isUpdate2 = true;
-    this.req2.oldTopicName = one.topicName;
+    this.isUpdate = true;
+    this.req2.oldName = one.name;
     this.isUC2 = true;
   }
 
@@ -238,6 +219,8 @@ export class SensorDetailComponent implements OnInit {
 
   delete2(one) {
     this.isLoading = true;
-    this.api.topic.delTopic([{deviceNo: one.deviceNo, topicName: one.topicName}, this.next]);
+    this.api.probes.delAProbes([{deviceNo: one.deviceNo, topicName: one.topicName, name: one.name}, this.next]);
   }
+
+  toSee() {}
 }

src/assets/i18n/zh.json

@@ -150,5 +150,8 @@
   "changeModel": "更换模板",
   "sensorTopicWay": "传感器主题通道",
   "topic": "主题",
-  "updateWay": "编辑通道"
+  "updateWay": "编辑通道",
+  "updateTime": "更新时间",
+  "updateData": "最新数据",
+  "see": "查看"
 }

src/environments/environment.prod.ts

 export const environment = {
-  production: true
+  production: true,
+  baseUrl: 'http://47.111.110.50:8094', // 对外访问测试网地址
 };