修改系统名称；

加入会议预约提示；管理员占用会议室允许取消
2025-06-21 05:39:36 +08:00 · 2024-11-09 18:20:54 +08:00 · 2024-11-09 18:20:54 +08:00 · 1b65d50d92
commit 1b65d50d92
parent 4035a349e5
8 changed files with 83 additions and 17 deletions
--- a/public/index.html
+++ b/public/index.html
@ -5,7 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>logo.png">
-    <title>淮安市机关事务服务平台管理系统</title>
+    <title>淮安市行政中心智慧后勤服务平台</title>
    <style>.first-loading-wrp{display:flex;justify-content:center;align-items:center;flex-direction:column;min-height:420px;height:100%}.first-loading-wrp>h1{font-size:128px}.first-loading-wrp .loading-wrp{padding:98px;display:flex;justify-content:center;align-items:center}.dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:32px;width:32px;height:32px;box-sizing:border-box}.dot i{width:14px;height:14px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.dot i:nth-child(1){top:0;left:0}.dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
    <!-- require cdn assets css -->
    <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
@ -18,11 +18,11 @@
    </noscript>
    <div id="app">
      <div class="first-loading-wrp">
-        <h1>Pro</h1>
+        <h2>淮安市行政中心智慧后勤服务平台</h2>
        <div class="loading-wrp">
          <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
        </div>
-        <div style="display: flex; justify-content: center; align-items: center;">ICS Ant</div>
+        <div style="display: flex; justify-content: center; align-items: center;">淮安市机关事务局</div>
      </div>
    </div>
    <!-- require cdn assets js -->
--- a/src/api/admin/meeting/meetingReservation.js
+++ b/src/api/admin/meeting/meetingReservation.js
@ -86,6 +86,16 @@ export function cancelOrder(parameter) {
  })
 }

