diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index d72f5cde..98099ffc 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -1,14 +1,14 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-13 21:31:09 + * @LastEditors: Light + * @LastEditTime: 2022-10-22 11:08:16 * @Description: 系统静态参数配置 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', //青岛 - version: 'xihaian', // 西海岸 + version: 'dev', // 西海岸 // version: 'qingdao', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) // version: 'qingdao', // 测试 @@ -86,8 +86,8 @@ var CONFIGITEM = { userPwd: '', }, backUrl: 'http://localhost:8001', - previewUrl: 'http://192.168.124.236:9796/', - websocketURL: '192.168.124.233:8888/renren-admin', + previewUrl: 'http://192.168.124.243:9796/', + websocketURL: '192.168.124.243:8888/renren-admin', // websocketURL: '10.18.1.99:8889/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 1d3e712a..77d30c12 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -5,15 +5,24 @@
{{ item.title }} - + 清空 - + {{ itemContent.labelName || itemContent }}
@@ -21,19 +30,35 @@
-
+
会议室预约
-
+
预约结果
会议室搜索
- - + + 重置
@@ -44,23 +69,40 @@
可用时间查询 - - - + + +
- +
{{ item.name }}
@@ -73,39 +115,54 @@ {{ item.description }}
- + " + @click="appointment(item)" + > 预约
- +
- + - +
- +
预约结果
-
-
+ " + >
+
审核结果:{{ - lookData.state == 2 - ? '通过' - : lookData.state == 1 - ? '审核中' - : '不通过' + lookData.state == 2 + ? '通过' + : lookData.state == 1 + ? '审核中' + : '不通过' }} @@ -142,24 +217,29 @@
预约信息
-
+ " + >
预约时段:{{ lookData.bookDate }} {{ lookData.startTime }}-{{ - lookData.endTime + lookData.endTime }}
-
+ " + > 预约人:{{ lookData.name }} 联系方式:{{ lookData.phone }} 预约部门:{{ lookData.dept }} @@ -169,18 +249,43 @@ 使用事项:{{ lookData.matter }}
- - + + - - + + -
+
当日会议室可用时段:{{ roomDateList[0] }} @@ -188,21 +293,40 @@
- - + + - + - + @@ -212,23 +336,42 @@ - + - + - - + + 选择上传附件 @@ -239,11 +382,18 @@ - + 取消 - + 提交 @@ -273,76 +423,122 @@
- - + + 重置
- + 批量预览 - + 添加至申购车 - + 一键申请 - 我要申请{{ selectType }} + +
- + }" + :loading="loadingCamera" + >
- + " + :pagination="pagination" + @change="handleTableChange" + >