diff --git a/.env b/.env
index 270cde7..ca71ee8 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=/api
+VUE_APP_API_BASE_URL=https://www.chuangzhikj.com/saas-ics
VUE_APP_MODEL_BASE_URL=https://www.chuangzhikj.com/saas-ics
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 03c6006..7b50b84 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
NODE_ENV=development
VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=/api
+VUE_APP_API_BASE_URL=https://www.chuangzhikj.com/saas-ics
VUE_APP_MODEL_BASE_URL=https://www.chuangzhikj.com/saas-ics
\ No newline at end of file
diff --git a/.env.preview b/.env.preview
index 3aa62cd..5154fc4 100644
--- a/.env.preview
+++ b/.env.preview
@@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=/saas-ics
-VUE_APP_MODEL_BASE_URL=http://localhost/saas-ics
\ No newline at end of file
+VUE_APP_API_BASE_URL=https://www.chuangzhikj.com/saas-ics
+VUE_APP_MODEL_BASE_URL=https://www.chuangzhikj.com/saas-ics
\ No newline at end of file
diff --git a/package.json b/package.json
index 1712b68..746e5de 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,10 @@
"version": "1.0.0",
"private": true,
"scripts": {
- "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
- "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+ "serve": "vue-cli-service serve",
+ "build": "vue-cli-service build",
"report": "vue-cli-service build --report",
- "build:preview": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode preview",
+ "build:preview": "vue-cli-service build --mode preview",
"lint": "vue-cli-service lint",
"lint:nofix": "vue-cli-service lint --no-fix"
},
diff --git a/src/api/admin/wisdomPanel.js b/src/api/admin/wisdomPanel.js
new file mode 100644
index 0000000..5a76115
--- /dev/null
+++ b/src/api/admin/wisdomPanel.js
@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+ wisdomPanel: '/wisdomPanel'
+}
+
+export function getWisdomPanelList (parameter) {
+ return axios({
+ url: api.wisdomPanel + '/list',
+ method: 'get',
+ params: parameter
+ })
+}
+
+export function saveWisdomPanel (parameter) {
+ return axios({
+ url: api.wisdomPanel + (parameter.id > 0 ? '/update' : '/save'),
+ method: 'post',
+ data: parameter,
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8'
+ }
+ })
+}
+
+export function delWisdomPanel (parameter) {
+ return axios({
+ url: api.wisdomPanel + '/remove',
+ method: 'post',
+ params: parameter
+ })
+}
+
+export const wisdomPanelExport = api.wisdomPanel + '/export'
diff --git a/src/api/admin/wisdomPanelEquipment.js b/src/api/admin/wisdomPanelEquipment.js
new file mode 100644
index 0000000..a7b5ce5
--- /dev/null
+++ b/src/api/admin/wisdomPanelEquipment.js
@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+ wisdomPanelEquipment: '/admin/wisdomPanelEquipment'
+}
+
+export function getWisdomPanelEquipmentList (parameter) {
+ return axios({
+ url: api.wisdomPanelEquipment + '/list',
+ method: 'get',
+ params: parameter
+ })
+}
+
+export function saveWisdomPanelEquipment (parameter) {
+ return axios({
+ url: api.wisdomPanelEquipment + (parameter.id > 0 ? '/update' : '/save'),
+ method: 'post',
+ data: parameter,
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8'
+ }
+ })
+}
+
+export function delWisdomPanelEquipment (parameter) {
+ return axios({
+ url: api.wisdomPanelEquipment + '/remove',
+ method: 'post',
+ params: parameter
+ })
+}
+
+export const wisdomPanelEquipmentExport = api.wisdomPanelEquipment + '/export'
diff --git a/src/views/admin/WisdomPanelEquipmentList.vue b/src/views/admin/WisdomPanelEquipmentList.vue
new file mode 100644
index 0000000..fc6f6da
--- /dev/null
+++ b/src/views/admin/WisdomPanelEquipmentList.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ queryParam = {}">重置
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
diff --git a/src/views/admin/WisdomPanelList.vue b/src/views/admin/WisdomPanelList.vue
new file mode 100644
index 0000000..3210f3a
--- /dev/null
+++ b/src/views/admin/WisdomPanelList.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ queryParam = {}">重置
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
diff --git a/src/views/admin/modules/WisdomDeviceModal.vue b/src/views/admin/modules/WisdomDeviceModal.vue
index 440c1cd..e8c8243 100644
--- a/src/views/admin/modules/WisdomDeviceModal.vue
+++ b/src/views/admin/modules/WisdomDeviceModal.vue
@@ -20,16 +20,19 @@
-
+
-
+
- {{ item.meetingName }}
+ {{ item.meetingName }}
+
@@ -78,10 +81,16 @@ export default {
{
key: '5',
value: '调光灯'
+ },
+ {
+ key: '6',
+ value: '门锁'
}
],
confirmLoading: false,
mdl: {},
+ roomId: '',
+ roomName: '',
form: this.$form.createForm(this)
}
},
@@ -99,6 +108,8 @@ export default {
},
selectRoom (item) {
console.log(item)
+ this.roomId = item.key
+ this.roomName = item.label
},
add () {
this.form.resetFields()
@@ -117,6 +128,9 @@ export default {
if (!err) {
console.log('Received values of form: ', values)
this.confirmLoading = true
+ values.wisdomRoomId = this.roomId
+ console.log(this.roomName)
+ values.contentName = this.roomName
saveWisdomDevice(values).then(res => {
if (res.code === 0) {
this.$message.success('保存成功')
diff --git a/src/views/admin/modules/WisdomPanelEquipmentModal.vue b/src/views/admin/modules/WisdomPanelEquipmentModal.vue
new file mode 100644
index 0000000..d0d74eb
--- /dev/null
+++ b/src/views/admin/modules/WisdomPanelEquipmentModal.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/modules/WisdomPanelModal.vue b/src/views/admin/modules/WisdomPanelModal.vue
new file mode 100644
index 0000000..047e61e
--- /dev/null
+++ b/src/views/admin/modules/WisdomPanelModal.vue
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.meetingName }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/modules/WisdomRoomModal.vue b/src/views/admin/modules/WisdomRoomModal.vue
index 1307ed3..17dd8ad 100644
--- a/src/views/admin/modules/WisdomRoomModal.vue
+++ b/src/views/admin/modules/WisdomRoomModal.vue
@@ -34,6 +34,7 @@