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

Merge branch 'develop'

pull/117/head
13621160019@163.com 2021-12-30 19:13:22 +08:00
parent 66ce56b7c2 824be32832
commit f443387e41
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,12 +183,16 @@ app.controller('ModalAddPointCtrl', function($scope, $uibModalInstance) {
$scope.cancel = function() { $scope.cancel = function() {
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');
}; };
$scope.$watch("point.object_type",function () {
$scope.point.is_virtual = false;
});
}); });
app.controller('ModalEditPointCtrl', function($scope, $uibModalInstance, params) { app.controller('ModalEditPointCtrl', function($scope, $uibModalInstance, params) {
$scope.operation = "SETTING.EDIT_POINT"; $scope.operation = "SETTING.EDIT_POINT";
$scope.point = params.point; $scope.point = params.point;
$scope.is_edit = true;
$scope.ok = function() { $scope.ok = function() {
$uibModalInstance.close($scope.point); $uibModalInstance.close($scope.point);
}; };

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

@ -16,7 +16,7 @@
<div class="form-group"><label class="col-sm-4 control-label">{{'POINT.OBJECT_TYPE' | translate}}</label> <div class="form-group"><label class="col-sm-4 control-label">{{'POINT.OBJECT_TYPE' | translate}}</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="pointobject_type" ng-model="point.object_type" class="form-control m-b"> <select name="pointobject_type" ng-model="point.object_type" ng-disabled="is_edit" class="form-control m-b">
<option value="ENERGY_VALUE">ENERGY VALUE</option> <option value="ENERGY_VALUE">ENERGY VALUE</option>
<option value="ANALOG_VALUE">ANALOG VALUE</option> <option value="ANALOG_VALUE">ANALOG VALUE</option>
<option value="DIGITAL_VALUE">DIGITAL VALUE</option> <option value="DIGITAL_VALUE">DIGITAL VALUE</option>