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

2022/1/10

pull/112/head
Caozhenhui 2022-01-10 09:41:45 +08:00
parent f28431a511 1a97d02fcd
commit a4a1cfaa2a
7 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/README.md vendored
View File

@ -31,6 +31,7 @@ docker build -t myems/myems-admin .
``` ```
* Run a Docker container * Run a Docker container
If run on Windows host, bind-mount a share upload file folder at c:\upload to the container If run on Windows host, bind-mount a share upload file folder at c:\upload to the container
-v parameter must be same with that in myems-api
```bash ```bash
docker run -d -p 8001:8001 -v c:\upload:/var/www/html/admin/upload --restart always --name myems-admin myems/myems-admin docker run -d -p 8001:8001 -v c:\upload:/var/www/html/admin/upload --restart always --name myems-admin myems/myems-admin
``` ```

2
admin/app/controllers/settings/tariff/tariff.controller.js
View File

@ -176,6 +176,7 @@ app.controller('ModalAddTariffCtrl', function($scope, $timeout, $uibModalInstanc
}, },
timePicker: true, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerSeconds: true,
timePickerIncrement: 1, timePickerIncrement: 1,
singleDatePicker: true, singleDatePicker: true,
}; };
@ -257,6 +258,7 @@ app.controller('ModalEditTariffCtrl', function($scope, $timeout, $uibModalInstan
}, },
timePicker: true, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerSeconds: true,
timePickerIncrement: 1, timePickerIncrement: 1,
singleDatePicker: true, singleDatePicker: true,
}; };

1
admin/css/myems.css
View File

@ -103,6 +103,7 @@ td.fontorange{
} }
select.sm{ select.sm{
width:60px; width:60px;
font-size: 12px;
} }
td.action{ td.action{
width:100px !important; width:100px !important;

11
admin/views/settings/tariff/tariff.model.html
View File

@ -113,11 +113,16 @@
</tr> </tr>
<tr> <tr>
<td class="text-center sm"> <td class="text-center sm">
<div class="col-sm-7">
<div uib-timepicker ng-model="t.start_time_of_day" show-meridian="false" show-seconds="true" show-spinners="false"></div> <input date-range-picker class="form-control date-picker" type="text" ng-model="t.start_time_of_day" options="dtOptions" style="width: auto"
placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
</div>
</td> </td>
<td class="text-center sm"> <td class="text-center sm">
<div uib-timepicker ng-model="t.end_time_of_day" show-meridian="false" show-seconds="true" show-spinners="false"></div> <div class="col-sm-7">
<input date-range-picker class="form-control date-picker" type="text" ng-model="t.end_time_of_day" options="dtOptions" style="width: auto"
placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
</div>
</td> </td>
<td class="text-center sm"> <td class="text-center sm">
<select ng-model="t.peak_type" class="form-control input-sm sm" name="peak"> <select ng-model="t.peak_type" class="form-control input-sm sm" name="peak">

1
myems-api/README.md
View File

@ -58,6 +58,7 @@ docker build -t myems/myems-api .
``` ```
* Run a Docker container * Run a Docker container
If run on Windows host, bind-mount a share upload file folder at c:\upload to the container If run on Windows host, bind-mount a share upload file folder at c:\upload to the container
-v parameter must be same with that in admin
```bash ```bash
docker run -d -p 8000:8000 -v c:\upload:/var/www/html/admin/upload --restart always --name myems-api myems/myems-api docker run -d -p 8000:8000 -v c:\upload:/var/www/html/admin/upload --restart always --name myems-api myems/myems-api
``` ```

2
web/README.md vendored
View File

@ -8,7 +8,7 @@ Providing Web UI of MyEMS for viewing energy reports
nginx-1.18.0 or later nginx-1.18.0 or later
Node.js 16.0.0 or later Node.js 17.0.0 or later
## Running in Local Environment for Development ## Running in Local Environment for Development

36
web/package-lock.json generated vendored
View File

@ -7973,9 +7973,9 @@
} }
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.35", "version": "1.4.36",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.35.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.36.tgz",
"integrity": "sha512-wzTOMh6HGFWeALMI3bif0mzgRrVGyP1BdFRx7IvWukFrSC5QVQELENuy+Fm2dCrAdQH9T3nuqr07n94nPDFBWA==" "integrity": "sha512-MbLlbF39vKrXWlFEFpCgDHwdlz4O3LmHM5W4tiLRHjSmEUXjJjz8sZkMgWgvYxlZw3N1iDTmCEtOkkESb5TMCg=="
}, },
"node_modules/element-resize-event": { "node_modules/element-resize-event": {
"version": "3.0.6", "version": "3.0.6",
@ -12373,9 +12373,9 @@
} }
}, },
"node_modules/is-core-module": { "node_modules/is-core-module": {
"version": "2.8.0", "version": "2.8.1",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
"integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
"dependencies": { "dependencies": {
"has": "^1.0.3" "has": "^1.0.3"
}, },
@ -20625,9 +20625,9 @@
"integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==" "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.45.2", "version": "1.46.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.45.2.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.46.0.tgz",
"integrity": "sha512-cKfs+F9AMPAFlbbTXNsbGvg3y58nV0mXA3E94jqaySKcC8Kq3/8983zVKQ0TLMUrHw7hF9Tnd3Bz9z5Xgtrl9g==", "integrity": "sha512-Z4BYTgioAOlMmo4LU3Ky2txR8KR0GRPLXxO38kklaYxgo7qMTgy+mpNN4eKsrXDTFlwS5vdruvazG4cihxHRVQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",
@ -30639,9 +30639,9 @@
} }
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.4.35", "version": "1.4.36",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.35.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.36.tgz",
"integrity": "sha512-wzTOMh6HGFWeALMI3bif0mzgRrVGyP1BdFRx7IvWukFrSC5QVQELENuy+Fm2dCrAdQH9T3nuqr07n94nPDFBWA==" "integrity": "sha512-MbLlbF39vKrXWlFEFpCgDHwdlz4O3LmHM5W4tiLRHjSmEUXjJjz8sZkMgWgvYxlZw3N1iDTmCEtOkkESb5TMCg=="
}, },
"element-resize-event": { "element-resize-event": {
"version": "3.0.6", "version": "3.0.6",
@ -34007,9 +34007,9 @@
"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==" "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
}, },
"is-core-module": { "is-core-module": {
"version": "2.8.0", "version": "2.8.1",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
"integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
"requires": { "requires": {
"has": "^1.0.3" "has": "^1.0.3"
} }
@ -39992,9 +39992,9 @@
"integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==" "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
}, },
"sass": { "sass": {
"version": "1.45.2", "version": "1.46.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.45.2.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.46.0.tgz",
"integrity": "sha512-cKfs+F9AMPAFlbbTXNsbGvg3y58nV0mXA3E94jqaySKcC8Kq3/8983zVKQ0TLMUrHw7hF9Tnd3Bz9z5Xgtrl9g==", "integrity": "sha512-Z4BYTgioAOlMmo4LU3Ky2txR8KR0GRPLXxO38kklaYxgo7qMTgy+mpNN4eKsrXDTFlwS5vdruvazG4cihxHRVQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",