--

src/HManagement/archives copy/index.vue

@@ -1,43 +0,0 @@
-<template>
-  <div>
-    <!-- 课程列表 -->
-    <list ref="list">
-      <!-- 新增课程 -->
-      <el-button slot="add" icon="el-icon-plus" type="primary" size="small" @click="$router.push({path:'/archives_scadd'})">新 增</el-button>
-      <el-button slot="detail" type="text" size="small">详 情</el-button>
-      <el-button slot="edit" type="text" size="small" class="inline-16">编 辑</el-button>
-      <template v-slot:release="scope">
-        <release :data="scope.data.data" @onSuccess="onSuccess"></release>
-      </template>
-      <el-button slot="data_statistics" type="text" size="small">数据分析</el-button>
-      <template v-slot:del="scope">
-        <on-del :data="scope.data.data" @onSuccess="onSuccess"></on-del>
-      </template>
-    </list>
-  </div>
-</template>
-
-<script>
-import list from './list/list.vue'
-import release from './list/modules/release.vue'
-import onDel from './list/modules/delete.vue'
-
-export default {
-  components:{
-    list,
-    release,
-    onDel
-  },
-  methods:{
-    onSuccess () {
-      this.$refs.list.listData()
-    }
-  },
-  created () {
-    
-  }
-}
-
-</script>
-<style>
-</style>

src/HManagement/archives copy/list/list.vue

@@ -1,126 +0,0 @@
-<template>
-<div>
-  <div class="container normal-panel normal-margin">
-    <slot name="add"></slot>
-  </div>
-  <div class="container normal-panel">
-    <!-- 表格搜索 -->
-    <div class="flex-align-center search-panel" style="margin-bottom:16px">
-      <div class="flex-align-center">
-        <p style="flex:1 0 auto;font-size:14px">一级分类:&nbsp;</p>
-        <el-select style="width:120px;margin-right:16px" size="small" v-model="params.content.where.sat_courseware_classid_1" @change="listData(params.content.pageNumber = 1)" clearable>
-          <el-option v-for="item in options1" :key="item.index" :value="item.sat_courseware_classid" :label="item.classname" @click.native="handelSelectClick(item)"></el-option>
-        </el-select>
-        <p style="flex:1 0 auto;font-size:14px">二级分类:&nbsp;</p>
-        <el-select style="width:120px;margin-right:16px" size="small" v-model="params.content.where.sat_courseware_classid_2" @change="listData(params.content.pageNumber = 1)" clearable>
-          <el-option v-for="item in options2" :key="item.index" :value="item.sat_courseware_classid" :label="item.classname"></el-option>
-        </el-select>
-        <el-input style="width:270px" placeholder="请输入内容" v-model="params.content.where.condition" class="input-with-select" size="small" clearable>
-          <el-button slot="append" icon="el-icon-search"  @click="listData(params.content.pageNumber = 1)">查 询</el-button>
-        </el-input>
-      </div>
-    </div>
-    <!-- 表格 -->
-    <tableLayout :layout="tablecols" :data="list" :custom="true" :height="tableHieght">
-      <template v-slot:customcol="scope">
-        <div v-if="scope.column.columnname === 'status'">
-          <span :style="scope.column.data.status === '发布'?'color:#52C41A':''">{{scope.column.data.status}}</span>
-        </div>
-        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
-      </template>
-      <template v-slot:opreation="scope">
-        <slot name="detail" :data="scope"></slot>
-        <slot name="edit" :data="scope"></slot>
-        <slot name="release" :data="scope"></slot>
-        <slot name="data_statistics" :data="scope"></slot>
-        <!-- <el-button size="mini" type="text" @click="onEdit(scope)">数据统计</el-button> -->
-        <slot name="del" :data="scope"></slot>
-      </template>
-    </tableLayout>
-    <div style="margin-top:16px;text-align:right">
-      <el-pagination
-        background
-        small
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-size="params.content.pageSize"
-        layout="total, prev, pager, next, jumper"
-        :total="total">
-      </el-pagination>
-    </div>
-  </div>
-</div>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      params:{
-        "classname": "webmanage.saletool.courseware.courseware",
-        "method": "select",
-        "content": {
-            "pageNumber": 1,
-            "pageSize": 10,
-            "where": {
-              "condition": "",
-              "sat_courseware_classid_1":'',
-              "sat_courseware_classid_2":''
-            }
-        }
-      },
-      options1:[],
-      options2:[],
-      tablecols:[],
-      list:[],
-      total:0,
-      currentPage:0
-    }
-  },
-  methods:{
-    async listData () {
-      const res = await this.$api.requested(this.params)
-      this.list = res.data
-      this.total = res.total
-      this.currentPage = res.pageNumber
-    },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.params.content.pageSize = val
-      this.listData()
-    },
-    handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
-      this.params.content.pageNumber = val
-      this.listData()
-    },
-    // 分类查询
-    async coursewareclass () {
-      const res = await this.$api.requested({
-        "classname": "webmanage.saletool.courseware.coursewareclass",
-        "method": "select",
-        "content": {
-            "parentid": 0
-        }
-      })
-      this.options1 = res.data
-    },
-    handelSelectClick (val) {
-      this.options2 = val.children
-      this.params.content.where.sat_courseware_classid_2 = ''
-    }
-  },
-  mounted () {
-    this.listData()
-    this.coursewareclass()
-  },
-  created () {
-    //获取表结构
-    this.tablecols = this.tool.tabelCol(this.$route.name)['coursewaretTable'].tablecols
-  }
-}
-
-</script>
-<style>
-</style>

