seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added is_virtual to point in myems-admin

pull/42/head
13621160019@163.com 2021-05-07 09:01:19 +08:00
parent f9b72c6997
commit bb875521ef
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/app/controllers/settings/datasource/point.controller.js
View File

@ -244,6 +244,7 @@ app.controller('ModalAddPointCtrl', function($scope, $uibModalInstance) {
$scope.point = {}; $scope.point = {};
$scope.point.object_type = "ENERGY_VALUE"; $scope.point.object_type = "ENERGY_VALUE";
$scope.point.is_trend = true; $scope.point.is_trend = true;
$scope.point.is_virtual = false;
$scope.ok = function() { $scope.ok = function() {
$uibModalInstance.close($scope.point); $uibModalInstance.close($scope.point);
}; };

3
admin/app/translations.js
View File

@ -449,6 +449,7 @@ function config($translateProvider) {
LOW_LIMIT: 'Low Limit', LOW_LIMIT: 'Low Limit',
RATIO: 'Ratio', RATIO: 'Ratio',
IS_TREND: 'Is Trend', IS_TREND: 'Is Trend',
IS_VIRTUAL: 'Is Virtual',
ADDRESS: 'Address(JSON)', ADDRESS: 'Address(JSON)',
DESCRIPTION: 'Description(Optionnal)', DESCRIPTION: 'Description(Optionnal)',
INPUT_HIGH_LIMIT: 'Please Input High Limit', INPUT_HIGH_LIMIT: 'Please Input High Limit',
@ -1488,6 +1489,7 @@ function config($translateProvider) {
LOW_LIMIT: '低限', LOW_LIMIT: '低限',
RATIO: '比例系数', RATIO: '比例系数',
IS_TREND: '保存趋势', IS_TREND: '保存趋势',
IS_VIRTUAL: '虚拟点',
ADDRESS: '地址(JSON)', ADDRESS: '地址(JSON)',
DESCRIPTION: '描述', DESCRIPTION: '描述',
INPUT_HIGH_LIMIT: '请输入高限', INPUT_HIGH_LIMIT: '请输入高限',
@ -2539,6 +2541,7 @@ function config($translateProvider) {
LOW_LIMIT: 'Untergrenze', LOW_LIMIT: 'Untergrenze',
RATIO: 'Skalierungsfaktor', RATIO: 'Skalierungsfaktor',
IS_TREND: 'Trend speichern', IS_TREND: 'Trend speichern',
IS_VIRTUAL: 'Virtueller Punkt',
ADDRESS: 'Adresse (JSON)', ADDRESS: 'Adresse (JSON)',
DESCRIPTION: 'Beschreibung', DESCRIPTION: 'Beschreibung',
INPUT_HIGH_LIMIT: 'Bitte geben Sie das obere Limit ein', INPUT_HIGH_LIMIT: 'Bitte geben Sie das obere Limit ein',

5
admin/views/settings/datasource/datasource.html
View File

@ -72,6 +72,7 @@
<th class="text-center">{{'POINT.LOW_LIMIT' | translate}}</th> <th class="text-center">{{'POINT.LOW_LIMIT' | translate}}</th>
<th class="text-center">{{'POINT.RATIO' | translate}}</th> <th class="text-center">{{'POINT.RATIO' | translate}}</th>
<th class="text-center">{{'POINT.IS_TREND' | translate}}</th> <th class="text-center">{{'POINT.IS_TREND' | translate}}</th>
<th class="text-center">{{'POINT.IS_VIRTUAL' | translate}}</th>
<th class="text-center">{{'POINT.ADDRESS' | translate}}</th> <th class="text-center">{{'POINT.ADDRESS' | translate}}</th>
<th class="text-center">{{'POINT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th> <th class="text-center">{{'POINT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
@ -86,8 +87,8 @@
<td class="text-center">{{ point.high_limit }}</td> <td class="text-center">{{ point.high_limit }}</td>
<td class="text-center">{{ point.low_limit }}</td> <td class="text-center">{{ point.low_limit }}</td>
<td class="text-center">{{ point.ratio }}</td> <td class="text-center">{{ point.ratio }}</td>
<td class="text-center"> <td class="text-center">{{ point.is_trend==false?'SETTING.NO':'SETTING.YES' | translate }}</td>
{{ point.is_trend==false?'SETTING.NO':'SETTING.YES' | translate }}</td> <td class="text-center">{{ point.is_virtual==false?'SETTING.NO':'SETTING.YES' | translate }}</td>
<td class="text-center md">{{ point.address }}</td> <td class="text-center md">{{ point.address }}</td>
<td class="text-center md">{{ point.description }}</td> <td class="text-center md">{{ point.description }}</td>
<td class="text-center"> <td class="text-center">

12
admin/views/settings/datasource/point.model.html
View File

@ -65,7 +65,6 @@
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'POINT.IS_TREND' | translate}}</label> <div class="form-group"><label class="col-sm-4 control-label">{{'POINT.IS_TREND' | translate}}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="checkbox checkbox-success"> <div class="checkbox checkbox-success">
<input id="chk_point_istrend" type="checkbox" ng-model="point.is_trend" ng-checked="point.is_trend"> <input id="chk_point_istrend" type="checkbox" ng-model="point.is_trend" ng-checked="point.is_trend">
@ -73,6 +72,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'POINT.IS_VIRTUAL' | translate}}</label>
<div class="col-sm-8">
<div class="checkbox checkbox-success">
<input id="chk_point_isvirtual" type="checkbox" ng-model="point.is_virtual" ng-checked="point.is_virtual">
<label for="chk_point_isvirtual">{{'POINT.IS_VIRTUAL' | translate}}</label>
</div>
</div>
</div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'POINT.ADDRESS' | translate}}</label> <div class="form-group"><label class="col-sm-4 control-label">{{'POINT.ADDRESS' | translate}}</label>