diff --git a/src/components/Header.vue b/src/components/Header.vue
index bfcd51d..dd42068 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -1,56 +1,102 @@
 <template>
-    <div class="header flex-between">
-        <div class="logo">
-            <img class="cursor" @click="goHome" src="../assets/img/logo.png">
-        </div>
-        <div class="header-right">
-            <div class="header-user-con">
-                <div class="user" @click="toPerson">
-                    <el-avatar :size="40" :src="$store.state.avatar"></el-avatar>
-                    <span class="user-avator">{{userName}}</span>
-                </div>
-                <el-divider class="ml20" direction="vertical"></el-divider>
-                <el-button type="text" class="ml20" @click="loginout">退出</el-button>
-            </div>
+  <div class="header flex-between">
+    <div class="logo">
+      <img class="cursor"
+           @click="goHome"
+           src="../assets/img/logo.png">
+    </div>
+    <div class="header-right">
+      <div class="header-user-con">
+        <div class="user"
+             @click="toPerson">
+          <el-avatar :size="40"
+                     :src="$store.state.avatar"></el-avatar>
+          <span class="user-avator">{{userName}}</span>
         </div>
+        <el-divider class="ml20"
+                    direction="vertical"></el-divider>
+        <el-button type="text"
+                   class="ml20"
+                   @click="loginout">退出</el-button>
+      </div>
     </div>
+  </div>
 </template>
 <script>