src/HManagement/archives copy/list/modules/add.vue

@@ -1,48 +0,0 @@
-<template>
-  <div>
-    <div class="container normal-panel normal-margin">
-      <el-button type="warning" size="small" icon="el-icon-s-claim" style="background:#FA8C16" @click="onSubmit">保 存</el-button>
-    </div>
-    <el-row :gutter="16">
-      <el-col :span="12">
-        <div class="container normal-panel normal-margin">
-          <p class="normal-title normal-margin" style="line-height:32px">课程设置</p>
-          <el-form :model="form" class="demo-form-inline" label-position="left" label-width="80px" size="small">
-            <el-form-item label="标题">
-              <el-col :span="24">
-                <el-input v-model="form.title" placeholder="请输入标题"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="下架时间">
-            </el-form-item>
-            <el-form-item label="活动区域">
-              <el-select v-model="form.region" placeholder="活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="onSubmit">查询</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      form:{}
-    }
-  },
-  methods:{
-    onSubmit () {}
-  }
-}
-
-</script>
-<style>
-</style>

src/HManagement/archives copy/list/modules/delete.vue

@@ -1,30 +0,0 @@
-<template>
-  <div style="display:inline;margin:0 16px">
-    <el-popconfirm
-      title="确定删除当前通告吗？"
-      @confirm="deleteRow()">
-      <el-button slot="reference" size="small" type="text">删 除</el-button>
-    </el-popconfirm>
-  </div>
-</template>
-
-<script>
-export default {
-  props:['data'],
-  methods:{
-    deleteRow () {
-      this.$api.requested({
-        "classname": "webmanage.saletool.courseware.courseware",
-        "method": "delete",
-        "content": {
-          "sat_coursewareid":this.data.sat_coursewareid
-        }
-      }).then(res=>{
-        this.tool.showMessage(res)
-        res.code === 1?this.$emit('onSuccess'):''
-      })
-    },
-  }
-}
-
-</script>

src/HManagement/archives copy/list/modules/release.vue

@@ -1,31 +0,0 @@
-<template>
-  <div class="inline-16">
-    <el-button type="text" size="mini" @click="releaseNotice">{{data.status === '新建'?'审 核':'退 回'}}</el-button>
-  </div>
-</template>
-
-<script>
-export default {
-  props:['data'],
-  data () {
-    return {}
-  },
-  methods:{
-    async releaseNotice () {
-      const res = await this.$api.requested({
-        "classname": "webmanage.saletool.courseware.courseware",
-        "method": "audit",
-        "content": {
-            "sat_coursewareid": this.data.sat_coursewareid,
-            "type":this.data.status === '新建'?1:0
-        }
-      })
-      this.tool.showMessage(res)
-      res.code === 1?this.$emit('onSuccess'):''
-    }
-  }
-}
-
-</script>
-<style>
-</style>

src/HManagement/archvies_mag/index.vue

