codeMan пре 3 година
родитељ
комит
80190e95be

+ 2 - 0
src/SManagement/archives_sc/index.vue

@@ -104,6 +104,8 @@ export default {
       this.$api.requested(this.param).then(res => {
         this.total = res.total
         this.list = res.data
+        console.log(this.list);
+        
         this.param.content.sort = res.sort
       })
     },

+ 1 - 1
src/SManagement/notice/compoents/list.vue

@@ -3,7 +3,7 @@
     <div class="list-box" v-for="(item,index) in list" :key="index" @click="itemClick(item.sat_noticeid)">
       <div class="item-left">
         <el-image 
-                :src="item.cover" 
+                :src="item.cover || require('@/assets/notify.png')" 
                 lazy
                 fit="scale-down"></el-image>
         <div class="text-panl">

+ 4 - 1
src/SManagement/user/role-edit/components/RolePowerSelect.vue

@@ -5,7 +5,10 @@
         <p class="title">角色授权</p>
       </el-col>
       <el-col :span="11" style="margin-right:16px">
-        <search @searchActive="searchActive" @clearData="clearData"></search>
+        <div class="handle">
+          <search @searchActive="searchActive" @clearData="clearData"></search>
+          
+        </div>
         <table-layout :layout="tablecols" :data="powerList" @rowClick="rowClick"></table-layout>
         <div class="page">
           <pagination :total="total" :pageSize="power.content.pageSize" :currentPage="power.content.pageNumber"

+ 1 - 2
src/SManagement/user/user-info/UserInfo.vue

@@ -8,9 +8,8 @@
       </div>
       <base-info :userInfo="userInfo" ref="userInfo">
           <phone-edit slot="phoneEdit" :userInfo="userInfo" @phoneChange="phoneChange" v-if="tool.checkAuth($route.name,'update')"></phone-edit>
-          <!-- <pass-edit slot="passEdit" :userInfo="userInfo" v-if="tool.checkAuth($route.name,'update')"></pass-edit> -->
+          <pass-edit slot="passEdit" :userInfo="userInfo" v-if="tool.checkAuth($route.name,'update')"></pass-edit>
       </base-info>
-
       <wx-bind :userInfo="userInfo">
       </wx-bind>
     </div>

+ 1 - 1
src/SManagement/user/user-info/components/PassEdit.vue

@@ -4,7 +4,7 @@
     <el-dialog title="修改密码" :visible.sync="dialogVisible" :before-close="handleClose">
       <el-form ref="form" :rules="rules" :model="form" label-width="80px">
         <el-form-item label="原密码" prop="pass">
-          <el-input v-model="form.pass" placeholder="请输入原密码"></el-input>
+          <el-input v-model="form.pass" placeholder="请输入原密码" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="新密码" prop="newpass">
           <el-input placeholder="请输入新密码" v-model="form.newpass" show-password></el-input>

+ 2 - 2
src/SManagement/user/user-info/components/baseInfo.vue

@@ -19,10 +19,10 @@
         <el-input v-model="ruleForm.phonenumber" size="small" :placeholder="ruleForm.phonenumber" :disabled="true"></el-input>
         <slot :data="userInfo" name="phoneEdit"></slot>
       </el-form-item>
-      <!-- <el-form-item label="密码:" prop="pass">
+      <el-form-item label="密码:" prop="pass">
         <el-input v-model="ruleForm.pass" size="small" placeholder="******" :disabled="true"></el-input>
         <slot :data="userInfo" name="passEdit"></slot>
-      </el-form-item> -->
+      </el-form-item>
     </el-form>
   </div>
 </template>

BIN
src/assets/notify.png


+ 109 - 106
src/router/HManagement.js

