diff --git a/src/api/admin/meeting/roomContent.js b/src/api/admin/meeting/roomContent.js
index 4694b3b..18b877e 100644
--- a/src/api/admin/meeting/roomContent.js
+++ b/src/api/admin/meeting/roomContent.js
@@ -54,11 +54,14 @@ export function selectSearchInfoByShape(parameter) {
})
}
-export function saveRoomContent(parameter) {
+export function saveRoomContent(parameter, files) {
return axios({
url: '/admin/meetingRoom' + (parameter.id > 0 ? '/update' : '/save'),
method: 'post',
- params: parameter,
+ data: {
+ room: parameter,
+ files: files
+ },
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
diff --git a/src/api/admin/meeting/uto.js b/src/api/admin/meeting/uto.js
new file mode 100644
index 0000000..bfe642a
--- /dev/null
+++ b/src/api/admin/meeting/uto.js
@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+ meetingUto: '/admin/uto'
+}
+
+export function getMeetingUtoList (parameter) {
+ return axios({
+ url: api.meetingUto + '/list',
+ method: 'get',
+ params: parameter
+ })
+}
+
+export function saveMeetingUto (parameter) {
+ return axios({
+ url: api.meetingUto + (parameter.id > 0 ? '/update' : '/save'),
+ method: 'post',
+ data: parameter,
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8'
+ }
+ })
+}
+
+export function delMeetingUto (parameter) {
+ return axios({
+ url: api.meetingUto + '/remove',
+ method: 'post',
+ params: parameter
+ })
+}
+
+export const meetingUtoExport = api.meetingUto + '/export'
diff --git a/src/views/admin/RepairList.vue b/src/views/admin/RepairList.vue
index 63b341a..e9d3b18 100644
--- a/src/views/admin/RepairList.vue
+++ b/src/views/admin/RepairList.vue
@@ -103,6 +103,7 @@
size='default'
ref='table'
rowKey='id'
+ showPagination="true"
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
:columns='columns'
:data='loadData'
diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue
index 649234c..2ee61bf 100644
--- a/src/views/admin/meeting/RoomContentList.vue
+++ b/src/views/admin/meeting/RoomContentList.vue
@@ -75,6 +75,7 @@
size='default'
ref='table'
rowKey='id'
+ showPagination='true'
:rowSelection='{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }'
:columns='columns'
:data='loadData'
@@ -95,17 +96,6 @@
-
- 是否确认删除?
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue
index 76dfac8..b422ae5 100644
--- a/src/views/admin/meeting/modules/RoomContentModal.vue
+++ b/src/views/admin/meeting/modules/RoomContentModal.vue
@@ -401,7 +401,7 @@ export default {
// 多个图片
// values.indoorPicUrl = JSON.stringify(indoorPicUrl)
- values.files = files
+ // values.files = files
let deviceArr = values.device
let deviceStr = ''
for (let key in deviceArr) {
@@ -411,8 +411,7 @@ export default {
values.device = deviceStr
values.floorId = this.typeMap[values.floor]
values.typeId = this.shapeMap[values.typeName]
-
- saveRoomContent(values)
+ saveRoomContent(values, files)
.then((res) => {
if (res.code === 0) {
this.$message.success('保存成功')
diff --git a/src/views/admin/meeting/modules/UtoModal.vue b/src/views/admin/meeting/modules/UtoModal.vue
new file mode 100644
index 0000000..9fe658e
--- /dev/null
+++ b/src/views/admin/meeting/modules/UtoModal.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/repair/PerformanceList.vue b/src/views/admin/repair/PerformanceList.vue
index 7718f72..8ea947a 100644
--- a/src/views/admin/repair/PerformanceList.vue
+++ b/src/views/admin/repair/PerformanceList.vue
@@ -28,6 +28,7 @@
size='default'
ref='tableFloor'
rowKey='id'
+ showPagination="true"
:columns='floorColumns'
:data='loadFloor'
>
@@ -58,6 +59,7 @@
size='default'
ref='tableFloorCreate'
rowKey='id'
+ showPagination="true"
:columns='floorCreateColumns'
:data='loadFloorCreate'
>
@@ -88,6 +90,7 @@
size='default'
ref='tableWorker'
rowKey='id'
+ showPagination="true"
:columns='columns'
:data='loadWorker'
>
diff --git a/src/views/admin/repair/RepairAddressList.vue b/src/views/admin/repair/RepairAddressList.vue
index 1b2266a..d2e6874 100644
--- a/src/views/admin/repair/RepairAddressList.vue
+++ b/src/views/admin/repair/RepairAddressList.vue
@@ -22,6 +22,7 @@
size="default"
ref="table"
rowKey="id"
+ showPagination="true"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
:columns="columns"
:data="loadData"
diff --git a/src/views/admin/repair/RepairDeviceList.vue b/src/views/admin/repair/RepairDeviceList.vue
index eb51409..cb5e468 100644
--- a/src/views/admin/repair/RepairDeviceList.vue
+++ b/src/views/admin/repair/RepairDeviceList.vue
@@ -27,6 +27,7 @@
size='default'
ref='table'
rowKey='id'
+ showPagination="true"
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
:columns='columns'
:data='loadData'
diff --git a/src/views/admin/repair/RepairDeviceTypeList.vue b/src/views/admin/repair/RepairDeviceTypeList.vue
index 676d6f0..c7e1c36 100644
--- a/src/views/admin/repair/RepairDeviceTypeList.vue
+++ b/src/views/admin/repair/RepairDeviceTypeList.vue
@@ -28,6 +28,7 @@
size='default'
ref='table'
rowKey='id'
+ showPagination="true"
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
:columns='columns'
:data='loadData'
diff --git a/src/views/admin/repair/RepairHistory.vue b/src/views/admin/repair/RepairHistory.vue
index c30562f..666a4d0 100644
--- a/src/views/admin/repair/RepairHistory.vue
+++ b/src/views/admin/repair/RepairHistory.vue
@@ -51,6 +51,7 @@
size='default'
ref='table'
rowKey='id'
+ showPagination="true"
:columns='columns'
:data='loadData'
>