+// 会议室-删除预约
+export function approveOrderDel(parameter) {
+  return axios({
+    // url: '/api/roomContent/cancelOrder',
+    url: api.meetingReservation + '/delete',
+    method: 'post',
+    data: parameter
+  })
+}
+
 // 获取预约信息
 export function getOrderInfo(parameter) {
  return axios({
--- a/src/config/defaultSettings.js
+++ b/src/config/defaultSettings.js
@ -23,7 +23,7 @@ export default {
  menu: {
    locale: true
  },
-  title: '淮安市机关事务服务平台',
+  title: '行政中心智慧后勤服务平台',
  pwa: false,
  iconfontUrl: '',
  production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true'
--- a/src/layouts/UserLayout.vue
+++ b/src/layouts/UserLayout.vue
@ -5,7 +5,7 @@
        <div class='header'>
          <div class='logoView'>
 <!--            <img src='~@/assets/logo.png' class='logo' alt='logo'>-->
-            <span class='title'>淮安市机关事务服务平台管理系统</span>
+            <span class='title'>淮安市行政中心智慧后勤服务平台</span>
          </div>
        </div>
      </div>
--- a/src/views/admin/meeting/MeetingMangerList.vue
+++ b/src/views/admin/meeting/MeetingMangerList.vue
@ -80,7 +80,7 @@
          </a-col>
          <a-col :md='5' :sm='15'>
            <a-form-item label='设备'>
-              <a-select v-model='queryParam.devices' mode="multiple" placeholder='请选择设备'>
+              <a-select v-model='queryParam.devices' mode='multiple' placeholder='请选择设备'>
                <a-select-option v-for='item in itemList' :value='item.value'>
                  {{ item.text }}
                </a-select-option>
@ -142,6 +142,7 @@
          <a-empty />
        </template>
      </div>
+      <a-divider style='margin-top: 100px'>请在08:30~17:30内进行预约会议<br/>有问题请联系工作人员：陆成俊 83605343</a-divider>
    </div>
    <RoomOrder-modal ref='modal' @ok='handleOk' />
  </a-card>
@ -200,7 +201,7 @@ export default {
    }
  },
  created() {
-
+    this.openNotification()
  },
  mounted() {
    let rId = this.$route.query.rId
@ -231,7 +232,7 @@ export default {
          pick(
            this.mdl,
            'loginName',
-            'password',
+            'password'
          )
        )
      })
@ -249,6 +250,34 @@ export default {
    this.getAllRoomList()
  },
  methods: {
+    // 会议系统
+    openNotification() {
+      this.$notification.open({
+        message: '提醒',
+        description: '会议服务热线：83605343',
+        duration: 0
+      })
+      this.$notification.open({
+        message: '提醒',
+        description: (h) => {
+          const msg = '1、此系统分配的账号仅用于会议室申请预约，请各单位专人扎口负责会议预定管理工作。;' +
+            '2、系统提示“预约提交成功”后请及时关注预约进度，若有疑问请随时拨打会议服务热线：83605343。;' +
+            '3、会议开始前如需调整会议，请及时通过系统操作或电话告知，已预约成功的会议室可能因临时重大会议取消或调剂，请理解配合。'
+          // 将反馈信息使用;分割为数组
+          const splitText = msg?.split(';') ?? []
+          // 数组中每项反馈信息都转为VNode
+          const res = _.map(splitText, (item) => {
+            return h('p', {
+              style: {
+                'margin-bottom': 0
+              }
+            }, item)
+          })
+          // 返回总的VNode，子元素为所有反馈信息
+          return h('p', {}, res)
+        }
+      })
+    },
    chooseDate(date, dateString) {
      this.nowDate = dateString
    },
--- a/src/views/admin/meeting/MeetingReservationList.vue
+++ b/src/views/admin/meeting/MeetingReservationList.vue
@ -136,7 +136,7 @@
      </span>
      <span slot='action' slot-scope='text, record'>
        <a @click='handleShow(record.id)'>查看</a>
-        <a v-if='record.canCancel' @click='cancelConfirm(record.id)' style='margin-left: 5px'>取消预约</a>
+        <a v-if='record.canCancel' @click='cancelConfirm(record.id, record.status)' style='margin-left: 5px'>取消预约</a>
        <a-dropdown :trigger="['click']" v-if='record.canEdit'>
          <a class='ant-dropdown-link' @click='e => e.preventDefault()'>
            修改信息
@ -193,7 +193,7 @@ import {
  cancelOrder,
  approveOrder,
  expMRByDate,
-  expMRByMonth, getAllRoom
+  expMRByMonth, getAllRoom, approveOrderDel
 } from '@/api/admin/meeting/meetingReservation'
 import { checkPermission } from '@/utils/permissions'

@ -310,7 +310,7 @@ export default {
              if (statusValue == 4) {
                // 占用，可以修改
                showEdit = true
-                // showCancel = true
+                showCancel = true
                // showStaff = true
              }
              if (statusValue == 5) {
@ -433,10 +433,36 @@ export default {
     * 取消预约
     * @param id
     */
-    cancelConfirm(id) {
+    cancelConfirm(id, status) {
+      let _this = this
      this.cancelId = id
-      this.showCancelReason = true
-      this.cancelReason = ''
+      if (status == 4 && this.isAdmin) {
+        // 占用状态取消，则为删除
+        this.$confirm({
+          title: '确认',
+          content: '取消后不可撤销，是否确认?',
+          okText: '是',
+          okType: 'success',
+          cancelText: '否',
+          onOk() {
+            approveOrderDel({
+              id: id
+            }).then(res => {
+              if (res.code === 0) {
+                _this.$message.success('已取消！')
+                _this.handleOk()
+              } else {
+                _this.$message.error(res.msg)
+              }
+            })
+          },
+          onCancel() {
+          }
+        })
+      } else {
+        this.showCancelReason = true
+        this.cancelReason = ''
+      }
    },
    onCloseCancel() {
      this.cancelId = ''
--- a/src/views/admin/meeting/modules/RoomOrderModal.vue
+++ b/src/views/admin/meeting/modules/RoomOrderModal.vue
@ -348,8 +348,9 @@ export default {
          if (this.timeRange == 4) {
            this.timeRangeText = '全天'
          }
-          this.depId = res.mr.userOrgId
-          this.dep = res.mr.userOrg
+          // 占用时候获取不到，给默认值为空字符串
+          this.depId = res.mr.userOrgId || ''
+          this.dep = res.mr.userOrg || ''
          this.depList = [{
            id: this.depId.toString(),
            name: this.dep
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@ -1,5 +1,5 @@
 <template>
-  <div class='main'>欢迎访问淮安市机关事务服务平台</div>
+  <div class='main'>淮安市行政中心智慧后勤服务平台</div>
 </template>

 <script>