公告管理

src/api/allApi.js

@@ -842,3 +842,47 @@ export function operationsAnalysisList(params) {
   })
 }
 
+export function noticeManageList(params) {
+  return request({
+    url: `/notice-manage/list`,
+    method: 'get',
+    params
+  })
+}
+
+export function noticeManageRevoke(data) {
+  return request({
+    url: `/notice-manage/revoke`,
+    method: 'post',
+    data
+  })
+}
+export function noticeManageAdd(data) {
+  return request({
+    url: `/notice-manage`,
+    method: 'post',
+    data
+  })
+}
+export function noticeManageUpdate(data) {
+  return request({
+    url: `/notice-manage`,
+    method: 'put',
+    data
+  })
+}
+
+export function noticeManageRemove(data) {
+  return request({
+    url: `/notice-manage/remove?id=${data}`,
+    method: 'delete'
+  })
+}
+
+export function noticeManageDetails(params) {
+  return request({
+    url: `/notice-manage/detail`,
+    method: 'get',
+    params
+  })
+}

src/views/liao/index.vue

@@ -1,301 +0,0 @@
-<template>
- 
-  <div id="Layout">
-    <el-container>
-      <el-aside width="200px">Aside</el-aside>
-      <el-container>
-        <el-header style="background-color: rgb(245, 245, 245); border-bottom: 1px solid grey;">
-          <h3>聊天广场</h3>
-        </el-header>
- 
-        <el-main style="background-color: rgb(244, 245, 247);
-        min-height: 700px; max-height: 700px; ">
- 
-          <div id="chatContent" style="padding-left: 10px; line-height: normal; ">
-            <!-- 循环输出对话内容 -->
-            <el-scrollbar v-for="(message, index) in messages" :key="index">
-              <div ref="scrollbar" v-if="message.sender !== senderName" class="chat-message" id="ChatContentCard" style=" background-color: white;
-              margin-top: 20px; 
-              box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04)  
-              ">
-                <el-avatar :size="40"
-                  src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png"></el-avatar>
-                <div class="message-content" style="width: 100%;">
-                  <div style="text-align: left; text-indent: 1em;"> {{ message.sender }}</div>
-                  <div id="chatContentText">{{ message.text }}</div>
-                </div>
-              </div>
- 
-              <div ref="scrollbar" v-if="message.sender === senderName" id="myChatContentCard">
-                <el-avatar :size="40"
-                  src="https://fuss10.elemecdn.com/0/6f/e35ff375812e6b0020b6b4e8f9583jpeg.jpeg"></el-avatar>
-                <div class="message-content" style="width: 100%;">
-                  <div style="text-align: left; text-indent: 1em;"> {{ message.sender }}</div>
-                  <div id="chatContentText">{{ message.text }}</div>
-                </div>
-              </div>
-            </el-scrollbar>
-          </div>
-        </el-main>
- 
- 
-        <!-- 底层交互框 -->
-        <el-footer style="height: 190px; background-color: rgb(244, 245, 247); ">
- 
-          <div id="Gadget" style="background-color: rgb(244, 245, 247); height: 35px; margin-bottom: 10px;">
- 
-            <el-upload class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
-              :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false" style="float: left;">
- 
-              <el-button slot="trigger" size="small" type="primary"><i class="el-icon-picture-outline-round"></i></el-button>
- 
-              <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-              
-            </el-upload>
- 
- 
-          </div>
- 
-          <el-form @submit.native.prevent="sendMessage"
-            style="background-color: rgb(244, 245, 247); height: 80%; width: 100%; position: relative;">
-            <el-input v-model="messageInput" rows="4" resize="none" type="textarea" placeholder="请输入内容......."
-              @keyup.enter="sendMessage" style="height: 100%; max-height: 60px; ">
-            </el-input>
-            <div style="text-align: right; background-color: rgb(244, 245, 247); margin-top: 34px;">
-              <el-button type="primary" @click="sendMessage">发送</el-button>
-            </div>
- 
-          </el-form>
-        </el-footer>
- 
- 
-      </el-container>
-    </el-container>
- 
-  </div>
-</template>
-
-<script>
-import Cookies from 'js-cookie';
- 
- 
-export default {
-  computed: {
-    senderName() {
-      return Cookies.get('account') || '游客';
-    }
-  },
-  name: 'App',
-  data() {
-    return {
-      messages: [],
-      messageInput: '',
-      ws: null,
-      fileList: []
-    };
-  },
-  mounted() {
-    this.initWebSocket();
-  },
-  beforeDestroy() {
-    this.closeWebSocket();
-  },
-  methods: {
-    initWebSocket() {
-      this.ws = new WebSocket('ws://192.168.3.21:8002/ws');
-      this.ws.onopen = () => {
-        console.log('Connected to server.');
-      };
-      this.ws.onmessage = (event) => {
-        try {
-          let messageData;
-          if (isJson(event.data)) {
-            messageData = JSON.parse(event.data);
-          } else {
-            messageData = { text: event.data };
-          }
-          this.messages.push({
-            sender: messageData.sender || 'Anonymous',
-            text: messageData.text,
-          });
- 
-          // 使用Vue.nextTick确保DOM更新后再执行滚动操作
-          this.$nextTick(() => {
-            // 确保scrollbar存在且已渲染
-            if (this.$refs.scrollbar) {
-              // 直接滚动到底部，不需要使用contentSize
-              // this.$refs.scrollbar.$el.scrollTop = this.$refs.scrollbar.$el.scrollHeight;
-            }
-          });
-        } catch (error) {
-          console.error('Error parsing message:', error);
-        }
- 
-      };
- 
- 
-      // 辅助函数，检查字符串是否可能是JSON格式
-      function isJson(str) {
-        try {
-          JSON.parse(str);
-        } catch (e) {
-          return false;
-        }
-        return true;
-      }
- 
- 
-      this.ws.onerror = (error) => {
-        console.error('WebSocket error:', error);
-      };
-      this.ws.onclose = () => {
-        console.log('Disconnected from server.');
-      };
-    },
-    sendMessage() {
-      console.log('调用sendMessage');
-      const senderName = Cookies.get('account');
-      console.log(senderName,"发送者");
-      if (senderName === null) {
-        this.senderName = "游客";
-      }
-      if (this.messageInput.trim() !== '') {
-        // this.ws.send(JSON.stringify({ sender: senderName, text: this.messageInput ,type:1}));
-        this.ws.send("[CHAT][" + new Date().getTime() + "][" + '大帅子' + "][" + '建升' + "][" + 2 + "]");
-        this.messageInput = ''; // 清空输入框
-      }
-    },
-    closeWebSocket() {
-      if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-        this.ws.close();
-      }
-    },
- 
- 
-// 文件上传函数
-submitUpload() {
-        this.$refs.upload.submit();
-      },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
-      }
- 
- 
-  },
-};
-</script>
-
-<style scoped>
-.chat-message {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
- 
-.message-content {
-  margin-left: 10px;
-}
- 
-#Layout {
-  line-height: normal;
-}
- 
-/* 添加动画关键帧 */
-@keyframes slideInFromLeft {
-  0% {
-    transform: translateX(-100%);
-    opacity: 0;
-  }
- 
-  100% {
-    transform: translateX(0);
-    opacity: 1;
-  }
-}
- 
-#ChatContentCard {
-  min-height: 80px;
-  width: 50%;
-  /* 应用动画 */
-  animation: slideInFromLeft 0.3s ease-in-out forwards;
-  border-radius: 30px
-}
- 
-#chatContentText {
-  width: 99%;
-  overflow-wrap: break-word;
- 
-}
- 
- 
-.el-header,
-.el-footer {
-  background-color: #B3C0D1;
-  color: #333;
-  text-align: center;
-  line-height: 60px;
-}
- 
-.el-aside {
-  background-color: #D3DCE6;
-  color: #333;
-  text-align: center;
-  line-height: 200px;
-}
- 
-.el-main {
-  background-color: #E9EEF3;
-  color: #333;
-  text-align: center;
-  line-height: 160px;
-}
- 
-body>.el-container {
-  margin-bottom: 40px;
-}
- 
-.el-container:nth-child(5) .el-aside,
-.el-container:nth-child(6) .el-aside {
-  line-height: 260px;
-}
- 
-.el-container:nth-child(7) .el-aside {
-  line-height: 320px;
-}
- 
- 
-#myChatContentCard{
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-  margin-left: 50%;
- 
-  min-height: 80px;
-  width: 50%;
-  /* 应用动画 */
-  animation: slideInFromRight 0.3s ease-in-out forwards;
-  border-radius: 30px;
- 
-  background-color: rgb(149, 236, 105);
-              margin-top: 20px; 
-              box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04) 
- 
-}
- 
-@keyframes slideInFromRight {
-  0% {
-    transform: translateX(100%);
-    opacity: 0;
-  }
- 
-  100% {
-    transform: translateX(0);
-    opacity: 1;
-  }
-}
- 
- 
-</style>

