diff --git a/package.json b/package.json index 434db7e3..0768f633 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "dependencies": { "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", + "base-64": "^1.0.0", "clipboard": "2.0.8", "core-js": "3.25.3", "crypto-js": "^4.2.0", diff --git a/src/api/device/index.js b/src/api/device/index.js new file mode 100644 index 00000000..ec3088b5 --- /dev/null +++ b/src/api/device/index.js @@ -0,0 +1,113 @@ +import request from '@/utils/request' + + +// 分页查询设备信息 +export function getDeviceListPageApi(data) { + return request({ + url: '/smart-canteen/api/v2/device/page', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) +} + + +// 新增设备 +export function addDeviceApi(data) { + return request({ + url: '/smart-canteen/api/v2/device/insert', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) + } + +// 修改设备信息 +export function updateDeviceApi(data) { + return request({ + url: '/smart-canteen/api/v2/device/update', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) + } + + +// 删除设备信息 +// export function deleteDeviceApi(data) { +// return request({ +// url: '/smart-canteen/api/v2/device/delete', +// method: 'post', +// headers: { +// "merchant-id":"378915229716713472", +// }, +// data: data +// }) +// } + +export function deleteDeviceApi(deviceId){ + const formData = new FormData() + formData.append('deviceId', deviceId) + return request({ + url: '/smart-canteen/api/v2/device/delete', + method: 'post', + data: formData, + headers: { + "merchant-id":"378915229716713472", + }, + header:'multipart/form-data' + }) +} + +//{"page":{"current":1,"size":20,"total":0},"object":{"deviceSn":"124"}} +// 分页查询设备异常信息 +export function getDeviceStateLogApi(data) { + return request({ + url: '/smart-canteen/api/v2/device/statelog/page', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) + } + + +// 获取指定日期菜谱计划菜品详情 +export function getMenuRecipeDetailApi(data) { + return request({ + url: '/smart-canteen/api/v2/menurecipe/date/detail', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) + } + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/device/doubleScreen/index.vue b/src/views/device/doubleScreen/index.vue new file mode 100644 index 00000000..83180a67 --- /dev/null +++ b/src/views/device/doubleScreen/index.vue @@ -0,0 +1,747 @@ + + + + + \ No newline at end of file diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index eb299abe..2cf51e5d 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -195,6 +195,17 @@ + + + + 展开/折叠 全选/全不选 @@ -280,7 +291,7 @@ import { deptTreeSelect } from '@/api/system/role' import { treeselect as menuTreeselect, roleMenuTreeselect } from '@/api/system/menu' - +import { systemAreaTreeApi } from "@/api/base/area"; export default { name: 'Role', dicts: ['sys_normal_disable'], @@ -349,6 +360,7 @@ export default { }, // 表单参数 form: {}, + areaOptions:[],//区域树 defaultProps: { children: 'children', label: 'label' @@ -363,11 +375,15 @@ export default { ], roleSort: [ { required: true, message: '角色顺序不能为空', trigger: 'blur' } - ] + ], + areaId: [ + { required: true, message: '所属区域不能为空', trigger: 'change' } + ], } } }, created() { + this.getTreeData() this.getList() }, methods: { @@ -381,6 +397,17 @@ export default { } ) }, + //区域树 + getTreeData() { + systemAreaTreeApi({}).then((response) => { + this.areaOptions = response; + console.log(this.areaOptions) + }); + }, + handleAreaChange(e){ + console.log(e) + console.log(this.form.areaId) + }, /** 查询菜单树结构 */ getMenuTreeselect() { menuTreeselect().then(response => { @@ -457,6 +484,7 @@ export default { status: '0', menuIds: [], deptIds: [], + areaId: undefined, menuCheckStrictly: true, deptCheckStrictly: true, remark: undefined diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 7016fe8c..c05c8d8b 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -464,6 +464,32 @@ + + + + + + + + + + + + {{ item.name }} + + + + + @@ -619,6 +645,7 @@ export default { dicts: [ 'sys_normal_disable', 'sys_user_sex', + 'user_psn_type', 'sys_login_type', 'sys_user_permanent', ], @@ -657,6 +684,7 @@ export default { roleOptions: [], // 登录权限数组 loginTypeArr: [], + isCustomerList:[{id:"0",name:"是"},{id:"1",name:"否"}], // 角色下拉多选限制数量 multipleLimit: 1, // 表单参数 @@ -895,6 +923,7 @@ export default { email: undefined, sex: undefined, status: '0', + isCustomer: '0', remark: undefined, postIds: [], roleIds: [],