代码上传

.gitignore

@@ -0,0 +1 @@
+node_modules

src/HManagement/marketing/area/list.vue

@@ -111,5 +111,7 @@ export default {
   font-size: 14px;
   /* width:300px; */
   background: #FAFAFA;
+  height: calc(100vh - 130px);
+  overflow-y: scroll;
 }
 </style>

src/HManagement/notice/list/modules/edit_notice.vue

@@ -205,7 +205,7 @@ export default {
         }
       })
       this.options = res.data
-      this.form.sat_notice_classid = res.data[0].sat_notice_classid
+      // this.form.sat_notice_classid = res.data[0].sat_notice_classid
     },
     // 获取封面信息
     async queryFileLink() {

src/HManagement/submit/list/modules/submit_edit.vue

@@ -8,7 +8,7 @@
       <el-row :gutter="16">
         <el-col :span="13">
           <div class="container normal-panel normal-margin">
-            <p class="normal-title normal-margin">通告设置</p>
+            <p class="normal-title normal-margin">提报设置</p>
             <el-row :gutter="16">
               <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="left" size="small">
                 <el-col :span="24">

src/SManagement/archives_upload/index.vue

@@ -35,6 +35,7 @@
           :defaultData="defaultData"
           :dataid="authId"
           appidname="sat_sharematerialid"
+          obiectName="sat_sharematerial"
           @onChecked="onChecked"
         />
       </el-col>

src/components/scopeOfAuthority/modules/dep_auth.vue

@@ -2,6 +2,7 @@
   <div>
     <el-row :gutter="20">
       <el-col :span="12">
+        <el-button size="mini" @click="setCheckedKeys">全 选</el-button>
         <div class="tree-panel">
           <el-tree
             ref="tree"
@@ -67,6 +68,7 @@ export default {
       checkedMenbers:[], // 授权人员信息
       departmentids:[], // 选中的部门
       onCheckedMenber:[], // 当前查询人员列表选中的人员
+      allKeys:[],
       searchValue:'', // 搜索人员
       clickdepid:'', // 点击的部门id
       isonlymanager_dept:false,
@@ -118,10 +120,14 @@ export default {
         }
           
         if (node.subdep && node.subdep.length > 0) {
+          that.allKeys.push(node.departmentid)
           // 如果存在子节点
           for (var index = 0; index < node.subdep.length; index++) {
-          // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
-          elNode.children.push(convertToElementTree(node.subdep[index]));
+            // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+            that.allKeys.push(node.subdep[index].departmentid)
+            const res = new Map();
+            that.allKeys = that.allKeys.filter((item) => !res.has(item) && res.set(item, 1));
+            elNode.children.push(convertToElementTree(node.subdep[index]));
           }
         }
         return elNode;
@@ -165,12 +171,15 @@ export default {
       })
       this.onCheckedMenber = arr
     },
+    // 全选部门
+    setCheckedKeys() {
+      this.$refs.tree.setCheckedKeys(this.allKeys);
+    },
     // 点击部门
     nodeClick (row,node,comp) {
       this.checkAll = false
       this.clickdepid = row.departmentid
       this.menberList([row.departmentid])
-      // this.onCheckedMenber.length === this.menberData.length?this.checkAll = true:this.checkAll = false
     },
     // 勾选部门
     nodeCheck (checkedNodes,checkedKeys,halfCheckedNodes,halfCheckedKeys) {

src/components/scopeOfAuthority/modules/mar_auth.vue

@@ -33,12 +33,6 @@
         <div>
           <el-input size="small" v-model="searchValue" class="normal-margin" placeholder="搜索人员" clearable></el-input>
           <div :style="{ height: scrollHeight?scrollHeight:'400px'}"  style="overflow-y:scroll">
-            <!-- <el-checkbox-group :disabled="pageOnlyRead" v-model="checkedMenbers" @change="handleCheckedChange">
-              <div style="margin-bottom:10px" v-for="item in menberData" :key="item.index">
-                <el-checkbox v-if="searchValue" v-show="item.name === searchValue" :label="item.sa_agentsid">{{item.name}}</el-checkbox>
-                <el-checkbox v-else :label="item.sa_agentsid">{{item.name}}</el-checkbox>
-              </div>
-            </el-checkbox-group> -->
             <el-checkbox-group :disabled="pageOnlyRead" v-model="checkedMenbers" @change="handleCheckedChange">
               <div style="margin-bottom:10px" v-for="item in menberData" :key="item.index">
                 <el-checkbox v-if="searchValue" v-show="item.agentname === searchValue" :label="item.sa_agentsid">{{item.agentname}}</el-checkbox>
@@ -90,7 +84,6 @@ export default {
             "obiectId":  this.$route.query.id?this.$route.query.id:this.obiectId,
             "obiectName": this.obiectName
         },
-
       })
       // 数据格式转换成elementui-tree所需的格式
       this.responseData = res.data