@@ -129,112 +129,115 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/agent_detail.vue')
-  }, {
-    path: '/notice_mag_list',
-    name: 'noticemag',
-    meta: {
-      title: '通告管理',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/notice_mag/index.vue')
-  },{
-    path: '/notice_add',
-    name: 'noticemag',
-    meta: {
-      title: '编辑通告',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/notice_mag/modules/add_notice.vue')
-  },{
-    path: '/notice_edit',
-    name: 'noticemag',
-    meta: {
-      title: '编辑通告',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/notice_mag/modules/edit_notice.vue')
-  },{
-    path: '/submit_mag',
-    name: 'submit_mag',
-    meta: {
-      title: '提报管理',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/index.vue')
-  },{
-    path: '/submit_add',
-    name: 'submit_mag',
-    meta: {
-      title: '提报管理',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/modules/submit_add.vue')
-  },{
-    path: '/submit_edit',
-    name: 'submit_mag',
-    meta: {
-      title: '提报管理',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/modules/submit_edit.vue')
-  },{
-    path: '/archives_list',
-    name: 'archives',
-    meta: {
-      title: ' 营销物料',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives/index.vue')
-  }, {
-    path: '/archives_ad_list',
-    name: 'archives_ad',
-    meta: {
-      title: ' 营销物料',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives/index.vue')
-  }, {
-    path: '/archives_scmag',
-    name: 'archives_scmag',
-    meta: {
-      title: '商学院管理',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/index.vue')
-  }, {
-    path: '/archives_scadd',
-    name: 'archives_scmag',
-    meta: {
-      title: '编辑课程',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/add.vue')
-  }, {
-    path: '/archives_scedit',
-    name: 'archives_scmag',
-    meta: {
-      title: '编辑课程',
-      ast_nav: true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/edit.vue')
-  },{
-    path: '/archives_scdetails',
-    name: 'archives_scmag',
-    meta: {
-      title: '课程详情',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/details.vue')
-  },{
-    path: '/archives_scclass',
-    name: 'archives_scclass',
-    meta: {
-      title: '课程分类',
-      ast_nav:true
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/archives_scclass/index.vue')
-  },{
-    path: '/archives_sc_analysis',
+  },
+  // }, {
+  //   path: '/notice_mag_list',
+  //   name: 'noticemag',
+  //   meta: {
+  //     title: '通告管理',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/notice_mag/index.vue')
+  // },{
+  //   path: '/notice_add',
+  //   name: 'noticemag',
+  //   meta: {
+  //     title: '编辑通告',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/notice_mag/modules/add_notice.vue')
+  // },{
+  //   path: '/notice_edit',
+  //   name: 'noticemag',
+  //   meta: {
+  //     title: '编辑通告',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/notice_mag/modules/edit_notice.vue')
+  // },{
+  //   path: '/submit_mag',
+  //   name: 'submit_mag',
+  //   meta: {
+  //     title: '提报管理',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/index.vue')
+  // },{
+  //   path: '/submit_add',
+  //   name: 'submit_mag',
+  //   meta: {
+  //     title: '提报管理',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/modules/submit_add.vue')
+  // },{
+  //   path: '/submit_edit',
+  //   name: 'submit_mag',
+  //   meta: {
+  //     title: '提报管理',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/modules/submit_edit.vue')
+  // },{
+  //   path: '/archives_list',
+  //   name: 'archives',
+  //   meta: {
+  //     title: ' 营销物料',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives/index.vue')
+  // }, 
+  // {
+  //   path: '/archives_ad_list',
+  //   name: 'archives_ad',
+  //   meta: {
+  //     title: ' 营销物料',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives/index.vue')
+  // },
+  // {
+  //   path: '/archives_scmag',
+  //   name: 'archives_scmag',
+  //   meta: {
+  //     title: '商学院管理',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/index.vue')
+  // }, {
+  //   path: '/archives_scadd',
+  //   name: 'archives_scmag',
+  //   meta: {
+  //     title: '编辑课程',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/add.vue')
+  // }, {
+  //   path: '/archives_scedit',
+  //   name: 'archives_scmag',
+  //   meta: {
+  //     title: '编辑课程',
+  //     ast_nav: true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/edit.vue')
+  // },{
+  //   path: '/archives_scdetails',
+  //   name: 'archives_scmag',
+  //   meta: {
+  //     title: '课程详情',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/details.vue')
+  // },{
+  //   path: '/archives_scclass',
+  //   name: 'archives_scclass',
+  //   meta: {
+  //     title: '课程分类',
+  //     ast_nav:true
+  //   },
+  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/archives_scclass/index.vue')
+  // },{
+    {path: '/archives_sc_analysis',
     name: 'archives_scmag',
     meta: {
       title: '数据分析',