zc

src/api/commonality/permission.js

@@ -286,3 +286,12 @@ export function systemUserFaceAddOrInfo(query) {
     params: query
   })
 }
+
+//通用上传接口
+export function systemFileUpload(data) {
+  return request({
+    url: '/system/file/upload',
+    method: 'post',
+    data: data
+  })
+}

src/api/serviceCenter/index.js

@@ -170,3 +170,30 @@ export function getVersionByType(query) {
     params: query
   })
 }
+
+/**************************定时任务**************************/
+
+// 查询调度日志列表
+export function listJobLog(query) {
+  return request({
+    url: '/base/job/log/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除调度日志
+export function delJobLog(jobLogId) {
+  return request({
+    url: '/base/job/log/' + jobLogId,
+    method: 'delete'
+  })
+}
+
+// 清空调度日志
+export function cleanJobLog() {
+  return request({
+    url: '/base/job/log/clean',
+    method: 'delete'
+  })
+}

src/api/systemManagement/index.js

@@ -214,3 +214,49 @@ export function addOrUpdate(data) {
     data: data
   })
 }
+
+/*********************************系统公告*********************************/
+// 查询公告列表
+export function listNotice(data) {
+  return request({
+    url: '/system/notice/list',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询公告详细
+export function getNotice(query) {
+  return request({
+    url: '/system/notice/detail',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增公告
+export function addNotice(data) {
+  return request({
+    url: '/system/notice/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公告
+export function updateNotice(data) {
+  return request({
+    url: '/system/notice/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除公告
+export function delNotice(data) {
+  return request({
+    url: '/system/notice/delete',
+    method: 'post',
+    data: data
+  })
+}

src/router/index.js

@@ -64,16 +64,6 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/basicsModules/403'], resolve),
         name: '403',
       },
-      {
-        path: '/demo',
-        component: (resolve) => require(['@/views/systemManagement/menu/index'], resolve),
-        name: 'demo',
-      },
-      {
-        path: '/demo1',
-        component: (resolve) => require(['@/views/systemManagement/dict/index'], resolve),
-        name: 'demo1',
-      },
     ]
   },
   {

src/store/modules/user.js

@@ -1,4 +1,5 @@
 import { login, logout, getInfo, refreshToken,phoneLogin } from '@/api/basicsModules/index'
+import { systemUserProfile } from "@/api/commonality/permission";
 import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
 import store from '@/store'
 import router from '@/router'
@@ -49,7 +50,6 @@ const user = {
             return
           }
           let data = res.data
-          console.log('loginData',data)
           let avatar = data.avatar == "" ? require("@/assets/ZDimages/basicsModules/tx_cion.png") : data.avatar;
           commit('SET_NAME', data.userName)
           commit('SET_AVATAR', avatar)
@@ -90,16 +90,23 @@ const user = {
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
+        // systemUserProfile().then(res => {
+        //   let user = res.data
+        //   let avatar = user.avatar == "" ? require("@/assets/ZDimages/basicsModules/tx_cion.png") : user.avatar;
+        //   commit('SET_NAME', user.userName)
+        //   commit('SET_AVATAR', avatar)
+        //   localStorage.setItem('user',JSON.stringify(user));
+        // })
         getInfo().then(res => {
           if(res){
-            // let user = res.user
-            // let avatar = user.avatar == "" ? require("@/assets/ZDimages/basicsModules/tx_cion.png") : user.avatar;
+            console.log('res',res.data)
+            let user = res.data.userInfo
+            let avatar = user.avatar == "" ? require("@/assets/ZDimages/basicsModules/tx_cion.png") : user.avatar;
+            commit('SET_NAME', user.userName)
+            commit('SET_AVATAR', avatar)
+            localStorage.setItem('user',JSON.stringify(user));
             commit('SET_ROLES', ['placeholder'])
-            // commit('SET_PERMISSIONS', res.permissions)
-            commit('SET_PERMISSIONS', res.data)
-            // commit('SET_NAME', user.userName)
-            // commit('SET_AVATAR', avatar)
-            // localStorage.setItem('user',JSON.stringify(user));
+            commit('SET_PERMISSIONS', res.data.data)
             resolve(res)
           }else{
             store.dispatch('LogOut').then(() => {

src/views/basicsModules/components/userAvatar.vue

@@ -61,6 +61,8 @@
   import { VueCropper } from "vue-cropper";
   import { uploadAvatar } from "@/api/basicsModules/index";
 
+  import { systemFileUpload,systemUserUpdate } from "@/api/commonality/permission";
+
   export default {
     components: { VueCropper },
     props: {
@@ -132,14 +134,22 @@
         this.$refs.cropper.getCropBlob(data => {
           const file = new File([data], 'userImg.jpg', { type: 'image/jpeg', lastModified: Date.now() });
           let formData = new FormData();
-          formData.append("avatarfile", file);
-          uploadAvatar(formData).then(response => {
-            this.open = false;
-            this.options.img = response.imgUrl;
-            store.commit('SET_AVATAR', this.options.img);
-            this.msgSuccess("修改成功");
-            this.$parent.getUser();
-            this.visible = false;
+          // formData.append("avatarfile", file);
+          formData.append("file", file);
+          systemFileUpload(formData).then(response => {
+            let obj = {
+              avatar:response.data.url,
+              userId : this.user.userId,
+              userType : this.user.userType,
+            };
+            systemUserUpdate(obj).then(response => {
+              this.open = false;
+              this.options.img = obj.avatar;
+              store.commit('SET_AVATAR', this.options.img);
+              this.msgSuccess("修改成功");
+              this.$parent.getUser();
+              this.visible = false;
+            })
           });
         });
       },

src/views/basicsModules/mine.vue

@@ -148,11 +148,11 @@
                   size="small"
                 />
               </el-form-item>
-              <el-form-item class="form-item-min" label="新密码：" prop="newPassword" label-width="120px">
+              <el-form-item class="form-item-min" label="新密码：" prop="password" label-width="120px">
                 <el-input
                   maxlength="16"
                   type="password"
-                  v-model.trim="form.newPassword"
+                  v-model.trim="form.password"
                   placeholder="请输入新密码"
                   clearable
                   size="small"
@@ -262,7 +262,8 @@ import { getToken } from "@/utils/auth";
 import fingerprintSubPagePublic from './differenceComponent/fingerprintSubPagePublic.vue'
 
 //V3
-import { systemUserProfile } from "@/api/commonality/permission";
+import { systemUserProfile,systemUserEditPasswd,systemUserUpdate } from "@/api/commonality/permission";
+import md5 from 'js-md5';
 
 
 export default {
@@ -280,7 +281,7 @@ export default {
       }
     };
     const equalToPasswordTwo = (rule, value, callback) => {
-      if (this.form.newPassword !== value) {
+      if (this.form.password !== value) {
         callback(new Error("两次输入的密码不一致"));
       } else {
         callback();
@@ -314,7 +315,7 @@ export default {
       activeTab: "resetPwd",
       form:{
         oldPassword:"",
-        newPassword:"",
+        password:"",
         confirmPassword:""
       },
       userform:{},
@@ -328,7 +329,7 @@ export default {
         oldPassword: [
           { required: true, message: "旧密码不能为空", trigger: "blur" },
         ],
-        newPassword: [
+        password: [
           { required: true, message: "新密码不能为空", trigger: "blur" },
           { min: 8, max: 16, message: "长度在 8 到 16 个字符", trigger: "blur" },
           { required: true, validator: equalToPassword, trigger: "blur" },
@@ -413,7 +414,10 @@ export default {
             return
           }
           // let obj = JSON.parse(JSON.stringify(this.userform));
-          let obj = {};
+          let obj = {
+            userId : this.user.userId,
+            userType : this.user.userType,
+          };
           obj.mobile = this.userform.mobile;
           if(this.userform.email){
             let regex = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
@@ -431,8 +435,7 @@ export default {
           }else{
             obj.birthday = '';
           }
-          obj.userId = this.user.userId;
-          upDataProfile(obj).then(response => {
+          systemUserUpdate(obj).then(response => {
             this.msgSuccess('操作成功');
             this.getUser();
           });
@@ -465,7 +468,7 @@ export default {
             cancelButtonText: "取消",
             type: "warning"
           }).then(function() {
-            self.updateUserPwd();
+            self.systemUserEditPasswd();
           }).then(() => {
           }).catch(() => {});
         }
@@ -482,11 +485,16 @@ export default {
       );
     },
     //修改密码接口
-    updateUserPwd(){
-      updateUserPwd(this.form.oldPassword, this.form.newPassword).then(
+    systemUserEditPasswd(){
+      let obj = {
+        userId:this.user.userId,
+        oldPassword:md5(this.form.oldPassword),
+        password:md5(this.form.password)
+      }
+      systemUserEditPasswd(obj).then(
         response => {
           this.form.oldPassword = "";
-          this.form.newPassword = "";
+          this.form.password = "";
           this.form.confirmPassword = "";
           this.msgSuccess("修改成功");
         }
@@ -594,7 +602,7 @@ export default {
     //上传
     handleAvatarSuccess(res, type) {
       if(res.code == 200){
-        this.user.faceImg = res.data.cardUrl;
+        // this.user.faceImg = res.data.cardUrl;
         this.upFaceOpen = false;
         this.getUser();
         this.msgSuccess(res.message)

src/views/serviceCenter/certificationManagement/certificationAccredit/index.vue

@@ -0,0 +1,193 @@
+<!--认证授权-->
+<template>
+  <div class="app-container certificationAccredit">
+    <div class="title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm"
+               :inline="true" style="width:100%;">
+        <el-form-item label="关键词" prop="searchValue" label-width="80px">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.searchValue"
+            placeholder="名称或电话号码"
+            clearable
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="state" label-width="60px">
+          <el-select v-model="queryParams.state" clearable placeholder="请选择分类" style="width: 200px">
+            <el-option :value="true">启用</el-option>
+            <el-option :value="false">停用</el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="dateRange">
+          <el-date-picker
+            :clearable="false"
+            v-model="dateRange"
+            size="small"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="reset-button-one" @click="resetQuery">重置</p>
+        </el-form-item>
+        <el-form-item label="" prop="title" style="float: right">
+          <el-col :span="1.5" style="margin-right:10px;">
+            <p class="add-button-one-90"
+               @click="dialogOpen"
+            ><i class="el-icon-plus"></i>新增</p>
+          </el-col>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="content-box">
+      <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+        <el-table-column label="平台/企业" align="center" prop="fileName" show-overflow-tooltip/>
+        <el-table-column label="昵称" align="center" prop="fileSize" show-overflow-tooltip width="120"/>
+        <el-table-column label="联系人" align="center" prop="fileSize" show-overflow-tooltip width="120"/>
+        <el-table-column label="联系电话" align="center" prop="fileSize" show-overflow-tooltip width="200"/>
+        <el-table-column label="状态" align="center" prop="state" show-overflow-tooltip width="100">
+          <template slot-scope="scope">
+            {{scope.row.state?'启用':'停用'}}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="fileSize" show-overflow-tooltip width="240"/>
+        <el-table-column label="创建时间" align="center" prop="fileSize" show-overflow-tooltip width="120"/>
+        <el-table-column label="操作" align="center" prop="deptName" width="140">
+          <template slot-scope="scope">
+            <div class="table-button-box">
+              <p class="table-button-null"></p>
+              <p class="table-button-p" @click="tableButton(1,scope.row)">编辑</p>
+              <p class="table-button-p" @click="tableButton(2,scope.row)">删除</p>
+              <p class="table-button-null"></p>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.page"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
+    <!--新增弹窗-->
+    <el-dialog class="trainingCourseAddDialog" :title='dialogTitle' width="540px"
+               :visible.sync="dialogType" v-if="dialogType" @close="dialogOff()"
+               :close-on-click-modal="false" :close-on-press-escape="false">
+
+      <div slot="footer" class="dialog-footer dialog-footer-box" style="display: flex">
+        <p class="dialog-footer-button-null"></p>
+        <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-null"></p>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'index',
+    data(){
+      return{
+        loading:false,
+        optionList:[{label:"启用",value:true},{label:"禁用",value:false}],
+        queryParams:{
+          page:1,
+          pageSize:20,
+          searchValue:"",
+          state:null,
+        },
+        dateRange:[],
+        tableList:[],
+        total:0,
+        //dialog弹层数据
+        dialogTitle:"",
+        dialogType:false,
+      }
+    },
+    created(){
+      // this.getList();
+    },
+    mounted(){
+
+    },
+    methods:{
+      //弹层关闭
+      dialogOff(){
+        this.$set(this,'dialogType',false);
+      },
+      //弹层开启
+      dialogOpen(){
+        this.$set(this,'dialogTitle','新增');
+        this.$set(this,'dialogType',true);
+      },
+      //弹层确定
+      dialogSubmit(){
+        this.$set(this,'dialogType',false);
+      },
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          searchValue:"",
+          state:null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        if(this.dateRange[0]){
+          obj.startTime = this.dateRange[0]+'T00:00:00'
+          obj.endTime = this.dateRange[1]+'T23:59:59'
+        }else{
+          obj.startTime = "";
+          obj.endTime = "";
+        }
+        tenantList(obj).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'tableList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
+      },
+      //预览
+      tableButton(){
+
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+.certificationAccredit{
+  flex:1;
+  display: flex;
+  flex-direction: column;
+  .title-box{
+    padding-top:20px;
+    border-bottom:1px solid #dedede;
+    display: flex;
+  }
+  .content-box{
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    padding:20px;
+    overflow: hidden;
+  }
+}
+</style>

src/views/serviceCenter/certificationManagement/certificationInfo/index.vue

@@ -0,0 +1,193 @@
+<!--认证信息-->
+<template>
+  <div class="app-container certificationInfo">
+    <div class="title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm"
+               :inline="true" style="width:100%;">
+        <el-form-item label="关键词" prop="searchValue" label-width="80px">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.searchValue"
+            placeholder="名称或电话号码"
+            clearable
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="state" label-width="60px">
+          <el-select v-model="queryParams.state" clearable placeholder="请选择分类" style="width: 200px">
+            <el-option :value="true">启用</el-option>
+            <el-option :value="false">停用</el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="dateRange">
+          <el-date-picker
+            :clearable="false"
+            v-model="dateRange"
+            size="small"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="reset-button-one" @click="resetQuery">重置</p>
+        </el-form-item>
+        <el-form-item label="" prop="title" style="float: right">
+          <el-col :span="1.5" style="margin-right:10px;">
+            <p class="add-button-one-90"
+               @click="dialogOpen"
+            ><i class="el-icon-plus"></i>新增</p>
+          </el-col>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="content-box">
+      <el-table v-loading="loading" border :data="tableList" ref="multipleTable">
+        <el-table-column label="平台/企业" align="center" prop="fileName" show-overflow-tooltip/>
+        <el-table-column label="昵称" align="center" prop="fileSize" show-overflow-tooltip width="120"/>
+        <el-table-column label="联系人" align="center" prop="fileSize" show-overflow-tooltip width="120"/>
+        <el-table-column label="联系电话" align="center" prop="fileSize" show-overflow-tooltip width="200"/>
+        <el-table-column label="状态" align="center" prop="state" show-overflow-tooltip width="100">
+          <template slot-scope="scope">
+            {{scope.row.state?'启用':'停用'}}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="fileSize" show-overflow-tooltip width="240"/>
+        <el-table-column label="创建时间" align="center" prop="fileSize" show-overflow-tooltip width="120"/>
+        <el-table-column label="操作" align="center" prop="deptName" width="140">
+          <template slot-scope="scope">
+            <div class="table-button-box">
+              <p class="table-button-null"></p>
+              <p class="table-button-p" @click="tableButton(1,scope.row)">编辑</p>
+              <p class="table-button-p" @click="tableButton(2,scope.row)">删除</p>
+              <p class="table-button-null"></p>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.page"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
+    <!--新增弹窗-->
+    <el-dialog class="trainingCourseAddDialog" :title='dialogTitle' width="540px"
+               :visible.sync="dialogType" v-if="dialogType" @close="dialogOff()"
+               :close-on-click-modal="false" :close-on-press-escape="false">
+
+      <div slot="footer" class="dialog-footer dialog-footer-box" style="display: flex">
+        <p class="dialog-footer-button-null"></p>
+        <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-null"></p>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'index',
+    data(){
+      return{
+        loading:false,
+        optionList:[{label:"启用",value:true},{label:"禁用",value:false}],
+        queryParams:{
+          page:1,
+          pageSize:20,
+          searchValue:"",
+          state:null,
+        },
+        dateRange:[],
+        tableList:[],
+        total:0,
+        //dialog弹层数据
+        dialogTitle:"",
+        dialogType:false,
+      }
+    },
+    created(){
+      // this.getList();
+    },
+    mounted(){
+
+    },
+    methods:{
+      //弹层关闭
+      dialogOff(){
+        this.$set(this,'dialogType',false);
+      },
+      //弹层开启
+      dialogOpen(){
+        this.$set(this,'dialogTitle','新增');
+        this.$set(this,'dialogType',true);
+      },
+      //弹层确定
+      dialogSubmit(){
+        this.$set(this,'dialogType',false);
+      },
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          searchValue:"",
+          state:null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        if(this.dateRange[0]){
+          obj.startTime = this.dateRange[0]+'T00:00:00'
+          obj.endTime = this.dateRange[1]+'T23:59:59'
+        }else{
+          obj.startTime = "";
+          obj.endTime = "";
+        }
+        tenantList(obj).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'tableList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
+      },
+      //预览
+      tableButton(){
+
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .certificationInfo{
+    flex:1;
+    display: flex;
+    flex-direction: column;
+    .title-box{
+      padding-top:20px;
+      border-bottom:1px solid #dedede;
+      display: flex;
+    }
+    .content-box{
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding:20px;
+      overflow: hidden;
+    }
+  }
+</style>

src/views/serviceCenter/timingTask/index.vue

@@ -0,0 +1,196 @@
+<!--定时任务-->
+<template>
+  <div class="app-container timingTask">
+    <div class="title-box">
+      <el-form :model="queryParams" class="form-box" ref="queryForm"
+               :inline="true" style="width:100%;">
+        <el-form-item label="任务名称" prop="jobName" label-width="90px">
+          <el-input
+            maxLength="30"
+            v-model="queryParams.jobName"
+            placeholder="请输入任务名称"
+            clearable
+            style="width: 200px"
+          />
+        </el-form-item>
+        <el-form-item label="任务组名" prop="jobGroup">
+          <el-select v-model="queryParams.jobGroup" clearable placeholder="请选择任务组名" style="width: 200px">
+            <el-option
+              v-for="dict in jobGroupOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="执行状态" prop="status">
+          <el-select v-model="queryParams.status" clearable placeholder="请选择分类" style="width: 200px">
+            <el-option
+              v-for="dict in statusOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
+          <p class="reset-button-one" @click="resetQuery">重置</p>
+        </el-form-item>
+        <el-form-item label="" prop="title" style="float: right">
+          <el-col :span="1.5" style="margin-right:10px;">
+            <p class="add-button-one-90"
+               @click="dialogOpen"
+            ><i class="el-icon-plus"></i>新增</p>
+          </el-col>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="content-box">
+      <el-table v-loading="loading" border :data="dataList">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="日志编号" width="80" align="left" prop="jobLogId" />
+        <el-table-column label="任务名称" align="left" prop="jobName" :show-overflow-tooltip="true" />
+        <el-table-column label="任务组名" align="left" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" />
+        <el-table-column label="调用目标字符串" align="left" prop="invokeTarget" :show-overflow-tooltip="true" />
+        <el-table-column label="日志信息" align="left" prop="jobMessage" :show-overflow-tooltip="true" />
+        <el-table-column label="执行状态" align="left" prop="status" :formatter="statusFormat" />
+        <el-table-column label="执行时间" align="left" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleView(scope.row)"
+              v-hasPermi="['monitor:job:query']"
+            >详细</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="queryParams.page"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
+    <!--新增弹窗-->
+    <el-dialog class="trainingCourseAddDialog" :title='dialogTitle' width="540px"
+               :visible.sync="dialogType" v-if="dialogType" @close="dialogOff()"
+               :close-on-click-modal="false" :close-on-press-escape="false">
+
+      <div slot="footer" class="dialog-footer dialog-footer-box" style="display: flex">
+        <p class="dialog-footer-button-null"></p>
+        <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-null"></p>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { getDicts } from "@/api/commonality/noPermission";
+  import { listJobLog, delJobLog, cleanJobLog } from "@/api/serviceCenter/index";
+  export default {
+    name: 'index',
+    data(){
+      return{
+        loading:false,
+        statusOptions:[],
+        jobGroupOptions:[],
+        queryParams:{
+          page:1,
+          pageSize:20,
+          jobName:"",
+          jobGroup:null,
+          status:null,
+        },
+        dateRange:[],
+        dataList:[],
+        total:0,
+        //dialog弹层数据
+        dialogTitle:"",
+        dialogType:false,
+      }
+    },
+    created(){
+      // this.getList();
+    },
+    mounted(){
+      //学生类别查询
+      getDicts('sys_common_status').then(response => {
+        this.$set(this,'statusOptions',response.data);
+      });
+      //学生类别查询
+      getDicts('sys_job_group').then(response => {
+        this.$set(this,'jobGroupOptions',response.data);
+      });
+    },
+    methods:{
+      //弹层关闭
+      dialogOff(){
+        this.$set(this,'dialogType',false);
+      },
+      //弹层开启
+      dialogOpen(){
+        this.$set(this,'dialogTitle','新增');
+        this.$set(this,'dialogType',true);
+      },
+      //弹层确定
+      dialogSubmit(){
+        this.$set(this,'dialogType',false);
+      },
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          jobName:"",
+          jobGroup:null,
+          status:null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        listJobLog(this.queryParams).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .timingTask{
+    flex:1;
+    display: flex;
+    flex-direction: column;
+    .title-box{
+      padding-top:20px;
+      border-bottom:1px solid #dedede;
+      display: flex;
+    }
+    .content-box{
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding:20px;
+      overflow: hidden;
+    }
+  }
+</style>

src/views/systemManagement/menu/index.vue

@@ -378,13 +378,6 @@ export default {
         this.menuOptions.push(menu);
       });
     },
-    // 显示状态字典翻译
-    visibleFormat(row, column) {
-      if (row.menuType == "2") {
-        return "";
-      }
-      return this.selectDictLabel(this.visibleOptions, row.visible);
-    },
     // 菜单状态字典翻译
     statusFormat(row, column) {
       if (row.menuType == "2") {

src/views/systemManagement/notice/index.vue

@@ -0,0 +1,313 @@
+<template>
+  <div class="app-container notice-page">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="关键字" prop="title">
+        <el-input
+          v-model="queryParams.searchValue"
+          placeholder="公告标题/操作人员"
+          clearable
+          size="small"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="noticeType">
+        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
+          <el-option
+            v-for="dict in typeOptions"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item style="float: right;">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['system:notice:add']"
+          >新增</el-button>
+        </el-col>
+      </el-form-item>
+      <el-form-item>
+        <p class="inquire-button-one" @click="handleQuery">查询</p>
+        <p class="reset-button-one" @click="resetQuery">重置</p>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" border :data="noticeList" @selection-change="handleSelectionChange">
+      <el-table-column label="公告标题" align="left" prop="title" show-overflow-tooltip/>
+      <el-table-column label="公告类型" align="left" prop="noticeType" :formatter="typeFormat" show-overflow-tooltip width="100"/>
+      <el-table-column label="状态" align="left" prop="state" :formatter="statusFormat" show-overflow-tooltip width="100"/>
+      <el-table-column label="创建者" align="left" prop="createBy" width="140" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
+        <template slot-scope="scope">
+          <div class="table-button-box">
+            <p class="table-button-null"></p>
+            <p class="table-button-p"
+               @click="handleUpdate(scope.row)"
+               v-hasPermi="['system:notice:edit']"
+            >编辑</p>
+            <p class="table-button-p"
+               @click="handleDelete(scope.row)"
+               v-hasPermi="['system:notice:remove']"
+            >删除</p>
+            <p class="table-button-null"></p>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination :page-sizes="[20, 30, 40, 50]"
+      v-show="total>0"
+      :total="total"
+      layout="total, prev, pager, next, sizes, jumper"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公告对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="公告标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入公告标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公告类型" prop="noticeType">
+              <el-select v-model="form.noticeType" placeholder="请选择">
+                <el-option
+                  v-for="dict in typeOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态" prop="state">
+              <el-radio-group v-model="form.state">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="内容" prop="content">
+              <editor v-model="form.content" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/systemManagement/index";
+
+export default {
+  name: "Notice",
+  data() {
+    return {
+      tableButtonType:this.hasPermiDom(['system:notice:edit','system:notice:remove']),
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公告表格数据
+      noticeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 类型数据字典
+      statusOptions: [{label:"正常",value:true},{label:"关闭",value:false},],
+      // 状态数据字典0-通知,1-公告, 2-消息, 3-自定义"
+      typeOptions: [
+        {label:"通知",value:0},
+        {label:"公告",value:1},
+        {label:"消息",value:2},
+        {label:"自定义",value:3},
+        ],
+      // 查询参数
+      queryParams: {
+        page: 1,
+        pageSize:20,
+        searchValue: undefined,
+        title: undefined,
+        createBy: undefined,
+        state: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: "公告标题不能为空", trigger: "blur" },
+          { required: true, message: "公告标题不能为空", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+        noticeType: [
+          { required: true, message: "公告类型不能为空", trigger: "change" }
+        ],
+        state: [
+          { required: true, message: "请选择状态", trigger: "change" }
+        ],
+        content: [
+          { required: true, message: "请输入内容", trigger: "change" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true;
+      listNotice(this.queryParams).then(response => {
+        this.noticeList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 公告状态字典翻译
+    statusFormat(row, column) {
+      let self = this;
+      for(let i=0;i<self.statusOptions.length;i++){
+        if(row.state == self.statusOptions[i].value){
+          return self.statusOptions[i].label
+        }
+      }
+    },
+    // 公告状态字典翻译
+    typeFormat(row, column) {
+      let self = this;
+      for(let i=0;i<self.typeOptions.length;i++){
+        if(row.noticeType == self.typeOptions[i].value){
+          return self.typeOptions[i].label
+        }
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        noticeId: null,
+        title: null,
+        noticeType: null,
+        content: null,
+        state: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.searchValue='';
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.noticeId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加公告";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const noticeId = row.noticeId || this.ids
+      getNotice({noticeId:noticeId}).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改公告";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.noticeId != undefined) {
+            updateNotice(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addNotice(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const noticeIds = row.noticeId || this.ids
+      this.$confirm('是否确认删除公告?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delNotice({noticeId:noticeIds});
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+  .notice-page{
+    display: flex;
+    flex-direction: column;
+    flex:1;
+    padding:20px!important;
+    overflow: inherit;
+  }
+</style>

src/views/systemManagement/systemUser/index.vue

@@ -221,7 +221,7 @@
       <!--<p class="teacher-text-p">确定要重置该账号的密码吗？</p>-->
       <!--<p class="teacher-text-p">确定操作后，该账号密码将重置为系统初始密码。</p>-->
       <div slot="footer" class="teacher-revise-dialog-button-box">
-        <p class="reset-button-one" @click="reviseOpenOff">取消</p>
+        <p class="reset-button-one" style="margin-right:20px;" @click="reviseOpenOff">取消</p>
         <p class="inquire-button-one" @click="putUserResetPwd">确定</p>
       </div>
     </el-dialog>
@@ -238,6 +238,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 //V3新
 import { getDeptList,systemUserList,systemUserAdd,systemUserDetail,
   systemUserUpdate,systemUserEditState,systemUserDelete,systemUserEditPasswd } from "@/api/commonality/permission";
+import md5 from 'js-md5';
 
 export default {
   name: "User",
@@ -541,7 +542,7 @@ export default {
         if (valid) {
           let obj = {
             userId : this.resetPwdId,
-            password:this.passwordForm.password
+            password:md5(this.passwordForm.password)
           };
           systemUserEditPasswd(obj).then(response => {
             this.reviseOpen = false;
@@ -591,8 +592,12 @@ export default {
       switch (command) {
         case "handleResetPwd":
           this.reset();
-          this.title = "重置密码";
+          this.title = "修改密码";
           this.resetPwdId = row.userId;
+          this.$set(this,'passwordForm',{
+            password:"",
+            newPassword:"",
+          });
           this.reviseOpen = true;
           break;
         default: