diff --git a/src/api/iot/project_new.js b/src/api/iot/project_new.js index 9f216760..bca64cff 100644 --- a/src/api/iot/project_new.js +++ b/src/api/iot/project_new.js @@ -206,3 +206,12 @@ export function projectSceneDelete(siteId) { method: 'delete' }) } + +// 查询 场景控制 修改状态 +export function projectSceneChangeStatus(data) { + return request({ + url: '/iot/scene/changeStatus', + method: 'put', + data: data + }) +} diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue index 55bfae51..bc4f663e 100644 --- a/src/components/SelectTable/index.vue +++ b/src/components/SelectTable/index.vue @@ -114,7 +114,7 @@ :total="queryOption.page.total" :page.sync="queryOption.page.pageNum" :limit.sync="queryOption.page.pageSize" - @pagination="handleQuery2" + @pagination="handleQuery" /> @@ -219,7 +219,7 @@ export default { }, updated() { if (this.optionTrue && this.tableList.length <= 0) { - this.handleQuery2(); + this.handleQuery(); } }, methods: { @@ -239,13 +239,8 @@ export default { this.optionTrue = false this.getList(this.queryOption.page, this.queryOption.params); }, - handleQuery2() { - this.optionTrue = false - this.getList(this.queryOption.page, this.queryOption.params); - }, /** 重置按钮操作 */ resetQuery() { - this.dataList = []; this.resetForm("queryForm"); this.queryOption.page.pageNum = 1; this.handleQuery(); @@ -275,12 +270,16 @@ export default { }, created() { this.params = this.queryOption.params; - this.handleQuery2(); + this.handleQuery(); }, watch: { - tableList(value) { - this.dataList = value; - this.tableOption.loading = false; + tableList: { + handler(val) { + console.log('tableList--updata', val); + this.dataList = [...val]; + this.tableOption.loading = false; + }, + deep: true, } } }; diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 1da290cf..32869a53 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -19,9 +19,9 @@ const permission = { SET_SIDEBAR_ROUTERS: (state, routers) => { state.sidebarRouters = constantRoutes.concat(routers) }, - SET_ATTRIBUTE: (state, size) => { - state.attribute = size - } + SET_ATTRIBUTE: (state, atribute) => { + state.attribute = atribute + }, }, actions: { // 生成路由 @@ -34,6 +34,14 @@ const permission = { }) }) }, + // 根据对象 属性更新 + SetAttributeByKey({ commit, state }, params) { + return new Promise(resolve => { + // 向后端请求路由数据 + console.log('請求--GetAttribute') + commit('SET_ATTRIBUTE', Object.assign(state.attribute, params)) + }) + }, // 生成路由 GenerateRoutes({ commit }) { return new Promise(resolve => { diff --git a/src/views/iot/project/profileV2/ENavMenu/index.vue b/src/views/iot/project/profileV2/ENavMenu/index.vue index fc9f17bb..dceb020b 100644 --- a/src/views/iot/project/profileV2/ENavMenu/index.vue +++ b/src/views/iot/project/profileV2/ENavMenu/index.vue @@ -217,26 +217,30 @@ export default { width: 20px; height: 20px; display: flex; + -webkit-box-align: center; + -ms-flex-align: center; align-items: center; - justify-content: left; + -webkit-box-pack: left; + -ms-flex-pack: left; border: 1px solid #e9e9e9; - border-radius: 0 50% 50% 0; + border-radius: 50%; position: relative; - left: 40px; - font-size: 15px; + font-size: 14px; font-weight: 400; - border-left: 0; - top: -14px; + top: -10px; + justify-content: center; + background: #ffffff; } .e-shrink:hover { border-color: #4395ff; color: #4395ff; } .is-shrink-true { - left: 40px; + left: 30px; } .is-shrink-false { left: 100%; + left: calc(100% - 10px); } .nav-menu-item { width: 100%; diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/config.js b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/config.js index e41f4de1..c0e27d5e 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/config.js +++ b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/config.js @@ -11,5 +11,7 @@ export const defaultConfig = { export const notifierType = { SMS: '短信', - WEEXIN: '微信' + WECHAT: '微信', + EMAIL: '邮件', + VOICE: '语音' } diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue index f64b8393..8eb302b4 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue +++ b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue @@ -70,7 +70,7 @@ > @@ -115,7 +115,7 @@ { this.tableSelectOption.tableList = res.rows; + this.tableList = res.rows; this.tableSelectOption.queryOpt.page.total = Number(res.total); this.$forceUpdate(); }); @@ -412,8 +415,8 @@ export default {