公告开发对接完成

src/router/router.js

@@ -25,6 +25,7 @@ const exportDownload = r => require.ensure([], () => r(require('../views/learnin
 const itemShield = r => require.ensure([], () => r(require('../views/education/item-shield.vue')), 'item-shield')
 const entryManager = r => require.ensure([], () => r(require('../views/education/entry-manager.vue')), 'entry-manager')
 const editEntry = r => require.ensure([], () => r(require('../views/education/edit-entry.vue')), 'edit-entry')
+const editNotice = r => require.ensure([], () => r(require('../views/education/edit-notice.vue')), 'edit-notice')
 
 export default [{
     path: '/',
@@ -97,11 +98,18 @@ export default [{
             path: '/edit-entry',
             component: editEntry,
         },
-      {
-        path: '/msg-push',
-        component: msgPush,
-        // redirect: 'msgpush/msg-push',
-      },
+        {
+            path: '/msg-push',
+            component: msgPush,
+            // redirect: 'msgpush/msg-push',
+        },
+        {
+            path: '/edit-notice',
+            component: editNotice,
+            // redirect: 'msgpush/msg-push',
+        },
+
+        
       // {
       //   path: '/followup',
       //   name: 'followUp',

src/utils/fetch.js

@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
       // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      config.headers['token'] = '2E46B77D801C479DBA1C550CE70D348F';
+      config.headers['token'] = 'F24CD42F1CFA46829639228E9CFE1E3D' || '2E46B77D801C479DBA1C550CE70D348F';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/education/edit-notice.vue

+<template>
+  <div class="item-shield">
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
+    <div class="component-content screenSet" id="screenSet">
+      <div class="header-title" style="position:relative;">
+        公告
+        <el-button
+          type="primary"
+          style="position: absolute;right: 30px;bottom: 8px;"
+          size="small"
+          @click="confirmEdit()"
+        >确定</el-button>
+        <el-button
+          type="primary"
+          style="position: absolute;right: 120px;bottom: 8px;"
+          size="small"
+          @click="cancleEdit()"
+        >取消</el-button>
+      </div>
+      <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
+        <el-form :model="formData" ref="formData" :rules="rules" label-width="120px" class="form-inline">
+          <el-col :span="22" style="min-width: 600px;">
+            <el-form-item label="是否开启公告：">
+              <el-radio-group size="small" v-model="formData.openFlag" @change="changeOpenFlag">
+                <el-radio :label="1">开启</el-radio>
+                <el-radio :label="2">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col v-show="formData.openFlag != 2" :span="22">
+            <el-form-item label="标题：" prop="noticeTitle">
+              <el-input size="small" v-model="formData.noticeTitle" placeholder="请输入公告标题"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col v-show="formData.openFlag != 2" :span="22">
+            <el-form-item label="内容：" prop="noticeContent">
+              <el-input size="small" v-model="formData.noticeContent" placeholder="请输入公告内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+    </div>
+
+    <el-dialog class="prot-dialog" title="" :visible.sync="isShowDialog" width="30%" center :show-close=true>
+      <p v-show="isCancleBtn" class="prot-dialog-tips-1">确定取消吗？取消后将不保存本次操作内容</p>
+      <p v-show="!isCancleBtn" class="prot-dialog-tips-1">确定要开启公告吗？点击确定后公告将立即生效</p>
+      <!-- <p class="prot-dialog-tips-2">若您选择暂不发送，您只能录入量表的非敏感信息</p> -->
+      <!-- <p class="prot-dialog-tips-3">为避免打扰居民，7天内只能发送1次，您已发送过短信，请尽快联系居民同意授权</p> -->
+      <span v-show="isCancleBtn" slot="footer" class="dialog-footer">
+        <el-button size="small" @click="cancleConfirm"> 确定取消 </el-button>
+        <el-button size="small" type="primary" @click="isShowDialog = false"> 继续操作 </el-button>
+      </span>
+      <span v-show="!isCancleBtn" slot="footer" class="dialog-footer">
+        <el-button size="small" @click="openFlagCancle"> 取消 </el-button>
+        <el-button size="small" type="primary" @click="openFlagConfirm"> 确定 </el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import BreadCrumb from "../../components/breadcrumb.vue";
+import { openLoading, closeLoading } from "../../utils/utils";
+import * as commonUtil from "../../utils/utils";
+import * as operationData from "../../utils/operation";
+let vm = null;
+export default {
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      curmbFirst: "教培项目",
+      curmbSecond: "公告管理",
+      projectId: "",
+      formData: {
+        noticeContent: "",
+        noticeId: 0,
+        noticeTitle: "",
+        openFlag: 0,
+        projectId: 0
+      },
+      isShowDialog: false,
+      isCancleBtn: true,
+      rules: {
+        noticeTitle: [
+          { required: true, message: "请输入公告标题", trigger: "blur" },
+        ],
+        noticeContent: [
+          { required: true, message: "请输入公告内容", trigger: "blur" },
+        ],
+      }
+    };
+  },
+  created() {
+    vm = this;
+    vm.projectId = vm.getUrlSearch(window.location.href, "projectId");
+    vm.formData.projectId = vm.projectId
+    vm.getNoticeInfo();
+  },
+  // 挂载到Dom完成时
+  mounted: function() {
+    commonUtil.resizeHeight();
+  },
+  methods: {
+    //获取公告信息
+    getNoticeInfo() {
+      let req = {
+        projectId: vm.projectId
+      };
+      openLoading(vm);
+      vm.GET("portal/noticeInfo/getNoticeInfo", req).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+          vm.formData = res.data;
+        }
+      });
+    },
+
+    //提交公告信息
+    confirmEdit() {
+      let flag = false;
+      vm.$refs['formData'].validate(valid => {
+        if (valid) {
+          flag = true;
+        } else {
+          flag = false;
+        }
+      });
+      if(!flag) return;
+
+      openLoading(vm);
+      vm.formData.projectId = vm.projectId
+      vm.POST("portal/noticeInfo/insertOrUpdate", vm.formData).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+          vm.$router.push('/item-manager');
+        }
+      });
+    },
+    // 点击取消按钮
+    cancleEdit() {
+      vm.isCancleBtn = true;
+      vm.isShowDialog = true;
+    },
+
+    // 切换开启状态
+    changeOpenFlag(value) {
+      if(vm.formData.noticeId && value == 1) {
+        vm.isCancleBtn = false;
+        vm.isShowDialog = true;
+      }
+    },
+
+    // 确认取消
+    cancleConfirm() {
+      vm.isShowDialog = false;
+      vm.$router.push('/item-manager');
+    },
+
+    // 确认开启的取消
+    openFlagCancle() {
+      vm.isShowDialog = false;
+      vm.formData.openFlag = 2;
+      // vm.$forceUpdate();
+    },
+
+    // 确认开启
+    openFlagConfirm() {
+      vm.isShowDialog = false;
+      vm.confirmEdit();
+    }
+  }
+};
+</script>
+<style lang="scss">
+.item-shield {
+  .component-content {
+    background: #fff;
+    padding: 20px 30px;
+    .header-title {
+      padding: 10px 12px;
+      font-size: 12px;
+      color: #449284;
+      border-bottom: 1px solid #efefef;
+    }
+    .complete {
+      float: right;
+    }
+    .text-black {
+      color: #d51f35;
+    }
+  }
+}
+</style>
\ No newline at end of file

src/views/education/item-manager.vue

@@ -161,6 +161,12 @@
               type="primary"
               size="small"
             >屏蔽</el-button>
+            <el-button
+              @click="addOrModifyNotice(scope.row, 0)"
+              v-show="showButton(scope.row, 0)"
+              type="primary"
+              size="small"
+            >公告</el-button>
           </template>
         </el-table-column>
         <div slot="empty">
@@ -500,6 +506,9 @@ export default {
           this.tableDataEnd.push(list[from]);
         }
       }
+    },
+    addOrModifyNotice(row) {
+      this.$router.push("edit-notice?projectId=" + row.id);
     }
   }
 };