@@ -3,7 +3,7 @@
     <el-col :span="24">
        <list ref="list" @onNameChange="onNameChange" @folderChecked="folderChecked" @toFolderDetail="toFolderDetail">
         <template v-if="!showBtnGroup">
-          <h-upload v-if="tool.checkAuth($route.name,'upload')" :folderid="folderid" slot="upload" @onSuccess="onSuccess"></h-upload>
+          <h-upload v-if="tool.checkAuth($route.name,'upload')" :folderid="folderid" slot="upload" :hidemediastock="true" @onSuccess="onSuccess"></h-upload>
           <add v-if="tool.checkAuth($route.name,'insert')" slot="add" ref="add" style="margin-left:10px" @onSuccess="onSuccess"></add>
         </template>
         <template  v-else>

src/HManagement/department/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="flex">
-    <dep-list ref="list" style="flex:1 1 auto;min-width:240px" @onClick="onClick">
+    <dep-list ref="list" style="flex:0 1 auto;width:240px" @onClick="onClick">
       <template v-slot:operation="data">
         <addDep v-if="tool.checkAuth($route.name,'addDep')" class="inline-16" :data="data.data" @onSuccess="onSuccess"></addDep>
       </template>
     </dep-list>
-    <div style="flex:0 1 1;">
+    <div style="flex:1;">
       <div class="container normal-panel normal-margin">
         <editDep v-if="tool.checkAuth($route.name,'editDep')" class="inline-16" :data="depInfo.data" @onSuccess="onSuccess"></editDep>
         <delDep  v-if="tool.checkAuth($route.name,'delDep')" class="inline-16" :data="depInfo.data" @onSuccess="onSuccess"></delDep>

src/HManagement/siteManage/coderule/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <list>
+    <list ref="list">
       <template v-slot:edit="scope">
-        <edit :data="scope.data"></edit>
+        <edit :data="scope.data" @onSuccess="onSuccess"></edit>
       </template>
     </list>
   </div>
@@ -16,6 +16,11 @@ export default {
   components:{
     list,
     edit
+  },
+  methods:{
+    onSuccess () {
+      this.$refs['list'].query_coderuleList()
+    }
   }
 }
 

src/HManagement/siteManage/coderule/modules/edit.vue

@@ -45,7 +45,10 @@ export default {
         "method": "modify_coderule",
         "content": this.form
       })
-      this.tool.showMessage(res,(e)=>{this.dialogFormVisible = false})
+      this.tool.showMessage(res,(e)=>{
+        this.dialogFormVisible = false
+        this.$emit('onSuccess')
+      })
     }
   }
 }

src/components/layout/modules/aside.vue

@@ -1,6 +1,6 @@
 <template>
   <el-menu
-    style="height: calc(100vh - 100px);overflow-y:scroll"
+    style="height: calc(100vh - 100px)"
     :default-active="activePath"
     class="el-menu-vertical-demo"
     @open="handleOpen"