@@ -119,8 +112,8 @@ export default {
         if (node.subarea && node.subarea.length > 0) {
           // 如果存在子节点
           for (var index = 0; index < node.subarea.length; index++) {
-          // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
-          elNode.children.push(convertToElementTree(node.subarea[index]));
+            // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+            elNode.children.push(convertToElementTree(node.subarea[index]));
           }
         }
         return elNode;
@@ -163,12 +156,15 @@ export default {
       })
       this.onCheckedMenber = arr
     },
+    // 全选部门
+    setCheckedKeys() {
+      this.$refs.tree.setCheckedKeys([3]);
+    },
     // 点击部门
     nodeClick (row,node,comp) {
       this.checkAll = false
       this.clickdepid = row.sa_saleareaid
       this.menberList([row.sa_saleareaid])
-      // this.onCheckedMenber.length === this.menberData.length?this.checkAll = true:this.checkAll = false
     },
     // 勾选部门
     nodeCheck (checkedNodes,checkedKeys,halfCheckedNodes,halfCheckedKeys) {
@@ -241,6 +237,10 @@ export default {
 
 </script>
 <style>
+.tree-panel{
+  max-height: 500px;
+  overflow: scroll;
+}
 .tree-panel .el-tree {
   background: none;
 }

src/components/socketMessage/index.vue

@@ -17,7 +17,8 @@
     data () {
       return {
         id:'',
-        path:"ws://121.37.152.76:8080/yos/webSocket/",
+        // path:"ws://121.37.152.76:8080/yos/webSocket/",
+        path:"wss://meida.cnyunl.com/yos/webSocket/",
         panelIsShow:false,
         list:[],
         total:0,

src/views/login/login.vue

@@ -3,8 +3,8 @@
     <div class="login-wrap">
       <div>
         <div class="logo">
-          <span>YOS后端管理平台</span><br>
-          <small>YOS-MANAGE-SYSTEM</small>
+          <span>美大营销管理平台</span><br>
+          <small>MEIDA-MANAGE-SYSTEM</small>
         </div>
         <div class="login-form">
           <h4 class="title">登录</h4>
@@ -54,8 +54,8 @@
               </el-form>
             </el-tab-pane>
           </el-tabs>
-          <el-divider><span style="color:#999;font-weight:300">其他登录方式</span></el-divider>
-          <span>敬请期待</span>
+          <!-- <el-divider><span style="color:#999;font-weight:300">其他登录方式</span></el-divider>
+          <span>敬请期待</span> -->
         </div>
       </div>
       

src/views/message/index.vue

@@ -5,10 +5,10 @@
         <div class="left">
           <div class="select">
             <div class="select_left">
-              <div @click="selectFun('系统')"
-                :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>
               <div @click="selectFun('应用')"
                 :style="currentItem==1 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">应用消息</div>
+              <div @click="selectFun('系统')"
+                :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>
             </div>
             <div class="select_right">
               <el-button @click="allRead" size="small">全部阅读</el-button>
@@ -41,12 +41,11 @@
 import list from '@/views/message/components/list'
 
 import pagination from '@/components/pagination/Pagination'
-import { log } from '@antv/g2plot/lib/utils';
 export default {
   name: '',
   data () {
     return {
-      currentItem: 0,
+      currentItem: 1,
       param: {
         "classname": "system.message.Message",
         "method": "queryMessage",

vue.config.js

@@ -11,7 +11,8 @@ module.exports = {
       port: 8080,
       proxy: {
         '/apis': {
-          target: 'http://121.37.152.76:8080',  // target host
+          // target: 'http://121.37.152.76:8080',  // target host
+          target: 'https://meida.cnyunl.com',
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites
           pathRewrite: {

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.28a2a7d5.js"></script><link href="css/app.83be7ebe.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.ff741a04.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.e32a786d.js"></script><link href="css/app.83be7ebe.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.ab7b16be.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>