src/views/patientCenter/index.vue

@@ -589,7 +589,7 @@ export default {
   mixins: [initName],
   data() {
     return {
-      collectCostPatientsType:"",
+      collectCostPatientsType: null,
       printDialogVisible: false,
 
       isActive: 0,
@@ -749,7 +749,7 @@ export default {
       const res = await listByPatientId({
         patientId: this.ids
       })
-      if (res.code !== 200) return this.message.$error(res.msg)
+      if (res.code !== 200) return this.$message.error(res.msg)
       this.listByPatientArr = res.data
     },
     edit() {

src/views/patientCenter/listToDetailsDialog.vue

@@ -10,83 +10,151 @@
       @close="cancel"
       :before-close="cancel"
     >
-      <div style="max-height: 65vh;overflow-y: auto;">
-        <div v-for="(item , index) in listToDetails.listVO" :key="index">
+      <div style="max-height: 65vh; overflow-y: auto">
+        <div v-for="(item, index) in listToDetails.listVO" :key="index">
           <h3>
-            {{ initToothPosition(item.toothPosition) }}  
-            <el-button v-if="collectCostPatientsType == 1" @click="doAdd(index)" type="primary" plain icon="el-icon-plus" size="mini" style="margin-left: 10px;"
+            {{ initToothPosition(item.toothPosition) }}
+            <el-button
+              v-if="collectCostPatientsType == 1"
+              @click="doAdd(index)"
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              style="margin-left: 10px"
               >新建</el-button
             >
           </h3>
           <el-table :data="item.collectCostDetailsVOList">
-              <el-table-column label="项目编号" show-overflow-tooltip align="center">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.projectCode || '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="项目名称" show-overflow-tooltip align="center">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.projectName || '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="单价" show-overflow-tooltip align="center">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.unitPrice || '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="优惠价格" show-overflow-tooltip align="center">
-                <template slot-scope="scope">
-                  <span>
-                    <el-input :disabled="collectCostPatientsType !=1 " v-model="scope.row.preferentialPrice" @input="inputVal(index,scope.$index,scope.row.preferentialPrice)"></el-input>
-                  </span>
-                </template>
-              </el-table-column>
-              <el-table-column label="单位" show-overflow-tooltip align="center">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.unit || '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="数量" show-overflow-tooltip width="250" align="center">
-                <template slot-scope="scope">
-                  <el-input-number :disabled="collectCostPatientsType !=1" @change="changeVal(index,scope.$index,scope.row.total)" size="mini" v-model="scope.row.total" style="" :min="1" :max="10" label="描述文字"></el-input-number>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="操作"
-                align="center"
-                width="120"
-                fixed="right"
-                v-if="collectCostPatientsType == 1"
-              >
-                <template slot-scope="scope">
-                  <i class="el-icon-delete" style="cursor: pointer;color: red;" @click="doDel(index,scope.$index)"></i>
-                </template>
-              </el-table-column>
-            </el-table>
+            <el-table-column
+              label="项目编号"
+              show-overflow-tooltip
+              align="center"
+            >
+              <template slot-scope="scope">
+                <span>{{ scope.row.projectCode || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="项目名称"
+              show-overflow-tooltip
+              align="center"
+            >
+              <template slot-scope="scope">
+                <span>{{ scope.row.projectName || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" show-overflow-tooltip align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.unitPrice || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="优惠价格"
+              show-overflow-tooltip
+              align="center"
+            >
+              <template slot-scope="scope">
+                <span>
+                  <el-input
+                    :disabled="collectCostPatientsType != 1"
+                    v-model="scope.row.preferentialPrice"
+                    @input="
+                      inputVal(index, scope.$index, scope.row.preferentialPrice)
+                    "
+                  ></el-input>
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column label="单位" show-overflow-tooltip align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.unit || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="数量"
+              show-overflow-tooltip
+              width="250"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <el-input-number
+                  :disabled="collectCostPatientsType != 1"
+                  @change="changeVal(index, scope.$index, scope.row.total)"
+                  size="mini"
+                  v-model="scope.row.total"
+                  style=""
+                  :min="1"
+                  :max="10"
+                  label="描述文字"
+                ></el-input-number>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              align="center"
+              width="120"
+              fixed="right"
+              v-if="collectCostPatientsType == 1"
+            >
+              <template slot-scope="scope">
+                <i
+                  class="el-icon-delete"
+                  style="cursor: pointer; color: red"
+                  @click="doDel(index, scope.$index)"
+                ></i>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <div style="display: flex;align-items: center;">
-          <span style="margin-left: 10px;">原价：{{ receivableCost }} （元）</span>
-          <span style="margin-left: 10px;">应付价格：{{ preferentialPrice }} （元）</span>
-          <span style="margin-left: 20px;display: flex;align-items: center;" v-if="collectCostPatientsType != 1">
+        <div style="display: flex; align-items: center">
+          <span style="margin-left: 10px"
+            >原价：{{ receivableCost }} （元）</span
+          >
+          <span style="margin-left: 10px"
+            >应付价格：{{ preferentialPrice }} （元）</span
+          >
+          <span
+            style="margin-left: 20px; display: flex; align-items: center"
+            v-if="collectCostPatientsType != 1"
+          >
             实收：
-            <el-input v-model="listToDetails.netReceiptsCost" :disabled="collectCostPatientsType!=2" style="width: 200px;"></el-input>
+            <el-input
+              v-model="listToDetails.netReceiptsCost"
+              :disabled="collectCostPatientsType != 2"
+              style="width: 200px"
+            ></el-input>
             （元）
           </span>
         </div>
-        <el-button v-if="collectCostPatientsType != 3" @click="cancel">取 消</el-button>
-        <el-button v-if="collectCostPatientsType != 3" type="primary" @click="submit">确 定</el-button>
+        <el-button v-if="collectCostPatientsType != 3" @click="cancel"
+          >取 消</el-button
+        >
+        <el-button
+          v-if="collectCostPatientsType != 3"
+          type="primary"
+          @click="submit"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
 
-    <addTemplateDialog ref="addTemplateDialogRef" @tableDataDown="tableDataDown"/>
+    <addTemplateDialog
+      ref="addTemplateDialogRef"
+      @tableDataDown="tableDataDown"
+    />
   </div>
 </template>
 
 <script>
-import { listToDetails , collectCostPatientsUpdate ,collectCost} from '@/api/allApi.js'
-import initName from '@/utils/initName.js';
+import {
+  listToDetails,
+  collectCostPatientsUpdate,
+  collectCost
+} from '@/api/allApi.js'
+import initName from '@/utils/initName.js'
 
 import addTemplateDialog from './addTemplateDialog.vue'
 export default {
@@ -99,8 +167,8 @@ export default {
       type: String
     },
     collectCostPatientsType: {
-      type: String
-    },
+      type: Number
+    }
   },
   components: {
     addTemplateDialog
@@ -113,80 +181,113 @@ export default {
     }
   },
   watch: {
-    collectCostPatientsId(val){
+    collectCostPatientsId(val) {
       if (val) {
         this.initList()
       }
     }
   },
   computed: {
-    receivableCost(){
-      let num = 0;
-      this.listToDetails.listVO.forEach(item => {
-        const number = [];
-        item.collectCostDetailsVOList.forEach(item1 => {
-          number.push(item1.unitPrice * item1.total)
+    receivableCost() {
+      if (
+        Array.isArray(this.listToDetails.listVO) &&
+        this.listToDetails.listVO.length
+      ) {
+        let num = 0
+
+        this.listToDetails.listVO.forEach((item) => {
+          const number = []
+          item.collectCostDetailsVOList.forEach((item1) => {
+            number.push(item1.unitPrice * item1.total)
+          })
+          num += number.reduce((a, b) => a + b, 0)
         })
-        num += number.reduce((a, b) => a + b, 0);
-      });
-      return num;
+        return num
+      } else {
+        return 0
+      }
     },
-    preferentialPrice(){
-      let num = 0;
-      this.listToDetails.listVO.forEach(item => {
-        const number = [];
-        item.collectCostDetailsVOList.forEach(item1 => {
-          number.push(item1.preferentialPrice * item1.total)
+    preferentialPrice() {
+      if (
+        Array.isArray(this.listToDetails.listVO) &&
+        this.listToDetails.listVO.length
+      ) {
+        let num = 0
+
+        this.listToDetails.listVO.forEach((item) => {
+          const number = []
+          item.collectCostDetailsVOList.forEach((item1) => {
+            number.push(item1.preferentialPrice * item1.total)
+          })
+          num += number.reduce((a, b) => a + b, 0)
         })
-        num += number.reduce((a, b) => a + b, 0);
-      });
-      return num;
-    },
+        return num
+      } else {
+        return 0
+      }
+    }
   },
   mounted() {},
 
   methods: {
-    async initList (){
-      const res = await listToDetails({collectCostPatientsId: this.collectCostPatientsId})
+    async initList() {
+      const res = await listToDetails({
+        collectCostPatientsId: this.collectCostPatientsId
+      })
       this.listToDetails = res.data
     },
     cancel() {
       this.$emit('cancelAll', '6')
     },
-    doDel(index1 , index2){
-      this.listToDetails.listVO[index1].collectCostDetailsVOList.splice(index2,1)
+    doDel(index1, index2) {
+      this.listToDetails.listVO[index1].collectCostDetailsVOList.splice(
+        index2,
+        1
+      )
     },
-    doAdd(index){
+    doAdd(index) {
       this.toothPositionIndex = index
       this.$refs.addTemplateDialogRef.addTemplateDialogVisible = true
       this.$refs.addTemplateDialogRef.initcollectCostTypeList()
       this.$refs.addTemplateDialogRef.initList()
     },
-    tableDataDown(tableDataDown){
-      this.listToDetails.listVO[this.toothPositionIndex].collectCostDetailsVOList = [...this.listToDetails.listVO[this.toothPositionIndex].collectCostDetailsVOList,...tableDataDown]
+    tableDataDown(tableDataDown) {
+      this.listToDetails.listVO[
+        this.toothPositionIndex
+      ].collectCostDetailsVOList = [
+        ...this.listToDetails.listVO[this.toothPositionIndex]
+          .collectCostDetailsVOList,
+        ...tableDataDown
+      ]
     },
-    inputVal(index ,index1,val){
-      this.$set(this.listToDetails.listVO[index].preferentialPrice, index1, { ...this.listToDetails.listVO[index], preferentialPrice: val });
+    inputVal(index, index1, val) {
+      this.$set(this.listToDetails.listVO[index].preferentialPrice, index1, {
+        ...this.listToDetails.listVO[index],
+        preferentialPrice: val
+      })
     },
-    changeVal(index ,index1,val){
-      this.$set(this.listToDetails.listVO[index].total, index1, { ...this.listToDetails.listVO[index], total: val });
+    changeVal(index, index1, val) {
+      this.$set(this.listToDetails.listVO[index].total, index1, {
+        ...this.listToDetails.listVO[index],
+        total: val
+      })
     },
-    async  submit(){
-      if(this.collectCostPatientsType == 1){
+    async submit() {
+      if (this.collectCostPatientsType == 1) {
         const res = await collectCostPatientsUpdate(this.listToDetails)
-        if (res.code !== 200) return this.message.$error(res.msg);
+        if (res.code !== 200) return this.$message.error(res.msg)
         this.$message.success('化价成功')
-      }else {
+      } else {
         const res = await collectCost({
           id: this.collectCostPatientsId,
           netReceiptsCost: this.listToDetails.netReceiptsCost
         })
-        if (res.code !== 200) return this.message.$error(res.msg);
+        if (res.code !== 200) return this.$message.error(res.msg)
         this.$message.success('收费成功')
       }
 
       this.cancel()
-    },
+    }
   }
 }
 </script>

src/views/patientCenter/medical/index.vue

@@ -262,14 +262,16 @@
         >
         </vue-editor> -->
 
-
-        <editor
+        <!-- <editor
           id="editor_id"
           height="500px"
           :content.sync="protocolTemplateContent"
+          :allowImageUpload="false"
           :loadStyleMode="false"
           @on-content-change="onContentChange"
-        ></editor>
+        ></editor> -->
+
+        <div v-if="protocolTemplateContent" v-html="protocolTemplateContent" style="border: 1px solid #ccc;padding: 5px;"></div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>

src/views/patientCenter/printMedical.vue

@@ -77,7 +77,7 @@
     >
     </vue-editor> -->
 
-    <div style="margin-top: 20px;width: 100%;" v-html="protocolTemplateContent"> </div>
+    <div v-if="protocolTemplateContent" v-html="protocolTemplateContent" style="border: 1px solid #ccc;padding: 5px;margin-top: 10px;"></div>
 
     <!-- <editor
     style="margin-top: 20px;width: 100%;"

src/views/settingsPage/announcements/index.vue

@@ -0,0 +1,396 @@
+<template>
+  <div class="app-container">
+    <el-form :inline="true">
+      <el-form-item label="公告名称：">
+        <el-input v-model="form.noticeTitle"></el-input>
+      </el-form-item>
+      <el-form-item label="是否发布：">
+        <el-select v-model="form.publishStatus">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="未发布" :value="0"></el-option>
+          <el-option label="已发布" :value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="显示状态：">
+        <el-select v-model="form.displayStatus">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="未开始" :value="1"></el-option>
+          <el-option label="显示中" :value="2"></el-option>
+          <el-option label="已结束" :value="3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="initList" icon="el-icon-search"
+          >搜索</el-button
+        >
+        <el-button @click="reset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row style="margin-bottom: 20px">
+      <el-button
+        @click="add"
+        type="primary"
+        plain
+        icon="el-icon-plus"
+        size="mini"
+        >新增</el-button
+      >
+    </el-row>
+
+    <el-table :data="tableData" style="width: 100%">
+      <el-table-column show-overflow-tooltip label="公告名称" align="center">
+        <template #default="{ row }">
+          {{ row.noticeTitle || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="是否发布"
+        width="100"
+        align="center"
+      >
+        <template #default="{ row }">
+          {{ initPublishStatus(row.publishStatus) }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="显示状态"
+        width="100"
+        align="center"
+      >
+        <template #default="{ row }">
+          {{ initDisplayStatus(row.displayStatus) }}
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip label="显示时间" align="center">
+        <template #default="{ row }">
+          {{ row.noticeStartTime }} ~ {{ row.noticeEndTime }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="发布人"
+        width="100"
+        align="center"
+      >
+        <template #default="{ row }">
+          {{ row.publishPeople }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="添加人"
+        width="100"
+        align="center"
+      >
+        <template #default="{ row }">
+          {{ row.createUser }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="最后修改时间"
+        width="150"
+        align="center"
+      >
+        <template #default="{ row }">
+          {{ row.updateDate }}
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" width="150">
+        <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.publishStatus == 1"
+            type="text"
+            size="small"
+            @click="withdraw(scope.row)"
+            >撤回</el-button
+          >
+          <el-button v-if="scope.row.publishStatus == 0" type="text" size="small" @click="edit(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.publishStatus == 0"
+            @click="del(scope.row)"
+            style="color: red"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="form.pageNum"
+      :limit.sync="form.pageSize"
+      @pagination="initList"
+    />
+
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      v-if="dialogVisible"
+      width="900px"
+      :close-on-press-escape="false"
+      :close-on-click-modal="false"
+      @close="cancel"
+      :before-close="cancel"
+    >
+      <div style="max-height: 65vh; overflow: auto">
+        <el-form
+          :model="ruleForm"
+          :rules="rules"
+          ref="ruleForm"
+          label-width="100px"
+          label-position="right"
+        >
+          <el-form-item label="公告名称：" prop="noticeTitle">
+            <el-input
+              v-model="ruleForm.noticeTitle"
+              style="width: 500px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="显示时间：" prop="time">
+            <el-date-picker
+              style="width: 500px"
+              v-model="ruleForm.time"
+              type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="是否发布：" prop="publishStatus">
+            <el-radio-group v-model="ruleForm.publishStatus">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="发布人：" prop="publishPeople">
+            <el-input
+              v-model="ruleForm.publishPeople"
+              style="width: 500px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="公告内容：" prop="noticeContent">
+            <editor
+              id="editor_id"
+              height="500px"
+              :content.sync="ruleForm.noticeContent"
+              :loadStyleMode="false"
+              @on-content-change="onContentChange"
+            ></editor>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import editor from '@/components/editorr/index'
+import {
+  noticeManageList,
+  noticeManageRevoke,
+  noticeManageRemove,
+  noticeManageAdd,
+  noticeManageUpdate,
+  noticeManageDetails
+} from '@/api/allApi.js'
+
+export default {
+  name: 'EitcErmPcIndex',
+  components: {
+    editor
+  },
+  data() {
+    return {
+      form: {
+        noticeTitle: '',
+        publishStatus: '',
+        displayStatus: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      title: '',
+      dialogVisible: false,
+      ruleForm: {
+        noticeTitle: '',
+        time: null,
+        publishStatus: 1,
+        publishPeople: '',
+        noticeContent: ''
+      },
+      rules: {
+        noticeTitle: [
+          { required: true, message: '请输入公告名称', trigger: 'blur' }
+        ],
+        time: [
+          { required: true, message: '请选择显示时间', trigger: 'change' }
+        ],
+        publishStatus: [
+          { required: true, message: '请选择发布状态', trigger: 'change' }
+        ],
+        publishPeople: [
+          { required: true, message: '请输入发布人', trigger: 'blur' }
+        ],
+        noticeContent: [
+          { required: true, message: '请输入公告内容', trigger: 'change' }
+        ]
+      },
+      tableData: [],
+      total: 0
+    }
+  },
+
+  mounted() {
+    this.initList()
+  },
+
+  methods: {
+    async initList() {
+      const res = await noticeManageList(this.form)
+      this.tableData = res.rows
+      this.total = res.total
+    },
+    reset() {
+      this.form = {
+        noticeTitle: '',
+        publishStatus: '',
+        displayStatus: '',
+        pageNum: 1,
+        pageSize: 10
+      }
+      this.initList()
+    },
+    withdraw(val) {
+      this.$confirm('确认撤回吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await noticeManageRevoke({ id: val.id })
+          if (res.code !== 200) return this.$message.error(res.msg)
+          this.initList()
+          this.$message({
+            type: 'success',
+            message: '撤回成功!'
+          })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消撤回'
+          })
+        })
+    },
+    async edit(val) {
+      this.dialogVisible = true
+      this.title = '编辑公告'
+      const res = await noticeManageDetails({ id: val.id })
+      this.ruleForm = res.data
+      this.ruleForm.time = [
+        res.data.noticeStartTime,
+        res.data.noticeEndTime
+      ]
+      this.$forceUpdate()
+    },
+    del(val) {
+      this.$confirm('此操作将永久删除该项?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await noticeManageRemove(val.id)
+          if (res.code !== 200) return this.$message.error(res.msg)
+          this.initList()
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+        })
+        .catch(() => {
+        })
+    },
+    initPublishStatus(val) {
+      switch (val) {
+        case 0:
+          return '未发布'
+        case 1:
+          return '已发布'
+        default:
+          '-'
+          break
+      }
+    },
+    initDisplayStatus(val) {
+      switch (val) {
+        case 1:
+          return '未开始'
+        case 2:
+          return '显示中'
+        case 3:
+          return '已结束'
+        default:
+          '-'
+          break
+      }
+    },
+    onContentChange(val) {
+      this.ruleForm.name = val
+    },
+    add() {
+      this.dialogVisible = true
+      this.title = '添加公告'
+      this.ruleForm = {
+        noticeTitle: '',
+        time: null,
+        publishStatus: 1,
+        publishPeople: '',
+        noticeContent: ''
+      }
+    },
+    submit() {
+      this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          if(this.title == "添加公告"){
+            this.ruleForm.noticeStartTime = this.ruleForm.time[0]
+            this.ruleForm.noticeEndTime = this.ruleForm.time[1]
+            const res = await noticeManageAdd(this.ruleForm)
+            if (res.code !== 200) return this.$message.error(res.msg)
+            this.dialogVisible = false
+            this.$message.success('添加公告!')
+          }else {
+            this.ruleForm.noticeStartTime = this.ruleForm.time[0]
+            this.ruleForm.noticeEndTime = this.ruleForm.time[1]
+            const res = await noticeManageUpdate(this.ruleForm)
+            if (res.code !== 200) return this.$message.error(res.msg)
+            this.dialogVisible = false
+            this.$message.success('编辑公告!')
+          }
+          this.initList()
+        } else {
+          this.$message.error('必填项不能为空!')
+          return false
+        }
+      })
+    },
+    cancel() {
+      this.dialogVisible = false
+    }
+  }
+}
+</script>