Skip to content

Commit

Permalink
feat: yunweirenyuan
Browse files Browse the repository at this point in the history
  • Loading branch information
dawnwinterLiu committed Oct 28, 2022
1 parent a33ee69 commit f383fe3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 17 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.EN.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [4.6.2](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.2) (2022-10-21)
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-10-28)


### Bug Fixes
Expand All @@ -11,6 +11,7 @@

* **cloudOperations): fix(equipmentCloud:** 产品默认位置 ([28a8297](https://github.com/dgiot/dgiot-dashboard/commit/28a82977351e884cb9173950a044e77fc56fb07d))
* **cloudOperations:** 告警关联规则引擎修改 ([f61ef67](https://github.com/dgiot/dgiot-dashboard/commit/f61ef6716d84ac4ed8a7b011afe56d308b056f83))
* **dashboard:** 4.6.3 ([a33ee69](https://github.com/dgiot/dgiot-dashboard/commit/a33ee6927f7816f142238d151c47174ff4d23d9f))
* **dashboard:** update v4.6.2 ([2f344d5](https://github.com/dgiot/dgiot-dashboard/commit/2f344d5c43660950738926aeac7b9f7be3f56a49))
* dgiot_grafana ([a9eb8ef](https://github.com/dgiot/dgiot-dashboard/commit/a9eb8ef9210bcba3b06905b37f3466015087204f))
* index ([84ec4c3](https://github.com/dgiot/dgiot-dashboard/commit/84ec4c3a0c03016b7724d37a5784ce46bcafb04e))
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.ZH.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [4.6.2](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.2) (2022-10-21)
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-10-28)


### Bug Fixes
Expand All @@ -11,6 +11,7 @@

* **cloudOperations): fix(equipmentCloud:** 产品默认位置 ([28a8297](https://github.com/dgiot/dgiot-dashboard/commit/28a82977351e884cb9173950a044e77fc56fb07d))
* **cloudOperations:** 告警关联规则引擎修改 ([f61ef67](https://github.com/dgiot/dgiot-dashboard/commit/f61ef6716d84ac4ed8a7b011afe56d308b056f83))
* **dashboard:** 4.6.3 ([a33ee69](https://github.com/dgiot/dgiot-dashboard/commit/a33ee6927f7816f142238d151c47174ff4d23d9f))
* **dashboard:** update v4.6.2 ([2f344d5](https://github.com/dgiot/dgiot-dashboard/commit/2f344d5c43660950738926aeac7b9f7be3f56a49))
* dgiot_grafana ([a9eb8ef](https://github.com/dgiot/dgiot-dashboard/commit/a9eb8ef9210bcba3b06905b37f3466015087204f))
* index ([84ec4c3](https://github.com/dgiot/dgiot-dashboard/commit/84ec4c3a0c03016b7724d37a5784ce46bcafb04e))
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [4.6.2](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.2) (2022-10-21)
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-10-28)


### Bug Fixes
Expand All @@ -11,6 +11,7 @@

* **cloudOperations): fix(equipmentCloud:** 产品默认位置 ([28a8297](https://github.com/dgiot/dgiot-dashboard/commit/28a82977351e884cb9173950a044e77fc56fb07d))
* **cloudOperations:** 告警关联规则引擎修改 ([f61ef67](https://github.com/dgiot/dgiot-dashboard/commit/f61ef6716d84ac4ed8a7b011afe56d308b056f83))
* **dashboard:** 4.6.3 ([a33ee69](https://github.com/dgiot/dgiot-dashboard/commit/a33ee6927f7816f142238d151c47174ff4d23d9f))
* **dashboard:** update v4.6.2 ([2f344d5](https://github.com/dgiot/dgiot-dashboard/commit/2f344d5c43660950738926aeac7b9f7be3f56a49))
* dgiot_grafana ([a9eb8ef](https://github.com/dgiot/dgiot-dashboard/commit/a9eb8ef9210bcba3b06905b37f3466015087204f))
* index ([84ec4c3](https://github.com/dgiot/dgiot-dashboard/commit/84ec4c3a0c03016b7724d37a5784ce46bcafb04e))
Expand Down
14 changes: 0 additions & 14 deletions src/views/DeviceCloud/manage/home_index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -433,17 +433,6 @@
<el-option label="关机" value="false" />
</el-select>
</el-form-item>
<el-form-item label="当前状态">
<el-select
v-model="queryForm.state"
clearable
placeholder="请选择当前状态"
@change="handleQuery()"
>
<el-option label="战时状态" value="1" />
<el-option label="平时状态" value="0" />
</el-select>
</el-form-item>
<el-form-item label="运维人员">
<el-cascader
ref="myCascader1"
Expand Down Expand Up @@ -652,9 +641,6 @@
<el-tag :type="row.status == 'ONLINE' ? 'success' : 'warning'">
{{ row.status == 'ONLINE' ? '在线' : '离线' }}
</el-tag>
<el-tag :type="row.state == '0' ? 'success' : 'danger'">
{{ row.state == '0' ? '平时状态' : '战时状态' }}
</el-tag>
</template>
</el-table-column>
<el-table-column
Expand Down

1 comment on commit f383fe3

@vercel
Copy link

@vercel vercel bot commented on f383fe3 Oct 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

dgiot-dashboard – ./

dgiot-dashboard.vercel.app
dgiot-dashboard-git-master-dgiot.vercel.app
dgiot-dashboard-dgiot.vercel.app

Please sign in to comment.