Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-portal

.env.production

@@ -1,4 +1,4 @@
 OUT_PUT_DIR=dist/jp-employment-portal
 
-VUE_APP_BACKEND_URL=https://xpgjapi.xiaoxinda.com/
+VUE_APP_BACKEND_URL=http://121.37.187.149/jp-employment-server
 #VUE_APP_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/

build.groovy

@@ -0,0 +1,57 @@
+pipeline {
+    agent any
+    
+    stages {
+        stage('checkout') {
+            steps {
+                dir("${env.WORKSPACE}/code"){
+                    git branch: branch,credentialsId: 'cd13504d-d7eb-433f-be4b-4cbeedf0372d', url: 'http://47.92.161.104:10080/shuzhan/jp-employment-portal.git'
+                }
+            }
+        }
+        
+        stage('package') {
+            steps {
+                nodejs('nodejs12') {
+                    //sh 'npm install cnpm -g --registry=https://registry.npm.taobao.org'
+                    //sh 'cnpm -v'
+
+                    dir("${env.WORKSPACE}/code"){
+                        sh "cnpm install"
+                        sh "npm run build"
+                    }
+                }
+            }
+        }
+        
+        stage('deploy') {
+            steps {
+                script {
+                    dir("${env.WORKSPACE}/code/dist"){
+                        def appName = "jp-employment-portal"
+                        def host = "121.37.187.149"
+                        sh "tar -czvf ${appName}.tar.gz ${appName}"
+                        
+                        withCredentials([usernamePassword(credentialsId: host, 
+                                          passwordVariable: 'pwd', usernameVariable: 'userName')]) {
+                            def sshServer = [:]
+                            
+                            sshServer.name = 'huawei server'
+                            sshServer.host = host
+                            
+                            sshServer.user = userName
+                            sshServer.password = pwd
+                            
+                            sshServer.allowAnyHosts= true
+
+                            def folder = "/opt/websites";
+                            sshPut remote: sshServer, from: appName + '.tar.gz', into: folder
+                            sshCommand remote: sshServer, command: "rm -rf ${folder}/${appName}"
+                            sshCommand remote: sshServer, command: "tar -zxvf ${folder}/${appName}.tar.gz -C ${folder}"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/api/base/messageNotice.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/messageNotice/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/messageNotice/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/messageNotice/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/messageNotice/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/messageNotice/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/messageNotice/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/messageNotice/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/routers/modules/base.js

@@ -56,6 +56,15 @@ var routers = [
                         title: '劳务对接信息详情'
                 }
         },
+        {
+                path: '/base/messageNotice/list',
+                name: 'messageNoticeList',
+                component: () => import('@/views/base/messageNotice-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '通知管理'
+                }
+        },
 ]
 
 export default routers;

src/views/base/messageNotice-detail.vue

@@ -0,0 +1,216 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="标题" prop="title">
+          <el-input
+            v-model="formModel.title"
+            placeholder="请输入标题"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <!-- <el-input
+            type="textarea"
+            :rows="4"
+            v-model="formModel.content"
+            placeholder="请输入内容"
+            style="width: 90%"
+          ></el-input> -->
+          <mce-editor
+            ref="editor"
+            uploadName="upfile"
+            v-model="formModel.content"
+            :url="uploadUrl"
+            :config="editorConfig"
+          ></mce-editor>
+        </el-form-item>
+        <!-- <el-form-item label="收件人" prop="recipientId">
+          <el-input
+            v-model="formModel.recipientId"
+            placeholder="请输入收件人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="status">
+          <el-select v-model="formModel.status" filterable placeholder="请选择" style="width: 300px">
+            <el-option label="未审核" :value="false"></el-option>
+            <el-option label="已审核" :value="true"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="通知分类" prop="classify">
+          <el-select v-model="formModel.classify" filterable placeholder="请选择" style="width: 300px">
+            <el-option v-for="classify in classifyResult" :key="classify.id" :label="classify.name" :value="classify.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="消息类型" prop="type">
+          <el-select v-model="formModel.type" filterable placeholder="请选择" style="width: 300px">
+            <el-option label="站内通告" value="1"></el-option>
+            <el-option label="微信" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="超链接" prop="noticeLink">
+          <el-input
+            v-model="formModel.noticeLink"
+            placeholder="请输入超链接"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="发送微信" prop="sendWechat">
+          <el-select v-model="formModel.sendWechat" filterable placeholder="请选择" style="width: 300px">
+            <el-option label="不发送" :value="false"></el-option>
+            <el-option label="发送" :value="true"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="消息模板" prop="wechatCode">
+          <el-input
+            v-model="formModel.wechatCode"
+            placeholder="请输入消息模板"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item> -->
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import messageNoticeApi from "@/api/base/messageNotice";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import MceEditor from "@/components/Tinymce";
+import {getToken} from "@/utils/auth";
+
+export default {
+  props: ["businessKey", "title"],
+  components: {
+    "mce-editor": MceEditor,
+  },
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+        recipientId: [{ required: true, message: "收件人ID不能为空", trigger: "blur" }],
+        status: [{ required: true, message: "审核状态是否不能为空", trigger: "blur" }],
+        classify: [{ required: true, message: "分类(字典:通知分类不能为空", trigger: "blur" }],
+        type: [{ required: true, message: "类型:1站内通告,2微信不能为空", trigger: "blur" }],
+        noticeLink: [{ required: true, message: "点击超链接不能为空", trigger: "blur" }],
+        sendWechat: [{ required: true, message: "是否发送微信消息不能为空", trigger: "blur" }],
+        wechatCode: [{ required: true, message: "消息模板code不能为空", trigger: "blur" }],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      classifyResult: [],
+      editorConfig: {
+        height: 200,
+        width: "95%",
+      },
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+    };
+  },
+  created() {
+    dataDictionaryApi
+    .findByCatalogName({
+      catalogName: "消息分类",
+    })
+    .then((response) => {
+      var jsonData = response.data;
+      this.classifyResult = jsonData.data;
+    });
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            self.formModel.content = self.$refs.editor.getContent();
+            if (id == null || id.length == 0) {
+              return messageNoticeApi.add(self.formModel);
+            } else {
+              return messageNoticeApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return messageNoticeApi.create();
+      } else {
+        return messageNoticeApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          if (self.formModel.content != null) {
+            self.$refs.editor.setContent(self.formModel.content);
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/messageNotice-list.vue

@@ -0,0 +1,290 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/base/messageNotice">通知管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+          <el-select v-model="queryModel.status" filterable placeholder="请选择" size="mini">
+            <el-option label="未审核" :value="false"></el-option>
+            <el-option label="已审核" :value="true"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="通知分类" prop="classify">
+          <el-select v-model="queryModel.classify" filterable placeholder="请选择" size="mini">
+            <el-option v-for="classify in classifyResult" :key="classify.id" :label="classify.name" :value="classify.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="消息类型" prop="type">
+          <el-select v-model="queryModel.type" filterable placeholder="请选择" size="mini">
+            <el-option label="站内通告" value="1"></el-option>
+            <el-option label="微信" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="mini" icon="ios-search" @click="changePage(1)" :loading="loading">查询</el-button>&nbsp;
+        <el-button type="info" size="mini" style="margin-left: 8px" @click="handleReset('queryForm')">重置</el-button>&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" :disabled="multipleSelection.length == 0" @click="handleBatchDelete">删除选中项</el-button>
+    </el-row>
+    <el-table :data="tableData" style="min-height: 400px" v-loading="loading" stripe @sort-change="sortChange" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="title" label="标题" width="180"></el-table-column>
+      <el-table-column prop="recipientId" label="收件人" width="180"></el-table-column>
+      <el-table-column prop="status" label="审核状态" width="180"></el-table-column>
+      <el-table-column prop="classify" label="通知分类" width="180"></el-table-column>
+      <el-table-column prop="type" label="消息类型" width="180"></el-table-column>
+      <el-table-column prop="sendWechat" label="微信消息" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <messageNotice-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></messageNotice-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import MessageNoticeDetail from "./messageNotice-detail";
+import messageNoticeApi from "@/api/base/messageNotice";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        title: "",
+        recipientId: "",
+        status: "",
+        classify: "",
+        type: "",
+        sendWechat: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      classifyResult: [],
+    };
+  },
+  created() {
+    dataDictionaryApi
+    .findByCatalogName({
+      catalogName: "消息分类",
+    })
+    .then((response) => {
+      var jsonData = response.data;
+      this.classifyResult = jsonData.data;
+    });
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("title", self.queryModel.title);
+      formData.append("recipientId", self.queryModel.recipientId);
+      formData.append("status", self.queryModel.status);
+      formData.append("classify", self.queryModel.classify);
+      formData.append("type", self.queryModel.type);
+      formData.append("sendWechat", self.queryModel.sendWechat);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      messageNoticeApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          messageNoticeApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        messageNoticeApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "messageNotice-detail": MessageNoticeDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>