diff --git a/src/api/hard/hard-door-manager.ts b/src/api/hard/hard-door-manager.ts
index fbebb63..6e287d3 100644
--- a/src/api/hard/hard-door-manager.ts
+++ b/src/api/hard/hard-door-manager.ts
@@ -6,7 +6,7 @@ import request from "/@/utils/request"
* @param systemVolume 系统音量
* @param mediaVolume 媒体音量
*/
-export function getByCabinetNo(data?: { hardId: any; systemVolume: any; mediaVolume: any }) {
+export function changeVolume(data?: { hardId: any; systemVolume: any; mediaVolume: any }) {
return request({
url: "/hard/hard-door-manager/change-volume",
method: "post",
diff --git a/src/api/hard/hard-spu.ts b/src/api/hard/hard-spu.ts
index 5f7e267..6253e35 100644
--- a/src/api/hard/hard-spu.ts
+++ b/src/api/hard/hard-spu.ts
@@ -13,6 +13,19 @@ export function getByCabinetNo(query?: { hardId: any; cabinetNo: any }) {
})
}
+/**
+ * 上架
+ * @param id 绑定id
+ * @param hardSpuId 商品id
+ */
+export function putaway(data?: { id: any; hardSpuId: any }) {
+ return request({
+ url: "/hard/hard-spu/putaway",
+ method: "post",
+ data: data,
+ })
+}
+
export function asyncAll(query?: Object) {
return request({
url: "/hard/hard-spu/async-all",
diff --git a/src/api/integrated/faqCategory.ts b/src/api/integrated/faqCategory.ts
new file mode 100644
index 0000000..e4524ad
--- /dev/null
+++ b/src/api/integrated/faqCategory.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: '/integrated/faqCategory/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: '/integrated/faqCategory',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: '/integrated/faqCategory/' + id,
+ method: 'get'
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: '/integrated/faqCategory',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: '/integrated/faqCategory',
+ method: 'put',
+ data: obj
+ })
+}
+
diff --git a/src/api/integrated/faqInfo.ts b/src/api/integrated/faqInfo.ts
new file mode 100644
index 0000000..5d7f3ac
--- /dev/null
+++ b/src/api/integrated/faqInfo.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: '/integrated/faqInfo/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: '/integrated/faqInfo',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: '/integrated/faqInfo/' + id,
+ method: 'get'
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: '/integrated/faqInfo',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: '/integrated/faqInfo',
+ method: 'put',
+ data: obj
+ })
+}
+
diff --git a/src/api/integrated/visitors.ts b/src/api/integrated/visitors.ts
new file mode 100644
index 0000000..de66547
--- /dev/null
+++ b/src/api/integrated/visitors.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: '/integrated/visitors/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: '/integrated/visitors',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: '/integrated/visitors/' + id,
+ method: 'get'
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: '/integrated/visitors',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: '/integrated/visitors',
+ method: 'put',
+ data: obj
+ })
+}
+
diff --git a/src/views/admin/token/index.vue b/src/views/admin/token/index.vue
index 9d52f8a..9b87857 100644
--- a/src/views/admin/token/index.vue
+++ b/src/views/admin/token/index.vue
@@ -6,6 +6,9 @@
+
+
+
{{ $t('common.queryBtn') }}
{{ $t('common.resetBtn') }}
@@ -81,6 +84,7 @@ const multiple = ref(true);
const state: BasicTableProps = reactive({
queryForm: {
username: '',
+ userId: '',
},
pageList: fetchList,
});
diff --git a/src/views/hard/hard-door-manager/info-setting.vue b/src/views/hard/hard-door-manager/info-setting.vue
index 6fb4f0d..eca745f 100644
--- a/src/views/hard/hard-door-manager/info-setting.vue
+++ b/src/views/hard/hard-door-manager/info-setting.vue
@@ -7,28 +7,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -53,29 +34,29 @@ const form = reactive({
id: "",
hardId: "",
imei: "",
+ doorCount: "",
deviceCode: "",
})
-const dataRules = ref({})
+const dataRules = ref({
+ imei: [{ required: true, message: "设备IMEI卡号不能为空", trigger: "blur" }],
+ doorCount: [{ required: true, message: "柜子层数不能为空", trigger: "blur" }],
+})
// 打开弹窗
-const openDialog = async (id: string) => {
+const openDialog = async (hardId: string) => {
visible.value = true
- form.id = ""
-
+ form.hardId = hardId
dataFormRef.value?.resetFields()
-
- if (id) {
- form.id = id
- const res = await hardDoorManager.getObj(id)
+ if (hardId) {
+ const res = await hardDoorManager.getByHardId({ hardId: hardId })
Object.assign(form, res.data)
}
}
// 提交
const onSubmit = async () => {
- if (!form.id) return useMessage().error("设备id不存在")
-
+ if (!form.hardId) return useMessage().error("设备id不存在")
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return
diff --git a/src/views/hard/hard-door-manager/volume-setting.vue b/src/views/hard/hard-door-manager/volume-setting.vue
index 3613cbb..0917cdf 100644
--- a/src/views/hard/hard-door-manager/volume-setting.vue
+++ b/src/views/hard/hard-door-manager/volume-setting.vue
@@ -7,7 +7,6 @@
-
@@ -23,7 +22,7 @@
\ No newline at end of file
diff --git a/src/views/integrated/faqCategory/index.vue b/src/views/integrated/faqCategory/index.vue
new file mode 100644
index 0000000..a220aaf
--- /dev/null
+++ b/src/views/integrated/faqCategory/index.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+