@@ -50,7 +50,6 @@ export default {
   },
   watch:{
     $route(to,from){
-      console.log(to,from)
       if (!to.meta.keeproute) {
         this.activePath = this.$route.path
       }

src/components/layout/modules/header.vue

@@ -10,7 +10,7 @@
       </span>
       <el-dropdown-menu slot="dropdown">
         <!-- <el-dropdown-item>个人中心</el-dropdown-item> -->
-        <el-dropdown-item>切换账号</el-dropdown-item>
+        <el-dropdown-item v-if="canChangeSite" @click.native="$router.replace({path:'/accounts'})">切换账号</el-dropdown-item>
         <el-dropdown-item divided @click.native="loginOut()">退出登录</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -21,6 +21,12 @@
 <script>
 export default {
   props:['siteinfo'],
+  computed: {
+    canChangeSite () {
+      let accounts = JSON.parse(sessionStorage.getItem('account_list'))
+      if (accounts.length > 1) return true
+    }
+  },
   data () {
     return {
       activeIndex:'',
@@ -28,7 +34,6 @@ export default {
     }
   },
   methods:{
-    handleSelect () {},
     loginOut () {
       this.$confirm('是否要退出当前账号?', '提示', {
         confirmButtonText: '确定',
@@ -37,7 +42,9 @@ export default {
       }).then(() => {
         this.$router.push('/')
         sessionStorage.clear()
-      }).catch(() => {
+        location.reload(true);
+      }).catch((err) => {
+        console.log(err)
         this.$message({
           type: 'info',
           message: '已取消'

src/components/upload/hw_obs_upload.vue

@@ -11,7 +11,7 @@
     <!-- 按钮类型 -->
     <el-button v-else type="primary" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload">上 传</el-button>
     <el-dialog title="文件上传" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :before-close="clearFiles">
-      <selectMedia @onShow="onShow" :accept="accept" :bindData="bindData" @onBindSuccess="onBindSuccess"></selectMedia>
+      <selectMedia v-if = "!hidemediastock" @onShow="onShow" :accept="accept" :bindData="bindData" @onBindSuccess="onBindSuccess"></selectMedia>
       <el-upload
         style="width:100%"
         ref="my-upload"
@@ -56,9 +56,10 @@ export default {
     folderid:文件夹id; 必填
     btntype:展示上传按钮的类型;
     accept:限制上传文件类型;
-    bindData:附件上传成功后对应需要绑定的数据信息
+    bindData:附件上传成功后对应需要绑定的数据信息,
+    hidemediastock:是否隐藏媒体库选择
   */
-  props:['folderid','btntype','accept','bindData'],
+  props:['folderid','btntype','accept','bindData','hidemediastock'],
   components:{
     selectMedia
   },

src/router/SManagement.js

@@ -3,7 +3,7 @@ const SManagement = [{
   name: 'noticemag',
   meta: {
     title: '通报',
-    ast_nav: false
+    ast_nav: true
   },
   component: () => import(/* webpackChunkName: "about" */ '@/SManagement/notice/index.vue')
 }, {
@@ -11,7 +11,7 @@ const SManagement = [{
   name: 'noticemag',
   meta: {
     title: '通告详情',
-    ast_nav: false
+    ast_nav: true
   },
   component: () => import(/* webpackChunkName: "about" */ '@/SManagement/notice/notice_detail/NoticeDetail')
 }, {

src/router/index.js

@@ -63,9 +63,12 @@ let routes = [
 routes[2].children = [...routes[2].children,...HManagement,...SManagement]
 
 const router = new VueRouter({
-  // mode: 'history',
+  mode: 'history',
   base: process.env.BASE_URL,
   routes,
 });
-
+export function resetRouter () {
+  const newRouter = router()
+  router.matcher = newRouter.matcher // the relevant part
+}
 export default router;

src/style/style.css

@@ -20,6 +20,7 @@ input[type=number]::-webkit-outer-spin-button {
 ul{
   list-style:none;
 }
+
 .inline{
   display: inline;
 }

src/utils/tool.js

@@ -38,7 +38,7 @@ export default {
   showMessage (res,success) {
     if (res.code === 0)  return Notification({
       title: '失败',
-      message: res.data,
+      message: res.msg,
       type: 'error'
     });
 

src/views/login/login.vue

@@ -34,7 +34,7 @@
               </el-form>
             </el-tab-pane>
             <el-tab-pane label="账号登录" name="second">
-              <el-form :rules="rules" ref="loginForm"  :model="loginForm">
+              <el-form :rules="rules2" ref="loginForm"  :model="loginForm">
                 <el-form-item prop="phonenumber">
                   <el-input v-model="loginForm.phonenumber" placeholder="账号"></el-input>
                 </el-form-item> 
@@ -77,9 +77,16 @@ export default {
           { required: true, message: '请输入验证码', trigger: 'blur' }
         ],
       },
+      rules2:{
+        phonenumber: [
+          { required: true, message: '请输入账号', trigger: 'blur' },
+        ],
+        password: [
+          { required: true, message: '请输入密码', trigger: 'blur' }
+        ],
+      },
       loginForm:{
-        // phonenumber:'13732579910'
-        phonenumber:'13712345678'
+        phonenumber:''
       },
       activeName:'first',
       checked:false,
@@ -135,7 +142,7 @@ export default {
       } else {
         this.$notify({
           title: '失败',
-          message: res.data + res.msg,
+          message:res.msg,
           type: 'error'
         })
       }
@@ -154,7 +161,7 @@ export default {
       } else {
         this.$notify({
           title: '失败',
-          message: res.data,
+          message: res.msg,
           type: 'error'
         })
       }

src/views/mediaStock/index.vue

@@ -3,7 +3,7 @@
     <el-col :span="17">
        <list ref="list" @onNameChange="onNameChange" @folderChecked="folderChecked" @toFolderDetail="toFolderDetail">
         <template v-if="!showBtnGroup">
-          <h-upload v-if="tool.checkAuth($route.name,'upload')" :folderid="folderid" slot="upload" @onSuccess="onSuccess"></h-upload>
+          <h-upload v-if="tool.checkAuth($route.name,'upload')" :folderid="folderid" slot="upload" @onSuccess="onSuccess" :hidemediastock="true"></h-upload>
           <add v-if="tool.checkAuth($route.name,'insert')" slot="add" ref="add" style="margin-left:10px" @addClick="addClick" @onSuccess="onSuccess"></add>
         </template>
         <template  v-else>

src/views/select_accounts/index.vue

@@ -29,9 +29,7 @@ export default {
     // 选择登录账号
     selectAccount (item) {
       sessionStorage.setItem('active_account',JSON.stringify(item))
-
       this.query_userauth()
-      
       this.querySite_Parameter()
     },
     // 查询应用授权
@@ -65,6 +63,10 @@ export default {
   },
   created () {
     this.account_list = JSON.parse(sessionStorage.getItem('account_list'))
+    if (this.account_list.length === 0) {
+      this.$router.go(-1)
+      this.tool.showMessage({code:0,msg:"当前账号下不存在任何站点"})
+    }
     if (this.account_list.length === 1) {
       this.selectAccount(this.account_list[0])
     }

yos/css/250.39364e34.css

@@ -1 +0,0 @@
-.title[data-v-0e4e8f4b]{height:20px;line-height:20px;font-size:14px;text-indent:7px;font-weight:700;color:#333;margin-bottom:20px;border-left:4px solid #3874f6}.mb-40[data-v-0e4e8f4b]{margin-bottom:40px}

yos/css/380.39364e34.css

@@ -1 +0,0 @@
-.title[data-v-0e4e8f4b]{height:20px;line-height:20px;font-size:14px;text-indent:7px;font-weight:700;color:#333;margin-bottom:20px;border-left:4px solid #3874f6}.mb-40[data-v-0e4e8f4b]{margin-bottom:40px}

yos/img/more.58cd973b.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 22 22"><defs><style>.a{fill:none;}.b{fill:#fff;}</style></defs><g transform="translate(-262.326 -384.891)"><rect class="a" width="22" height="22" transform="translate(262.326 384.891)"/><g transform="translate(63.177 -349.635)"><rect class="b" width="22" height="2" rx="1" transform="translate(199.149 735.525)"/><rect class="b" width="22" height="2" rx="1" transform="translate(199.149 744.166)"/><rect class="b" width="22" height="2" rx="1" transform="translate(199.149 752.806)"/></g></g></svg>

yos/img/work_station.550df9c4.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.a{fill:none;}.b{fill:#fff;}</style></defs><g transform="translate(80 -466)"><rect class="a" width="30" height="30" transform="translate(-80 466)"/><path class="b" d="M86.087,724.24l-4.151,4.15a2.607,2.607,0,0,1-3.688,0L74.1,724.24a2.608,2.608,0,0,1,0-3.689l4.151-4.151a2.607,2.607,0,0,1,3.688,0l4.151,4.151a2.608,2.608,0,0,1,0,3.689Zm-16.757,17.4H63.46a2.608,2.608,0,0,1-2.609-2.609v-5.87a2.609,2.609,0,0,1,2.609-2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.608,2.608,0,0,1-2.609,2.609Zm0-13.7H63.46a2.609,2.609,0,0,1-2.609-2.609v-5.87a2.608,2.608,0,0,1,2.609-2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.609,2.609,0,0,1-2.609,2.609Zm7.827,2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.608,2.608,0,0,1-2.609,2.609h-5.87a2.608,2.608,0,0,1-2.609-2.609v-5.87a2.609,2.609,0,0,1,2.609-2.609Zm0,0" transform="translate(-138.851 -247.636)"/></g></svg>