+import Bus from '@/libs/bus'
 export default {
-    data() {
-        return {
-            userName: ''
-        };
+  data () {
+    return {
+      userName: ''
+    };
+  },
+  mounted () {
+    this.getUserInfo()
+  },
+  methods: {
+    toPerson () {
+      if (this.$route.path.split('/').pop() !== 'person') {
+        this.$router.push('/person')
+      }
+    },
+    loginout () {
+      localStorage.removeItem('ms_username');
+      localStorage.removeItem('token');
+      sessionStorage.clear()
+      location.reload()
+    },
+    goHome () {
+      this.$router.push('/customer')
+    },
+
+
+    // socket连接成功
+    open () {
+      console.log("socket连接成功");
+    },
+    // socket连接失败
+    error () {
+      console.log("连接错误");
+    },
+    // 接收消息
+    getMessage (msg) {
+      console.log("==websocket接收数据==");
+      console.log(JSON.parse(msg.data));
+
+      const { content } = JSON.parse(msg.data)
+      // 1赛事、2创业、3考核、4模型。-号拼接携带id
+      content == 1 && Bus.$emit('matchSocket')
+      content == 4 && Bus.$emit('modelSocket')
+    },
+    // 关闭socket
+    close () {
+      console.log("socket已经关闭");
     },
-    mounted(){
-        this.userName || this.getUserInfo()
+    initSocket ({ id, account }) {
+      // 实例化socket
+      // this.socket = new WebSocket(`ws://${Setting.isDev ? '192.168.31.51' : location.host}:9100/nakadai/websocket/${id}/${account}`)
+      this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
+      // 监听socket连接
+      this.socket.onopen = this.open;
+      // 监听socket错误信息
+      this.socket.onerror = this.error;
+      // 监听socket消息
+      this.socket.onmessage = this.getMessage;
     },
-    methods: {
-        getUserInfo(){
-            this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
-                let userInfo = result.hrUserInfo
-                if(userInfo.userAvatars) this.$store.commit('userAvatar',{avatar: userInfo.userAvatars})
-                this.userName = userInfo.userName
-                const { id } = result.userAccount
-                id && this.$store.commit('SET_ACCOUNTID', id)
-                this.$store.commit('SET_USERNAME', this.userName)
-            }).catch(err => {})
-        },
-        toPerson(){
-            if(this.$route.path.split('/').pop()!=='person'){
-                this.$router.push('/person')
-            }
-        },
-        loginout() {
-            localStorage.removeItem('ms_username');
-            localStorage.removeItem('token');
-            sessionStorage.clear()
-            location.reload()
-        },
-        goHome(){
-            this.$router.push('/customer')
-        }
+
+
+    getUserInfo () {
+      this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
+        this.initSocket(result.userAccount)
+        let userInfo = result.hrUserInfo
+        if (userInfo.userAvatars) this.$store.commit('userAvatar', { avatar: userInfo.userAvatars })
+        this.userName = userInfo.userName
+        const { id } = result.userAccount
+        id && this.$store.commit('SET_ACCOUNTID', id)
+        this.$store.commit('SET_USERNAME', this.userName)
+      }).catch(err => { })
     },
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -68,7 +114,7 @@ export default {
     height: 40px;
     margin-left: 20px;
 }
-.header .logo img{
+.header .logo img {
     width: 100%;
     height: 100%;
 }
@@ -81,7 +127,7 @@ export default {
     height: 70px;
     align-items: center;
 }
-.header-user-con .user{
+.header-user-con .user {
     display: inline-flex;
     align-items: center;
     cursor: pointer;
@@ -91,7 +137,7 @@ export default {
     margin-left: 10px;
     font-size: 12px;
 }
-.ml20{
+.ml20 {
     margin-left: 20px;
 }
 .user-avator img {
@@ -100,17 +146,17 @@ export default {
     height: 40px;
     border-radius: 50%;
 }
-/deep/.header-right .el-button--text{
+/deep/.header-right .el-button--text {
     color: #333;
     span {
         font-size: 12px;
     }
 }
-.header-right .el-divider--vertical{
+.header-right .el-divider--vertical {
     width: 2px;
     height: 15px;
 }
-.header-right .el-divider{
+.header-right .el-divider {
     background-color: #333;
 }
 </style>
diff --git a/src/setting.js b/src/setting.js
index 322f4fa..a2f3080 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -11,8 +11,8 @@ if (isDev) {
   jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
   host = 'http://121.37.12.51/'
   // host = 'https://huorantech.cn/'
-  host = 'http://192.168.31.152:9000/'// 榕
-  // host = 'http://192.168.31.53:9000/'// 赓
+  // host = 'http://192.168.31.152:9000/'// 榕
+  // host = 'http://192.168.31.51:9000/'// 赓
 } else if (isPro) {
   jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
 }
diff --git a/src/utils/api.js b/src/utils/api.js
index 26f1529..5565b4b 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -11,6 +11,7 @@ export default {
     sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码
     getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`,
     deleteProfile : `users/users/userInfo/deleteProfile`,
+    refreshPageNotification : `nakadai/message/refreshPageNotification`,
     
     staffTemplate: `http://www.huorantech.cn/template/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E5%91%98%E5%B7%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 后台账号模板
 
diff --git a/src/views/match/list/index.vue b/src/views/match/list/index.vue
index fdfa5eb..a9930d9 100644
--- a/src/views/match/list/index.vue
+++ b/src/views/match/list/index.vue
@@ -1,425 +1,513 @@
 <template>
-    <div class="page">
-        <h6 class="p-title">筛选</h6>
-        <div class="tool mul">
-            <ul class="filter">
-                <li>
-                    <label>创建时间：</label>
-                    <div class="single-choice">
-                        <dl>
-                            <dd>
-                                <el-radio-group v-model="form.month" @change="changeType">
-                                    <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{ item.name }}</el-radio>
-                                </el-radio-group>
-                            </dd>
-                        </dl>
-                    </div>
-                </li>
-                <li>
-                    <label>创建区间：</label>
-                    <el-date-picker v-model="date" align="right" unlink-panels type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>
-                </li>
-                <li>
-                    <el-input placeholder="请输入竞赛名称/创建人" suffix-icon="el-icon-search" v-model="keyword" clearable></el-input>
-                </li>
-            </ul>
-        </div>
-        <div class="tool mul">
-            <ul class="filter">
-                <li>
-                    <label>大赛来源：</label>
-                    <el-select v-model="form.platformSource" clearable @change="sourceChange">
-                        <el-option v-for="(item, i) in sourceList" :key="i" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
-                </li>
-                <li>
-                    <label>大赛范围：</label>
-                    <el-select v-model="form.competitionScope" clearable @change="initData">
-                        <el-option v-for="(item, i) in rangeList" :key="i" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
-                </li>
-            </ul>
-            <div>
-                <el-button type="primary" round @click="add" v-auth>创建竞赛</el-button>
-                <el-button type="primary" round @click="delAllSelection" v-auth>批量删除</el-button>
-            </div>
-        </div>
-
-        <el-table ref="table" :data="matchData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
-            <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="60" label="序号" align="center">
-                <template slot-scope="scope">
-                    {{ scope.$index + (page - 1) * pageSize + 1 }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="competitionName" label="竞赛名称" align="center"></el-table-column>
-            <el-table-column prop="founderName" label="创建人" align="center"></el-table-column>
-            <el-table-column prop="name" label="大赛来源" width="120" align="center">
-              <template slot-scope="scope">
-                {{ sourceList.find(e => e.id === scope.row.platformSource).name }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="大赛范围" align="center">
-              <template slot-scope="scope">
-                {{ rangeList.find(e => e.id === scope.row.competitionScope).name }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="applicantNum" label="报名人数" align="center" width="100"></el-table-column>
-            <el-table-column prop="status" label="状态" align="center" width="80">
-              <template slot-scope="scope">
-                {{ scope.row.publishStatus ? '已发布' : '未发布' }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="time" label="竞赛时间" align="center" width="290">
-                <template slot-scope="scope">
-                    {{ scope.row.playStartTime }} ~ {{ scope.row.playEndTime }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="createTime" label="创建时间" align="center" width="160"></el-table-column>
-            <el-table-column label="操作" align="center" width="260">
-                <template slot-scope="scope">
-                    <el-button v-if="scope.row.playingStages && scope.row.playingStages.length" type="text" @click="editEndTime(scope.row)" v-auth>修改结束时间</el-button>
-                    <el-button type="text" @click="manage(scope.row)" v-auth>管理</el-button>
-                    <el-button type="text" @click="delData(scope.row)" v-auth>删除</el-button>
-                    <el-switch
-                        v-if="scope.row.publishStatus"
-                        v-auth="'/match:启用'"
-                        v-model="scope.row.ztOpen"
-                        :active-value="0"
-                        :inactive-value="1"
-                        style="margin: 0 10px 0 5px"
-                        :active-text="scope.row.ztOpen ? '关' : '开'"
-                        @change="switchOff($event,scope.row,scope.$index)"
-                    ></el-switch>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page">
-            </el-pagination>
-        </div>
+  <div class="page">
+    <h6 class="p-title">筛选</h6>
+    <div class="tool mul">
+      <ul class="filter">
+        <li>
+          <label>创建时间：</label>
+          <div class="single-choice">
+            <dl>
+              <dd>
+                <el-radio-group v-model="form.month"
+                                @change="changeType">
+                  <el-radio v-for="(item,index) in dateList"
+                            :key="index"
+                            :label="item.id"
+                            border>{{ item.name }}</el-radio>
+                </el-radio-group>
+              </dd>
+            </dl>
+          </div>
+        </li>
+        <li>
+          <label>创建区间：</label>
+          <el-date-picker v-model="date"
+                          align="right"
+                          unlink-panels
+                          type="daterange"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          clearable></el-date-picker>
+        </li>
+        <li>
+          <el-input placeholder="请输入竞赛名称/创建人"
+                    suffix-icon="el-icon-search"
+                    v-model="keyword"
+                    clearable></el-input>
+        </li>
+      </ul>
+    </div>
+    <div class="tool mul">
+      <ul class="filter">
+        <li>
+          <label>大赛来源：</label>
+          <el-select v-model="form.platformSource"
+                     clearable
+                     @change="sourceChange">
+            <el-option v-for="(item, i) in sourceList"
+                       :key="i"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>大赛范围：</label>
+          <el-select v-model="form.competitionScope"
+                     clearable
+                     @change="initData">
+            <el-option v-for="(item, i) in rangeList"
+                       :key="i"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </li>
+      </ul>
+      <div>
+        <el-button type="primary"
+                   round
+                   @click="add"
+                   v-auth>创建竞赛</el-button>
+        <el-button type="primary"
+                   round
+                   @click="delAllSelection"
+                   v-auth>批量删除</el-button>
+      </div>
+    </div>
 
-        <el-dialog title="修改当前阶段结束时间" :visible.sync="modifyVisible" width="900px" :close-on-click-modal="false">
-          <el-table :data="curRow.playingStages" class="table" ref="table" stripe header-align="center">
-              <el-table-column prop="stageName" label="阶段名称" min-width="100" align="center"></el-table-column>
-              <el-table-column label="竞赛起止时间" width="300" align="center">
-                  <template slot-scope="scope">
-                    {{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
-                  </template>
-              </el-table-column>
-              <el-table-column label="结束时间调整为" align="center" width="280">
-                  <template slot-scope="scope">
-                    <el-date-picker
-                      popper-class="no-atTheMoment"
-                      v-model="scope.row.newEndTime"
-                      placeholder="请选择结束时间"
-                      type="datetime"
-                      :picker-options="pickerOptions">
-                    </el-date-picker>
-                  </template>
-              </el-table-column>
-          </el-table>
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" @click="modifyVisible = false">取 消</el-button>
-            <el-button size="small" type="primary" @click="modifySubmit">确 定</el-button>
-          </span>
-        </el-dialog>
+    <el-table ref="table"
+              :data="matchData"
+              class="table"
+              stripe
+              header-align="center"
+              @selection-change="handleSelectionChange"
+              row-key="id">
+      <el-table-column type="selection"
+                       width="55"
+                       align="center"
+                       :reserve-selection="true"></el-table-column>
+      <el-table-column type="index"
+                       width="60"
+                       label="序号"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + (page - 1) * pageSize + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="competitionName"
+                       label="竞赛名称"
+                       align="center"></el-table-column>
+      <el-table-column prop="founderName"
+                       label="创建人"
+                       align="center"></el-table-column>
+      <el-table-column prop="name"
+                       label="大赛来源"
+                       width="120"
+                       align="center">
+        <template slot-scope="scope">
+          {{ sourceList.find(e => e.id === scope.row.platformSource).name }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       label="大赛范围"
+                       align="center">
+        <template slot-scope="scope">
+          {{ rangeList.find(e => e.id === scope.row.competitionScope).name }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="applicantNum"
+                       label="报名人数"
+                       align="center"
+                       width="100"></el-table-column>
+      <el-table-column prop="status"
+                       label="状态"
+                       align="center"
+                       width="80">
+        <template slot-scope="scope">
+          {{ scope.row.publishStatus ? '已发布' : '未发布' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="time"
+                       label="竞赛时间"
+                       align="center"
+                       width="290">
+        <template slot-scope="scope">
+          {{ scope.row.playStartTime }} ~ {{ scope.row.playEndTime }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime"
+                       label="创建时间"
+                       align="center"
+                       width="160"></el-table-column>
+      <el-table-column label="操作"
+                       align="center"
+                       width="260">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.playingStages && scope.row.playingStages.length"
+                     type="text"
+                     @click="editEndTime(scope.row)"
+                     v-auth>修改结束时间</el-button>
+          <el-button type="text"
+                     @click="manage(scope.row)"
+                     v-auth>管理</el-button>
+          <el-button type="text"
+                     @click="delData(scope.row)"
+                     v-auth>删除</el-button>
+          <el-switch v-if="scope.row.publishStatus"
+                     v-auth="'/match:启用'"
+                     v-model="scope.row.ztOpen"
+                     :active-value="0"
+                     :inactive-value="1"
+                     style="margin: 0 10px 0 5px"
+                     :active-text="scope.row.ztOpen ? '关' : '开'"
+                     @change="switchOff($event,scope.row,scope.$index)"></el-switch>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination background
+                     layout="total, prev, pager, next"
+                     :total="total"
+                     @current-change="handleCurrentChange"
+                     :current-page="page">
+      </el-pagination>
     </div>
+
+    <el-dialog title="修改当前阶段结束时间"
+               :visible.sync="modifyVisible"
+               width="900px"
+               :close-on-click-modal="false">
+      <el-table :data="curRow.playingStages"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center">
+        <el-table-column prop="stageName"
+                         label="阶段名称"
+                         min-width="100"
+                         align="center"></el-table-column>
+        <el-table-column label="竞赛起止时间"
+                         width="300"
+                         align="center">
+          <template slot-scope="scope">
+            {{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间调整为"
+                         align="center"
+                         width="280">
+          <template slot-scope="scope">
+            <el-date-picker popper-class="no-atTheMoment"
+                            v-model="scope.row.newEndTime"
+                            placeholder="请选择结束时间"
+                            type="datetime"
+                            :picker-options="pickerOptions">
+            </el-date-picker>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   @click="modifyVisible = false">取 消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="modifySubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 import Setting from "@/setting";
 import { Loading } from 'element-ui'
+import Bus from '@/libs/bus'
 export default {
-    name: "match",
-    data() {
-        return {
-            timer: null,
-            keyword: "",
-            sourceList: [
-                {
-                    id: "",
-                    name: "不限"
-                },
-                {
-                    id: 0,
-                    name: "平台创建"
-                },
-                {
-                    id: 1,
-                    name: "院校创建"
-                }
-            ],
-            rangeList: [
-                {
-                    id: "",
-                    name: "不限"
-                },
-                {
-                    id: 1,
-                    name: "全平台"
-                },
-                {
-                    id: 2,
-                    name: "指定区域"
-                },
-                {
-                    id: 0,
-                    name: "校内"
-                }
-            ],
-            matchData: [],
-            form: {
-                month: "",
-                publishStatus: "",
-                startTime: "",
-                endTime: "",
-                platformSource: +this.$route.query.platformSource || 0, // 大赛来源(0中台，1职站)
-                competitionScope: '', // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
-            },
-            multipleSelection: [],
-            dateList: [
-                {
-                    id: "",
-                    name: "不限"
-                },
-                {
-                    id: 1,
-                    name: "近一个月"
-                },
-                {
-                    id: 3,
-                    name: "近三个月"
-                },
-                {
-                    id: 6,
-                    name: "近六个月"
-                }
-            ],
-            date: [],
-            page: +this.$route.query.page || 1,
-            pageSize: 10,
-            total: 0,
-            transferPublishStatus: [ "未发布", "已发布"],
-            modifyVisible: false,
-            curRow: {
-              playingStages: []
-            },
-            timer: null,
-            redisTimer: null,
-            pickerOptions: {
-              shortcuts: [{
-                text: '此刻',
-                onClick(picker) {
-                  picker.$emit('pick', new Date(Date.now() + 5000))
-                }
-              }]
-            }
-        };
-    },
-    watch: {
-        "form.month": function(val) {
-            if (val) {
-                let unit = 24 * 60 * 60 * 1000;
-                this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
-            } else {
-                this.date = [];
-            }
+  name: "match",
+  data () {
+    return {
+      timer: null,
+      keyword: "",
+      sourceList: [
+        {
+          id: "",
+          name: "不限"
         },
-        date: function(val) {
-            if (val) {
-                this.form.startTime = val[0];
-                this.form.endTime = val[1];
-            } else {
-                this.form.startTime = "";
-                this.form.endTime = "";
-            }
-            this.initData();
+        {
+          id: 0,
+          name: "平台创建"
         },
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
+        {
+          id: 1,
+          name: "院校创建"
         }
-    },
-    mounted() {
-        this.getData()
-        this.$once('hook:beforeDestroy', function() {
-          clearInterval(this.timer)
-          clearInterval(this.redisTimer)
-        })
-    },
-    methods: {
-        getList() {
-          // const load = Loading.service()
-          const { form } = this
-          this.$post(this.api.CompetitionPageConditionQueryByNakadai, {
-            pageNum: this.page,
-            pageSize: this.pageSize,
-            competitionScope: form.competitionScope === '' ? null : form.competitionScope,
-            endTime: form.endTime || null,
-            keyWord: this.keyword || null,
-            platformSource: form.platformSource === '' ? null : form.platformSource,
-            startTime: form.startTime || null,
-          }).then(({ data }) => {
-            // load.close()
-            const list = data.records
-            // 定时处理是否要显示修改结束时间按钮
-            this.timer = setInterval(() => {
-              const now = new Date()
-              list.map(e => {
-                if (!e.playingStages) {
-                  this.$set(e, 'playingStages', [])
-                } else {
-                  e.playingStages = []
-                }
-                // 如果当前时间在竞赛开始结束时间之间
-                if (now >= new Date(e.playStartTime) && now <= new Date(e.playEndTime)) {
-                  // 遍历赛事阶段
-                  if (e.competitionStageList) {
-                    for (const n of e.competitionStageList) {
-                      // 判断是否有开始了的阶段
-                      if (now >= new Date(n.startTime) && now <= new Date(n.endTime)) {
-                        e.playingStages.push(n)
-                      }
-                    }
-                  }
-                }
-              })
-            }, 1000)
-            this.matchData = list
-            this.total = data.total
-            this.$refs.table.clearSelection()
-            if (!this.matchData.length && this.total) {
-              this.page--
-              this.getData()
-            }
-          }).catch(res => {
-            // load.close()
-          })
-        },
-        getData() {
-          this.getList()
-          if (!Setting.isDev) {
-            clearInterval(this.redisTimer)
-            this.redisTimer = setInterval(this.getRedis, 1000)
-          }
-        },
-        initData() {
-            this.page = 1;
-            this.getData();
+      ],
+      rangeList: [
+        {
+          id: "",
+          name: "不限"
         },
-        // 获取redis缓存
-        getRedis() {
-          this.$post(this.api.getRedisCacheCompetition).then(({ data }) => {
-            data && this.getList()
-          }).catch(res => {})
+        {
+          id: 1,
+          name: "全平台"
         },
-        add() {
-            this.$router.push("/addMatch");
+        {
+          id: 2,
+          name: "指定区域"
         },
-        // 修改结束时间
-        editEndTime(row) {
-          this.modifyVisible = true
-          row.newEndTime = ''
-          this.curRow = row
+        {
+          id: 0,
+          name: "校内"
+        }
+      ],
+      matchData: [],
+      form: {
+        month: "",
+        publishStatus: "",
+        startTime: "",
+        endTime: "",
+        platformSource: +this.$route.query.platformSource || 0, // 大赛来源(0中台，1职站)
+        competitionScope: '', // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
+      },
+      multipleSelection: [],
+      dateList: [
+        {
+          id: "",
+          name: "不限"
         },
-        // 修改结束时间提交
-        modifySubmit() {
-          const row = this.curRow
-          const data = []
-          row.competitionStageList.map(e => {
-            const stage = row.playingStages.find(n => n.contentId === e.contentId && n.newEndTime)
-            if (stage && stage.newEndTime) stage.endTime = this.formatDate('yyyy-MM-dd hh:mm:ss', stage.newEndTime)
-            data.push(stage || e)
-          })
-          this.$post(this.api.editCompetitionContent, {
-            competitionContents: data
-          }).then(res => {
-            util.successMsg('修改成功')
-            this.modifyVisible = false
-            this.getData()
-          }).catch(err => {})
+        {
+          id: 1,
+          name: "近一个月"
         },
-        // 管理
-        manage(row) {
-            this.$router.push(`/matchManage?id=${row.id}&name=${row.competitionName}`)
+        {
+          id: 3,
+          name: "近三个月"
         },
+        {
+          id: 6,
+          name: "近六个月"
+        }
+      ],
+      date: [],
+      page: +this.$route.query.page || 1,
+      pageSize: 10,
+      total: 0,
+      transferPublishStatus: ["未发布", "已发布"],
+      modifyVisible: false,
+      curRow: {
+        playingStages: []
+      },
+      timer: null,
+      pickerOptions: {
+        shortcuts: [{
+          text: '此刻',
+          onClick (picker) {
+            picker.$emit('pick', new Date(Date.now() + 5000))
+          }
+        }]
+      }
+    };
+  },
+  watch: {
+    "form.month": function (val) {
+      if (val) {
+        let unit = 24 * 60 * 60 * 1000;
+        this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
+      } else {
+        this.date = [];
+      }
+    },
+    date: function (val) {
+      if (val) {
+        this.form.startTime = val[0];
+        this.form.endTime = val[1];
+      } else {
+        this.form.startTime = "";
+        this.form.endTime = "";
+      }
+      this.initData();
+    },
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    // websocket实时刷新
+    Bus.$on('matchSocket', () => {
+      this.getData()
+    })
 
-        changeType() {
-            this.$refs.table.clearSelection();
-            this.initData();
-        },
-        // 大赛来源回调
-        sourceChange(val) {
-          this.$router.push({
-            path: '/match',
-            query: {
-              ...this.$route.query,
-              platformSource: val
-            }
-          })
-          this.$store.commit('SET_M_SOURCE', val)
-          this.initData()
-        },
-        delData(row) {
-            this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
-                type: "warning"
-            })
-                .then(() => {
-                    this.$post(`${this.api.batchDeleteCompetition}?competitionIds=${row.id}`).then(res => {
-                        util.successMsg("删除成功");
-                        this.getData();
-                    }).catch(res => {
-                    });
-                })
-                .catch(() => {
-                });
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        // 批量删除
-        delAllSelection() {
-            if (this.multipleSelection.length) {
-                this.$confirm("确定要删除吗？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    let ids = this.multipleSelection.map(i => 'competitionIds=' + i.id);
-                    this.$post(`${this.api.batchDeleteCompetition}?${ids.join('&')}`).then(res => {
-                        this.getData();
-                        this.$message.success("删除成功");
-                        this.$refs.table.clearSelection()
-                    }).catch(err => {
-                    });
-                }).catch(() => {
-                });
+    this.getData()
+    this.$once('hook:beforeDestroy', function () {
+      clearInterval(this.timer)
+    })
+  },
+  methods: {
+    getData () {
+      const { form } = this
+      this.$post(this.api.CompetitionPageConditionQueryByNakadai, {
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        competitionScope: form.competitionScope === '' ? null : form.competitionScope,
+        endTime: form.endTime || null,
+        keyWord: this.keyword || null,
+        platformSource: form.platformSource === '' ? null : form.platformSource,
+        startTime: form.startTime || null,
+      }).then(({ data }) => {
+        // load.close()
+        const list = data.records
+        // 定时处理是否要显示修改结束时间按钮
+        this.timer = setInterval(() => {
+          const now = new Date()
+          list.map(e => {
+            if (!e.playingStages) {
+              this.$set(e, 'playingStages', [])
             } else {
-                this.$message.warning("请先选择赛事 ！");
+              e.playingStages = []
             }
-        },
-        handleCurrentChange(val) {
-            this.page = val;
-            this.$router.push(`match?page=${val}`)
+            // 如果当前时间在竞赛开始结束时间之间
+            if (now >= new Date(e.playStartTime) && now <= new Date(e.playEndTime)) {
+              // 遍历赛事阶段
+              if (e.competitionStageList) {
+                for (const n of e.competitionStageList) {
+                  // 判断是否有开始了的阶段
+                  if (now >= new Date(n.startTime) && now <= new Date(n.endTime)) {
+                    e.playingStages.push(n)
+                  }
+                }
+              }
+            }
+          })
+        }, 1000)
+        this.matchData = list
+        this.total = data.total
+        this.$refs.table.clearSelection()
+        if (!this.matchData.length && this.total) {
+          this.page--
+          this.getData()
+        }
+      }).catch(res => { })
+    },
+    initData () {
+      this.page = 1;
+      this.getData();
+    },
+    // 获取redis缓存
+    getRedis () {
+      this.$post(this.api.getRedisCacheCompetition).then(({ data }) => {
+        data && this.getList()
+      }).catch(res => { })
+    },
+    add () {
+      this.$router.push("/addMatch");
+    },
+    // 修改结束时间
+    editEndTime (row) {
+      this.modifyVisible = true
+      row.newEndTime = ''
+      this.curRow = row
+    },
+    // 修改结束时间提交
+    modifySubmit () {
+      const row = this.curRow
+      const data = []
+      row.competitionStageList.map(e => {
+        const stage = row.playingStages.find(n => n.contentId === e.contentId && n.newEndTime)
+        if (stage && stage.newEndTime) stage.endTime = this.formatDate('yyyy-MM-dd hh:mm:ss', stage.newEndTime)
+        data.push(stage || e)
+      })
+      this.$post(this.api.editCompetitionContent, {
+        competitionContents: data
+      }).then(res => {
+        util.successMsg('修改成功')
+        this.modifyVisible = false
+        this.getData()
+      }).catch(err => { })
+    },
+    // 管理
+    manage (row) {
+      this.$router.push(`/matchManage?id=${row.id}&name=${row.competitionName}`)
+    },
+
+    changeType () {
+      this.$refs.table.clearSelection();
+      this.initData();
+    },
+    // 大赛来源回调
+    sourceChange (val) {
+      this.$router.push({
+        path: '/match',
+        query: {
+          ...this.$route.query,
+          platformSource: val
+        }
+      })
+      this.$store.commit('SET_M_SOURCE', val)
+      this.initData()
+    },
+    delData (row) {
+      this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.$post(`${this.api.batchDeleteCompetition}?competitionIds=${row.id}`).then(res => {
+            util.successMsg("删除成功");
             this.getData();
-            this.$store.commit('SET_M_PAGE', val)
-        },
-        transferTime(date, type) {
-            if (date == "0000-00-00 00:00:00") return "---";
-            return date;
-        },
-        switchOff(val, row) {
-          this.$post(this.api.disabledEventsCompetition, {
-            competitionId: row.id,
-            isOpen: val,
-            type: 0 // 禁用平台来源(0中台，1职站)
-          }).then(res => {
-            util.successMsg(val == 1 ? '禁用成功' : '启用成功')
-          }).catch(err => {})
-        },
-    }
+          }).catch(res => {
+          });
+        })
+        .catch(() => {
+        });
+    },
+    handleSelectionChange (val) {
+      this.multipleSelection = val;
+    },
+    // 批量删除
+    delAllSelection () {
+      if (this.multipleSelection.length) {
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          let ids = this.multipleSelection.map(i => 'competitionIds=' + i.id);
+          this.$post(`${this.api.batchDeleteCompetition}?${ids.join('&')}`).then(res => {
+            this.getData();
+            this.$message.success("删除成功");
+            this.$refs.table.clearSelection()
+          }).catch(err => {
+          });
+        }).catch(() => {
+        });
+      } else {
+        this.$message.warning("请先选择赛事 ！");
+      }
+    },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.$router.push(`match?page=${val}`)
+      this.getData();
+      this.$store.commit('SET_M_PAGE', val)
+    },
+    transferTime (date, type) {
+      if (date == "0000-00-00 00:00:00") return "---";
+      return date;
+    },
+    async switchOff (val, row) {
+      this.$post(this.api.disabledEventsCompetition, {
+        competitionId: row.id,
+        isOpen: val,
+        type: 0 // 禁用平台来源(0中台，1职站)
+      }).then(res => {
+        util.successMsg(val == 1 ? '禁用成功' : '启用成功')
+      }).catch(err => { })
+
+      await this.$post(`${this.api.refreshPageNotification}?content=1`)
+    },
+  }
 };
 </script>
 
@@ -432,7 +520,7 @@ export default {
     }
 }
 
-@media(max-width: 1640px) {
+@media (max-width: 1640px) {
     .page .page-content .tool .filter {
         flex-wrap: wrap;
         margin-bottom: -15px;
diff --git a/src/views/match/preview/index.vue b/src/views/match/preview/index.vue
index 566954a..fe7cbf4 100644
--- a/src/views/match/preview/index.vue
+++ b/src/views/match/preview/index.vue
@@ -1,112 +1,150 @@
 <template>
-    <div class="match">
-      <div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
-      <div class="center">
-        <breadcrumb ref="breadcrumb" :data="'全部赛事/' + form.name" route="matchPreview"></breadcrumb>
-        <div class="match-inner">
-          <div class="flex-between">
-              <el-tabs v-model="curType" @tab-click="typeChange">
-                  <el-tab-pane v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.id"></el-tab-pane>
-              </el-tabs>
-              <div class="status wait">等待报名</div>
-          </div>
-          <div class="info">
-            <h6 class="title">{{ form.name }}</h6>
-            <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
+  <div class="match">
+    <div class="banner"
+         :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
+    <div class="center">
+      <breadcrumb ref="breadcrumb"
+                  :data="'全部赛事/' + form.name"
+                  route="match"></breadcrumb>
+      <div class="match-inner">
+        <div class="flex-between">
+          <el-tabs v-model="curType"
+                   @tab-click="typeChange">
+            <el-tab-pane v-for="(item, index) in typeList"
+                         :key="index"
+                         :label="item.name"
+                         :name="item.id"></el-tab-pane>
+          </el-tabs>
+          <div class="status wait">等待报名</div>
+        </div>
+        <div class="info">
+          <h6 class="title">{{ form.name }}</h6>
+          <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
+        </div>
+
+        <div class="l-title"
+             id="part1"><img src="@/assets/img/label.png"
+               alt=""> 竞赛信息</div>
+        <div v-if="form.description"
+             class="texts ql-editor"
+             v-html="form.description"></div>
+        <template v-if="form.competitionAnnexList && form.competitionAnnexList.length">
+          <h6 class="p-title">附件下载</h6>
+          <ul class="files">
+            <li v-for="(item, i) in form.competitionAnnexList"
+                :key="i">
+              <el-link v-if="item.canPreview"
+                       class="m-r-10"
+                       type="primary"
+                       @click="previewFile(item)">{{ item.fileName }}</el-link>
+              <span v-else
+                    class="file-name">{{ item.fileName }}</span>
+              <el-link type="primary"
+                       :underline="false"
+                       @click="download(item)">下载</el-link>
+            </li>
+          </ul>
+        </template>
+        <template v-if="!form.description && (!form.competitionAnnexList || !form.competitionAnnexList.length )">
+          <div class="empty">
+            <div>
+              <img src="@/assets/img/none.png"
+                   alt="">
+              <p>暂无数据</p>
+            </div>
           </div>
+        </template>
 
-          <div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 竞赛信息</div>
-          <div v-if="form.description" class="texts ql-editor" v-html="form.description"></div>
-          <template v-if="form.competitionAnnexList && form.competitionAnnexList.length">
-            <h6 class="p-title">附件下载</h6>
-            <ul class="files">
-              <li v-for="(item, i) in form.competitionAnnexList" :key="i">
-                <el-link v-if="item.canPreview" class="m-r-10" type="primary" @click="previewFile(item)">{{ item.fileName }}</el-link>
-                <span v-else class="file-name">{{ item.fileName }}</span>
-                <el-link type="primary" :underline="false" @click="download(item)">下载</el-link>
-              </li>
-            </ul>
-          </template>
-          <template v-if="!form.description && (!form.competitionAnnexList || !form.competitionAnnexList.length )">
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无数据</p>
-                  </div>
-              </div>
-          </template>
-          
-          <template v-if="form.releaseType">
-            <div class="l-title"><img src="@/assets/img/label.png" alt=""> 赛程、规则与内容</div>
-            <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
-            <div v-for="(rule, i) in form.competitionStage" :key="i" class="rule">
-              <p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p>
-              <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
-              <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
-              <p v-if="!rule.method">课程系统：{{ rule.systemName }}</p>
-              <p v-if="rule.onlineButton">线上地点：{{ rule.onlineAddress }}</p>
-              <p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p>
-              <template v-if="rule.method === 2">
-                <p>线下地点：{{ rule.offlineAddress }}</p>
-                <p>比赛内容：{{ rule.contentDescription }}</p>
-                <p>评分规则：{{ rule.scoreRule }}</p>
-              </template>
-              
-              <template v-if="form.completeCompetitionSetup.competitionType">
-                <p>团队参赛人数限制：{{ rule.teamNumLimit || '不限制' }}</p>
-                <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
-              </template>
-              <p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p>
-              <div v-if="form.rule === 1" class="flex">
-                <p>晋级规则：</p>
-                <div>
-                  <p v-if="rule.peopleLimit">本阶段成绩排名前{{ rule.peopleLimit }}队，可晋级下一阶段比赛</p>
-                  <p v-if="rule.percentageLimit">本阶段成绩排名前{{ rule.percentageLimit }}%，可晋级下一阶段比赛</p>
-                  <p v-if="rule.scoreLimit">本阶段成绩{{ rule.scoreLimit }}分，可晋级下一阶段比赛</p>
-                </div>
+        <template v-if="form.releaseType">
+          <div class="l-title"><img src="@/assets/img/label.png"
+                 alt=""> 赛程、规则与内容</div>
+          <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
+          <div v-for="(rule, i) in form.competitionStage"
+               :key="i"
+               class="rule">
+            <p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p>
+            <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
+            <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
+            <p v-if="!rule.method">课程系统：{{ rule.systemName }}</p>
+            <p v-if="rule.onlineButton">线上地点：{{ rule.onlineAddress }}</p>
+            <p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p>
+            <template v-if="rule.method === 2">
+              <p>线下地点：{{ rule.offlineAddress }}</p>
+              <p>比赛内容：{{ rule.contentDescription }}</p>
+              <p>评分规则：{{ rule.scoreRule }}</p>
+            </template>
+
+            <template v-if="form.completeCompetitionSetup.competitionType">
+              <p>团队参赛人数限制：{{ rule.teamNumLimit || '不限制' }}</p>
+              <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
+            </template>
+            <p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p>
+            <div v-if="form.rule === 1"
+                 class="flex">
+              <p>晋级规则：</p>
+              <div>
+                <p v-if="rule.peopleLimit">本阶段成绩排名前{{ rule.peopleLimit }}队，可晋级下一阶段比赛</p>
+                <p v-if="rule.percentageLimit">本阶段成绩排名前{{ rule.percentageLimit }}%，可晋级下一阶段比赛</p>
+                <p v-if="rule.scoreLimit">本阶段成绩{{ rule.scoreLimit }}分，可晋级下一阶段比赛</p>
               </div>
             </div>
-          </template>
+          </div>
+        </template>
 
-          <!-- 进展 -->
-          <div class="l-title" id="part2"><img src="@/assets/img/label.png" alt=""> 竞赛进展</div>
-          <ul class="progress" v-if="progress.length">
-              <li v-for="(item,index) in progress" :key="index" :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
-                  <i class="dot"></i>
-                  <p class="name">{{item.title}}</p>
-                  <p class="desc">{{item.description}}</p>
-              </li>
-              <img class="rocket" src="@/assets/img/rocket.png" alt="">
-          </ul>
-          <template v-else>
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无数据</p>
-                  </div>
-              </div>
-          </template>
-          
-          <!-- 公告 -->
-          <div class="l-title" id="part3"><img src="@/assets/img/label.png" alt=""> 通知公告</div>
-          <ul class="notice-list" v-if="notices.length">
-            <li v-for="(item, i) in notices" :key="i" @click="toNotice(item)">
-              <h6>{{ item.announcementTitle }}</h6>
-              <p class="meta">{{ item.updateTime }}</p>
-              <div class="des" v-html="item.announcementText"></div>
-            </li>
-          </ul>
-          <template v-else>
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无通知公告</p>
-                  </div>
-              </div>
-          </template>
-        </div>
+        <!-- 进展 -->
+        <div class="l-title"
+             id="part2"><img src="@/assets/img/label.png"
+               alt=""> 竞赛进展</div>
+        <ul class="progress"
+            v-if="progress.length">
+          <li v-for="(item,index) in progress"
+              :key="index"
+              :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
+            <i class="dot"></i>
+            <p class="name">{{item.title}}</p>
+            <p class="desc">{{item.description}}</p>
+          </li>
+          <img class="rocket"
+               src="@/assets/img/rocket.png"
+               alt="">
+        </ul>
+        <template v-else>
+          <div class="empty">
+            <div>
+              <img src="@/assets/img/none.png"
+                   alt="">
+              <p>暂无数据</p>
+            </div>
+          </div>
+        </template>
+
+        <!-- 公告 -->
+        <div class="l-title"
+             id="part3"><img src="@/assets/img/label.png"
+               alt=""> 通知公告</div>
+        <ul class="notice-list"
+            v-if="notices.length">
+          <li v-for="(item, i) in notices"
+              :key="i"
+              @click="toNotice(item)">
+            <h6>{{ item.announcementTitle }}</h6>
+            <p class="meta">{{ item.updateTime }}</p>
+            <div class="des"
+                 v-html="item.announcementText"></div>
+          </li>
+        </ul>
+        <template v-else>
+          <div class="empty">
+            <div>
+              <img src="@/assets/img/none.png"
+                   alt="">
+              <p>暂无通知公告</p>
+            </div>
+          </div>
+        </template>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -114,210 +152,211 @@ import util from "@/libs/util";
 import breadcrumb from '@/components/breadcrumb'
 import Const from '@/const/match'
 export default {
-    name: "match",
-    data() {
-        return {
-          rules: Const.rules,
-          methods: Const.methods,
-          teamCalculationMethods: Const.teamCalculationMethods,
-          curType: '1',
-          typeList: [
-              {
-                  id: '1',
-                  name: '竞赛信息'
-              },
-              {
-                  id: '2',
-                  name: '竞赛进展'
-              },
-              {
-                  id: '3',
-                  name: '通知公告'
-              }
-          ],
-          form: util.local.get('match'),
-          progress: [],
-          notices: [],
-        };
+  name: "match",
+  data () {
+    return {
+      rules: Const.rules,
+      methods: Const.methods,
+      teamCalculationMethods: Const.teamCalculationMethods,
+      curType: '1',
+      typeList: [
+        {
+          id: '1',
+          name: '竞赛信息'
+        },
+        {
+          id: '2',
+          name: '竞赛进展'
+        },
+        {
+          id: '3',
+          name: '通知公告'
+        }
+      ],
+      form: util.local.get('match'),
+      progress: [],
+      notices: [],
+    };
+  },
+  components: {
+    breadcrumb
+  },
+  mounted () {
+    this.handleAnnex()
+    if (this.form.id) {
+      this.getProgress()
+      this.getNotice()
+    }
+  },
+  methods: {
+    // 处理附件
+    handleAnnex () {
+      const list = this.form.competitionAnnexList
+      if (list) {
+        list.map(e => {
+          const { filePath } = e
+          e.canPreview = util.canPreview(filePath.substr(filePath.lastIndexOf('.') + 1)) // 判断是否能够预览
+        })
+        this.$forceUpdate()
+      }
     },
-    components: {
-        breadcrumb
+    getProgress () { // 获取竞赛进展
+      this.$get(this.api.getCompetitionProgress, {
+        competitionId: this.form.id
+      }).then(res => {
+        this.progress = res.competitionProgressList.reverse()
+      }).catch(err => { });
     },
-    mounted() {
-      this.handleAnnex()
-      if (this.form.id) {
-        this.getProgress()
-        this.getNotice()
-      }
+    // 公告列表
+    getNotice () {
+      this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => {
+        const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
+        records.map(e => {
+          e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
+        })
+        this.notices = records
+      }).catch(res => { })
     },
-    methods: {
-      // 处理附件
-      handleAnnex() {
-        const list = this.form.competitionAnnexList
-        if (list) {
-          list.map(e => {
-            const { filePath } = e
-            e.canPreview = util.canPreview(filePath.substr(filePath.lastIndexOf('.') + 1)) // 判断是否能够预览
-          })
-          this.$forceUpdate()
-        }
-      },
-      getProgress() { // 获取竞赛进展
-          this.$get(this.api.getCompetitionProgress, {
-            competitionId: this.form.id
-          }).then(res => {
-              this.progress = res.competitionProgressList.reverse()
-          }).catch(err => {});
-      },
-      // 公告列表
-      getNotice() {
-        this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => {
-          const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
-          records.map(e => {
-            e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
-          })
-          this.notices = records
-        }).catch(res => {})
-      },
-      // 预览附件
-      previewFile(item) {
-        const { filePath } = item
-        const suffix = filePath.substr(filePath.lastIndexOf('.') + 1)
-        window.open((util.isDoc(suffix) || suffix === 'pdf' ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
-      },
-      // 下载附件
-      download(item) {
-        util.downloadFile(item.fileName, item.filePath)
-      },
-      // tab切换
-      typeChange() {
-        document.querySelector(`#part${this.curType}`).scrollIntoView()
-      },
-    }
+    // 预览附件
+    previewFile (item) {
+      const { filePath } = item
+      const suffix = filePath.substr(filePath.lastIndexOf('.') + 1)
+      window.open((util.isDoc(suffix) || suffix === 'pdf' ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
+    },
+    // 下载附件
+    download (item) {
+      util.downloadFile(item.fileName, item.filePath)
+    },
+    // tab切换
+    typeChange () {
+      document.querySelector(`#part${this.curType}`).scrollIntoView()
+    },
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .match {
-  padding-bottom: 20px;
-  background-color: #F3F6FA;
-  .banner{
-    width: 100%;
-    height: 350px;
-    color: #fff;
-    background-size: 100% 350px;
-    background-repeat: no-repeat;
-    box-sizing: border-box;
-  }
-  .center {
-    width: 1000px;
-    margin: 40px auto 0;
-  }
-  .match-inner {
-    min-height: calc(100vh - 465px);
-    padding: 30px 40px 20px;
-    background-color: #fff;
-    box-sizing: border-box;
-  }
-  /deep/.el-tabs {
-    .el-tabs__item.is-active, .el-tabs__item:hover {
-      color: #007EFF;
+    padding-bottom: 20px;
+    background-color: #f3f6fa;
+    .banner {
+        width: 100%;
+        height: 350px;
+        color: #fff;
+        background-size: 100% 350px;
+        background-repeat: no-repeat;
+        box-sizing: border-box;
     }
-    .el-tabs__active-bar {
-      background-color: #007EFF;
+    .center {
+        width: 1000px;
+        margin: 40px auto 0;
     }
-  }
-  .p-title {
-    border-left-color: #007EFF;
-  }
-  .l-title{
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    font-size: 18px;
-    color: #333;
-    img{
-      margin-right: 5px;
+    .match-inner {
+        min-height: calc(100vh - 465px);
+        padding: 30px 40px 20px;
+        background-color: #fff;
+        box-sizing: border-box;
     }
-  }
-  .status {
-      padding: 0 16px;
-      margin-left: 20px;
-      line-height: 34px;
-      font-size: 14px;
-      color: #fff;
-      background-color: #52C41A;
-      border-radius: 4px;
-      cursor: pointer;
-      &.wait {
-          background-color: #FAAD14;
-      }
-      &.signing {
-          background-color: #007EFF;
-      }
-      &.signed {
-          background-color: #52C41A;
-      }
-      &.finish {
-          background-color: #ccc;
-      }
+    /deep/.el-tabs {
+        .el-tabs__item.is-active,
+        .el-tabs__item:hover {
+            color: #007eff;
+        }
+        .el-tabs__active-bar {
+            background-color: #007eff;
+        }
     }
-  .title{
-      width: 67%;
-      margin: 0 auto;
-      font-size: 28px;
-      text-align: center;
-      color: #0B1D30;
-  }
-  .info .meta{
-      padding: 16px 0;
-      font-size: 12px;
-      color: #999;
-      text-align: center;
-  }
-  .texts {
-    margin-bottom: 30px;
-    font-size: 14px;
-    line-height: 1.6;
-    text-indent: 2em;
-    overflow: hidden;
-    /deep/img{
-        max-width: 100%;
+    .p-title {
+        border-left-color: #007eff;
     }
-  }
-  .files {
-    margin-bottom: 30px;
-    li {
-      display: flex;
-      align-items: center;
-      margin: 10px 0;
+    .l-title {
+        display: flex;
+        align-items: center;
+        margin-bottom: 12px;
+        font-size: 18px;
+        color: #333;
+        img {
+            margin-right: 5px;
+        }
+    }
+    .status {
+        padding: 0 16px;
+        margin-left: 20px;
+        line-height: 34px;
+        font-size: 14px;
+        color: #fff;
+        background-color: #52c41a;
+        border-radius: 4px;
+        cursor: pointer;
+        &.wait {
+            background-color: #faad14;
+        }
+        &.signing {
+            background-color: #007eff;
+        }
+        &.signed {
+            background-color: #52c41a;
+        }
+        &.finish {
+            background-color: #ccc;
+        }
     }
-    .file-name {
-      margin-right: 10px;
-      font-size: 12px;
+    .title {
+        width: 67%;
+        margin: 0 auto;
+        font-size: 28px;
+        text-align: center;
+        color: #0b1d30;
     }
-  }
-  .el-link.el-link--primary {
-    color: #007EFF !important;
-    &:after {
-      border-color: #007EFF;
+    .info .meta {
+        padding: 16px 0;
+        font-size: 12px;
+        color: #999;
+        text-align: center;
+    }
+    .texts {
+        margin-bottom: 30px;
+        font-size: 14px;
+        line-height: 1.6;
+        text-indent: 2em;
+        overflow: hidden;
+        /deep/img {
+            max-width: 100%;
+        }
+    }
+    .files {
+        margin-bottom: 30px;
+        li {
+            display: flex;
+            align-items: center;
+            margin: 10px 0;
+        }
+        .file-name {
+            margin-right: 10px;
+            font-size: 12px;
+        }
+    }
+    .el-link.el-link--primary {
+        color: #007eff !important;
+        &:after {
+            border-color: #007eff;
+        }
     }
-  }
 }
-.progress{
+.progress {
     position: relative;
     width: 95%;
     padding: 50px 0;
     margin: 40px auto 80px;
     text-align: left;
-    &:before{
+    &:before {
         content: '';
         position: absolute;
         top: 0;
         left: 50%;
         width: 2px;
         height: 100%;
-        background-color: #E1E6F2;
+        background-color: #e1e6f2;
     }
     &:after {
         content: '';
@@ -325,27 +364,27 @@ export default {
         top: -10px;
         left: 430px;
         border: 8px solid transparent;
-        border-bottom-color: #E1E6F2;
+        border-bottom-color: #e1e6f2;
     }
     .rocket {
         position: absolute;
         bottom: -50px;
         left: 425px;
     }
-    li{
+    li {
         position: relative;
         width: 400px;
         margin-bottom: 42px;
-        .dot{
+        .dot {
             position: absolute;
             top: 12px;
             left: 431px;
             width: 15px;
             height: 15px;
-            background-color: #DCDCDC;
+            background-color: #dcdcdc;
             border-radius: 50%;
         }
-        .name{
+        .name {
             display: inline-block;
             padding: 0 19px;
             margin-bottom: 16px;
@@ -354,27 +393,28 @@ export default {
             font-size: 16px;
             color: #fff;
             border-radius: 20px;
-            background-color: #C4C4C4;
+            background-color: #c4c4c4;
         }
-        .desc{
+        .desc {
             position: relative;
             color: #333;
             font-size: 14px;
         }
-        &.ing, &.done {
+        &.ing,
+        &.done {
             .dot {
                 top: 8px;
-                background-color: #007EFF;
+                background-color: #007eff;
             }
             .name {
-                background-color: #007EFF;
+                background-color: #007eff;
             }
         }
         &.ing {
             .dot {
                 width: 27px;
                 height: 27px;
-                border: 6px solid #E2F1FB;
+                border: 6px solid #e2f1fb;
             }
         }
         &:nth-child(odd) {
@@ -395,16 +435,17 @@ export default {
                     border: 18px solid transparent;
                     border-top-width: 6px;
                     border-bottom-width: 6px;
-                    border-left-color: #C4C4C4;
+                    border-left-color: #c4c4c4;
                 }
             }
             .desc {
                 text-align: right;
             }
-            &.ing, &.done {
+            &.ing,
+            &.done {
                 .name {
                     &:before {
-                        border-left-color: #007EFF;
+                        border-left-color: #007eff;
                     }
                 }
             }
@@ -430,7 +471,7 @@ export default {
                     border: 18px solid transparent;
                     border-top-width: 6px;
                     border-bottom-width: 6px;
-                    border-right-color: #C4C4C4;
+                    border-right-color: #c4c4c4;
                 }
             }
             .desc {
@@ -444,91 +485,92 @@ export default {
                     left: auto;
                     right: -18px;
                     border: 9px solid transparent;
-                    border-left-color: #E6E6E6;
+                    border-left-color: #e6e6e6;
                 }
             }
-            
-            &.ing, &.done {
+
+            &.ing,
+            &.done {
                 .name {
                     &:after {
-                        border-right-color: #007EFF;
+                        border-right-color: #007eff;
                     }
                 }
             }
         }
-        &:last-child{
+        &:last-child {
             margin-bottom: 0;
         }
     }
 }
 .notice-list {
-  text-align: left;
-  li {
-    padding: 16px;
-    margin-bottom: 12px;
-    transition: all 0.3s;
-    cursor: pointer;
-    border-radius: 6px;
-    background-color: #fff;
-    border-bottom: 1px dashed #ebebeb;
-    &:last-child {
-      border-bottom: 0;
+    text-align: left;
+    li {
+        padding: 16px;
+        margin-bottom: 12px;
+        transition: all 0.3s;
+        cursor: pointer;
+        border-radius: 6px;
+        background-color: #fff;
+        border-bottom: 1px dashed #ebebeb;
+        &:last-child {
+            border-bottom: 0;
+        }
     }
-  }
-  h6 {
-    font-size: 20px;
-    font-weight: 500;
-    color: #0B1D30;
-    &:hover {
-      color: #007EFF;
+    h6 {
+        font-size: 20px;
+        font-weight: 500;
+        color: #0b1d30;
+        &:hover {
+            color: #007eff;
+        }
+    }
+    .meta {
+        margin: 10px 0;
+        font-size: 14px;
+        color: #666;
+    }
+    .des {
+        font-size: 14px;
+        color: #333;
+        line-height: 24px;
+        display: -webkit-box;
+        display: -moz-box;
+        -webkit-box-orient: vertical;
+        -moz-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        -moz-line-clamp: 2;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
-  }
-  .meta {
-    margin: 10px 0;
-    font-size: 14px;
-    color: #666;
-  }
-  .des {
-    font-size: 14px;
-    color: #333;
-    line-height: 24px;
-    display: -webkit-box;
-    display:-moz-box;
-    -webkit-box-orient: vertical;
-    -moz-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    -moz-line-clamp: 2;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
 }
-.empty{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 50px 0;
-  text-align: center;
-  img{
-    width: 471px;
-  }
-  p{
-    margin-top: 40px;
-    font-size: 18px;
-    color: rgba(0, 0, 0, 0.25);
-  }
+.empty {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 50px 0;
+    text-align: center;
+    img {
+        width: 471px;
+    }
+    p {
+        margin-top: 40px;
+        font-size: 18px;
+        color: rgba(0, 0, 0, 0.25);
+    }
 }
 .rule-title {
-  margin-bottom: 10px;
-  font-size: 16px;
+    margin-bottom: 10px;
+    font-size: 16px;
 }
 .rule {
-  padding: 15px;
-  margin-bottom: 15px;
-  border: 1px solid #dfdfdf;
-  p {
-    font-size: 14px;
-    line-height: 30px;
-    color: #6e6e6e;
-  }
+    padding: 15px;
+    margin-bottom: 15px;
+    border: 1px solid #dfdfdf;
+    p {
+        font-size: 14px;
+        line-height: 30px;
+        color: #6e6e6e;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index 23895b0..c26fefa 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -2590,6 +2590,7 @@ export default {
           e.associatedProduct && productId.push(+e.associatedProduct);
           let find = this[name].some(i => e.mallId === i.mallId);// 判断已有的相同的id不进行处理
           if (!find) {
+						// 查询产品管理设置的平台结算价
             this.$post(`${this.api.queryCitySettlementPrice}?mallId=${e.mallId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`).then(res => {
               const mall = res.mallPrice
               if (mall) {
diff --git a/src/views/serve/backstage/model.vue b/src/views/serve/backstage/model.vue
index 67a4246..6e8c8ba 100644
--- a/src/views/serve/backstage/model.vue
+++ b/src/views/serve/backstage/model.vue
@@ -107,6 +107,7 @@
 <script>
 import org from "./modelType"
 import Setting from '@/setting'
+import Bus from '@/libs/bus'
 export default {
   data () {
     return {
@@ -122,7 +123,6 @@ export default {
       modelLoading: false,
       modelData: [],
       submiting: false,
-      timer: null
     };
   },
   components: {
@@ -137,12 +137,13 @@ export default {
     }
   },
   mounted () {
-    this.$once('hook:beforeDestroy', function () {
-      clearInterval(this.timer)
+    // websocket实时刷新
+    Bus.$on('modelSocket', () => {
+      this.getData()
     })
   },
   methods: {
-    getList () {
+    getData () {
       const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类
       this.isTopLevel = !curNode.level
       // 如果是首级，要调另一个接口
@@ -170,22 +171,6 @@ export default {
         }).catch(res => { })
       }
     },
-    getData () {
-      clearInterval(this.timer)
-      this.getList()
-      if (!Setting.isDev) {
-      this.timer = setInterval(this.getRedis, 1000)
-      }
-    },
-    // 获取redis缓存
-    getRedis () {
-      this.$post(this.api.modelRedis).then(({ data }) => {
-        if (data) {
-          localStorage.getItem('modelNakadai') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
-          localStorage.setItem('modelNakadai', data)
-        }
-      }).catch(res => { })
-    },
     initData () {
       this.page = 1
       this.getData()
diff --git a/src/views/serve/backstage/sourceModel.vue b/src/views/serve/backstage/sourceModel.vue
index cdb66c2..87ffc2c 100644
--- a/src/views/serve/backstage/sourceModel.vue
+++ b/src/views/serve/backstage/sourceModel.vue
@@ -137,6 +137,7 @@
 <script>
 import org from "./sourceType"
 import Setting from '@/setting'
+import Bus from '@/libs/bus'
 export default {
   data () {
     return {
@@ -157,7 +158,6 @@ export default {
         label: 'categoryName',
         value: 'id'
       },
-      timer: null,
       isSchool: 0,
       categories: []
     };
@@ -174,13 +174,14 @@ export default {
     }
   },
   mounted () {
-    this.$once('hook:beforeDestroy', function () {
-      clearInterval(this.timer)
+    // websocket实时刷新
+    Bus.$on('modelSocket', () => {
+      this.getData()
     })
   },
   methods: {
     // 获取列表
-    async getList () {
+    async getData () {
       const curNode = this.$refs.tree.$refs.tree.getCurrentNode() || {}// 获取当前选中的分类
       this.isTopLevel = !curNode.level
       // 如果是首级，要调另一个接口
@@ -194,22 +195,6 @@ export default {
       this.listData = data.records
       this.total = data.total
     },
-    getData () {
-      clearInterval(this.timer)
-      this.getList()
-      if (!Setting.isDev) {
-        this.timer = setInterval(this.getRedis, 1000)
-      }
-    },
-    // 获取redis缓存
-    getRedis () {
-      this.$post(this.api.modelRedis).then(({ data }) => {
-        if (data) {
-          localStorage.getItem('modelNakadai') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
-          localStorage.setItem('modelNakadai', data)
-        }
-      }).catch(res => { })
-    },
     // 分类点击回调
     catetoryClick (school) {
       this.isSchool = school
@@ -301,7 +286,8 @@ export default {
         this.$confirm(`确定要${off ? '启用' : '禁用'}吗？`, "提示", {
           type: "warning"
         }).then(() => {
-          this.$post(this.api.disableModelDemo, list).then(res => {
+          this.$post(this.api.disableModelDemo, list).then(async res => {
+            await this.$post(`${this.api.refreshPageNotification}?content=4`)
             this.$message.success(`${off ? '启用' : '禁用'}成功`)
             this.getData()
           }).catch(res => { })
@@ -311,7 +297,7 @@ export default {
       }
     },
     // 禁用
-    switchOff (val, row, index) {
+    async switchOff (val, row, index) {
       this.$post(this.api.disableModelDemo, [{
         isOpen: val,
         modelId: row.id,
@@ -319,6 +305,8 @@ export default {
       }]).then(res => {
         this.$message.success(val ? '禁用成功' : '启用成功')
       }).catch(res => { })
+
+      await this.$post(`${this.api.refreshPageNotification}?content=4`)
     },
     handleSelectionChange (val) {
       this.multipleSelection = val
diff --git a/src/views/shop/addProduct/index.vue b/src/views/shop/addProduct/index.vue
index 350141d..c120a92 100644
--- a/src/views/shop/addProduct/index.vue
+++ b/src/views/shop/addProduct/index.vue
@@ -1003,6 +1003,7 @@ export default {
           mall.appletIcon = data.miniProgramPictureAddress
           mall.productIntroduction = data.briefIntroduction
           mall.marketUnitPrice = data.marketPrice
+          this.calcAllSettlement()
         }).catch(err => { })
       } else {
         form.classificationIds = active == 2 ? 5 : 3
@@ -1015,6 +1016,7 @@ export default {
             mall.marketUnitPrice = item.market
             form.mallPrices.find(e => e.settlementPriceType && e.area === 0).settlementPrice = item.settlementPrice
             this.isData = true
+            this.calcAllSettlement()
           }
         }
       }