Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/HManagement/archives_ad/dataAnalysis/index.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="经销商分析" name="first">
         <!-- 分享 -->
-        <!-- <share-data></share-data> -->
+        <share-data />
         <!-- 浏览数据 -->
         <read-data type="agency" />
         <!-- 下载数据 -->

src/HManagement/archives_ad/dataAnalysis/modules/adDownloadData.vue

@@ -7,7 +7,7 @@
             </div>
             <div style="flex:1;">
                 <div class="title-box">
-                    <div class="title">未下载{{ type == 'agency' ? '经销商' : '业务员' }}</div>
+                    <div class="title9">未下载{{ type == 'agency' ? '经销商' : '业务员' }}</div>
                     <exportExcel :tablecols="unDownload.tablecols" :param="unDownload.params"
                         :excelTitle="type == 'agency' ? '推广素材经销商未下载表' : '推广素材团队未下载表'" />
                 </div>
@@ -28,7 +28,7 @@
                     </el-pagination>
                 </div>
                 <div class="title-box" style="margin-top:30px">
-                    <div class="title">已下载{{ type == 'agency' ? '经销商' : '业务员' }}</div>
+                    <div class="title9">已下载{{ type == 'agency' ? '经销商' : '业务员' }}</div>
                     <exportExcel :tablecols="download.tablecols" :param="download.params"
                         :excelTitle="type == 'agency' ? '推广素材经销商已下载表' : '推广素材团队已下载表'" />
                 </div>
@@ -117,7 +117,6 @@ export default {
             };
 
             this.$api.requested(params).then(res => {
-                console.log(this.type, "下载", res)
                 if (res.msg != '成功') return this.$message.error(res.data);
                 this.download.params = params;
                 this.download.list = res.data;
@@ -138,7 +137,6 @@ export default {
                 }
             };
             this.$api.requested(params).then(res => {
-                console.log(this.type, "未下载", res)
                 if (res.msg != '成功') return this.$message.error(res.data);
                 this.unDownload.params = params;
                 this.unDownload.list = res.data;

src/HManagement/archives_ad/dataAnalysis/modules/adReadData.vue

@@ -8,7 +8,7 @@
 
             <div style="flex:1;">
                 <div class="title-box">
-                    <div class="title">未浏览{{ type == 'agency' ? '经销商' : '业务员' }}</div>
+                    <div class="title9">未浏览{{ type == 'agency' ? '经销商' : '业务员' }}</div>
                     <exportExcel :tablecols="unReadData.tablecols" :param="unReadData.params"
                         :excelTitle="type == 'agency' ? '推广素材经销商未浏览表' : '推广素材团队未浏览表'" />
                 </div>
@@ -30,7 +30,7 @@
                 </div>
 
                 <div class="title-box" style="margin-top:30px">
-                    <div class="title">已浏览{{ type == 'agency' ? '经销商' : '业务员' }}</div>
+                    <div class="title9">已浏览{{ type == 'agency' ? '经销商' : '业务员' }}</div>
                     <exportExcel :tablecols="readData.tablecols" :param="readData.params"
                         :excelTitle="type == 'agency' ? '推广素材经销商已浏览表' : '推广素材团队已浏览表'" />
                 </div>
@@ -97,7 +97,6 @@ export default {
                 }
             };
             this.$api.requested(params).then(res => {
-                console.log(this.type, "read", res)
                 if (res.msg != '成功') return this.$message.error(res.data);
                 this.readData.params = params;
                 this.readData.list = res.data;
@@ -118,8 +117,6 @@ export default {
                 }
             };
             this.$api.requested(params).then(res => {
-                console.log(this.type, "unread", res)
-
                 if (res.msg != '成功') return this.$message.error(res.data);
                 this.unReadData.params = params;
                 this.unReadData.list = res.data;
@@ -145,7 +142,7 @@ export default {
                 angleField: 'value',
                 colorField: 'type',
                 radius: 0.75,
-                color: ['#FBB33B','#F77655'],
+                color: ['#FBB33B', '#F77655'],
                 legend: {
                     position: 'leftTop'
                 },
@@ -178,9 +175,10 @@ export default {
         }).then(res => {
             if (res.msg != '成功') return this.$message.error(res.data);
             const data = [
-                { type: '未浏览', value: res.data.unreadNum },
+                { type: '未浏览', value: res.data.unReadNum },
                 { type: '已浏览', value: res.data.readNum },
             ];
+
             this.renderer(data);
         })
     }

src/HManagement/archives_ad/dataAnalysis/modules/adShareData.vue

@@ -4,43 +4,95 @@
         <div class="chart">
             <div class="box">
                 <div class="title-box">
-                    <div class="title">分享次数</div>
-                    <el-radio-group v-model="tabPosition" style="margin-right:33px;" size="small">
-                        <el-radio-button label="year">年</el-radio-button>
-                        <el-radio-button label="month">月</el-radio-button>
-                        <el-radio-button label="day">日</el-radio-button>
+                    <div class="title9">分享次数</div>
+                    <el-radio-group v-model="tabPosition" style="margin-right:33px;" size="small"
+                        @change="getLineChartOfShare">
+                        <el-radio-button label="1">年</el-radio-button>
+                        <el-radio-button label="2">月</el-radio-button>
+                        <el-radio-button label="3">日</el-radio-button>
                     </el-radio-group>
                 </div>
                 <div id="container" style="width: calc(100% - 33px); height: 374px; margin-top: 40px;"></div>
             </div>
             <div class="box">
                 <div class="title-box">
-                    <div class="title">分享渠道</div>
+                    <div class="title9">分享渠道</div>
                 </div>
                 <div id="pie" style="width: calc(100% - 33px); height: 374px; margin-top: 40px;"></div>
             </div>
         </div>
+        <div class="title-box">
+            <div class="title9">分享数据</div>
+            <exportExcel :tablecols="tablecols" :param="params" excelTitle="推广素材经销商分享数据表" />
+        </div>
+        <tableLayout style="margin-top:16px" :layout="tablecols" :data="tableList" :custom="true">
+            <template v-slot:customcol="scope">
+                <p v-if="scope.column.columnname == 'region'">
+                    {{ scope.column.data['province'] }}{{ scope.column.data['city'] }}{{ scope.column.data['county'] }}
+                </p>
+                <p v-else-if="scope.column.columnname == 'operate'" style="color:#3874F6;">查看分享名单</p>
+                <p v-else>{{ scope.column.data[scope.column.columnname] }}</p>
+            </template>
+        </tableLayout>
+        <div style="margin-top:16px;text-align:right">
+            <el-pagination background small @current-change="handlCurrentChange" :current-page="params.pageNumber"
+                :page-size="params.pageSize" layout="total, prev, pager, next, jumper" :total="total">
+            </el-pagination>
+        </div>
     </div>
 </template>
 <script>
 import { Line, Pie } from '@antv/g2plot';
+import exportExcel from "@/components/export_excel";
+
 export default {
     name: "adShareData",
+    components: { exportExcel },
     data() {
         return {
-            tabPosition: "year",
+            tabPosition: 1,//年月日
+            params: {
+                "classname": "webmanage.saletool.sharematerial.statistics.share",
+                "method": "getShareData",
+                "content": {
+                    "sat_sharematerialid": this.$route.query.id,
+                    "isAll": true,
+                    "pageNumber": 1,
+                    "pageSize": 10
+                }
+            },
+            tableList: [],
+            total: 0
         }
     },
+    created() {
+        this.tablecols = this.tool.tabelCol('archives_adlist')[`shareDataTable`].tablecols;
+    },
     mounted() {
         /* 折线图 */
-        fetch('https://gw.alipayobjects.com/os/bmw-prod/1d565782-dde4-4bb6-8946-ea6a38ccf184.json')
-            .then((res) => res.json())
-            .then((data) => {
+        this.getLineChartOfShare();
+        /* 饼状图 */
+        this.getChannel();
+        /* 表格 */
+        this.getShareData();
+    },
+    methods: {
+        getLineChartOfShare() {
+            this.$api.requested({
+                "classname": "webmanage.saletool.sharematerial.statistics.share",
+                "method": "getLineChartOfShare",
+                "content": {
+                    "sat_sharematerialid": this.$route.query.id,
+                    "date": (new Date()).toLocaleDateString(),
+                    "type": this.tabPosition
+                }
+            }).then(res => {
+                document.getElementById('container').innerHTML = ''
                 const line = new Line('container', {
-                    data,
+                    data: res.data,
                     padding: '0',
-                    xField: 'Date',
-                    yField: 'scales',
+                    xField: 'time',
+                    yField: 'sharecount',
                     xAxis: {
                         // type: 'timeCat',
                         tickCount: 12,
@@ -50,32 +102,51 @@ export default {
                     }
                 });
                 line.render();
-            });
-
-        /* 饼状图 */
-        const data = [
-            { type: '分类一', value: 27 },
-            { type: '分类二', value: 25 },
-        ];
-
-        const piePlot = new Pie('pie', {
-            appendPadding: 10,
-            data,
-            angleField: 'value',
-            colorField: 'type',
-            radius: 0.75,
-            legend: {
-                position: 'leftTop'
-            },
-            label: {
-                type: 'spider',
-                labelHeight: 28,
-                content: '{name}\n{percentage}',
-            },
-            interactions: [{ type: 'element-selected' }, { type: 'element-active' }],
-        });
+            })
+        },
+        getChannel() {
+            this.$api.requested({
+                "classname": "webmanage.saletool.sharematerial.statistics.share",
+                "method": "getChannel",
+                "content": {
+                    "sat_sharematerialid": this.$route.query.id
+                }
+            }).then(res => {
+                const piePlot = new Pie('pie', {
+                    appendPadding: 10,
+                    data: res.data,
+                    angleField: 'sharecount',
+                    colorField: 'channel',
+                    radius: 0.75,
+                    color: ['#E263CD', '#F77655'],
+                    legend: {
+                        position: 'leftTop'
+                    },
+                    label: {
+                        type: 'spider',
+                        labelHeight: 28,
+                        content: '{name}\n{percentage}',
+                    },
+                    interactions: [{ type: 'element-selected' }, { type: 'element-active' }],
+                });
 
-        piePlot.render();
+                piePlot.render();
+            })
+        },
+        getShareData() {
+            let params = JSON.parse(JSON.stringify(this.params));
+            params.content.isAll = false;
+            console.log(this.params.content.isAll)
+            this.$api.requested(params).then(res => {
+                console.log("sdsdsds", res)
+                this.tableList = res.data
+                this.total = res.total
+            })
+        },
+        handlCurrentChange(index) {
+            this.params.pageNumber = index;
+            this.getShareData();
+        },
     }
 }
 </script>

src/HManagement/archives_ad/dataAnalysis/modules/public.css

@@ -20,7 +20,6 @@ header {
     display: flex;
 }
 
-
 .chart-box {
     display: flex;
     align-content: center;
@@ -38,7 +37,7 @@ header {
     box-sizing: border-box;
 }
 
-.title {
+.title9 {
     position: relative;
     font-size: 14px;
     font-family: PingFang SC-Bold, PingFang SC;
@@ -47,7 +46,7 @@ header {
     padding-left: 11px;
 }
 
-.title::after {
+.title9::after {
     position: absolute;
     content: '';
     display: block;

src/HManagement/archvies_mag/modules/add.vue

@@ -36,7 +36,7 @@ export default {
         "method": "createFolder",
         "content": {
           "foldername": "文件夹名称",
-          "parentid":  ''
+          "parentid": JSON.parse(sessionStorage.getItem('folderid')).salematerialfolderid,
         }
       }
     }

src/HManagement/clueManage/clue_rule/modules/select_agent.vue

@@ -3,7 +3,10 @@
     <el-dialog title="添加经销商" :visible.sync="dialogTableVisible" width="800px">
       <tablelayout :layout="tablecols" :data="list" :custom="true" :checkbox="true" height="calc(100vh - 452px)" @checkboxCallBack="checkboxCallBack">
         <template v-slot:customcol="scope">
-          <p>{{scope.column.data[scope.column.columnname]}}</p>
+          <div v-if="scope.column.columnname === 'province'">
+            <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
       </tablelayout>
       <div style="margin-top:16px;text-align:right">

src/HManagement/clueManage/clue_rule/modules/setAgent.vue

@@ -11,7 +11,10 @@
     </div>
     <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 452px)">
       <template v-slot:customcol="scope">
-        <p>{{scope.column.data[scope.column.columnname]}}</p>
+        <div v-if="scope.column.columnname === 'province'">
+          <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
         <slot name="del" :data="scope"></slot>

src/HManagement/department/staff/detail/modules/main.vue

@@ -35,7 +35,7 @@
               <slot name="linkact" :data="mainInfo"></slot>
             </div>
           </div>
-          <el-descriptions-item label="头像"><img width="40" style="margin-top:-8px" src="../../../../../assets/avatar.png" alt=""></el-descriptions-item>
+          <!-- <el-descriptions-item label="头像"><img width="40" style="margin-top:-8px" src="../../../../../assets/avatar.png" alt=""></el-descriptions-item> -->
           <el-descriptions-item label="账号名称">{{mainInfo.username?mainInfo.username:'--'}}</el-descriptions-item>
           <el-descriptions-item label="账号类型">{{mainInfo.usertypename?mainInfo.usertypename:'--'}}</el-descriptions-item>
           <el-descriptions-item label="角色">{{mainInfo.userrole?(mainInfo.userrole).toString():''}}</el-descriptions-item>

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

@@ -1,6 +1,7 @@
 <template>
   <div class="container normal-panel">
     <!-- 表格 -->
+    <excel class="normal-margin" :tablecols="tablecols" :param="params" excelTitle="提报明细"></excel>
     <tableLayout :layout="tablecols" :data="list" :custom="false" height="calc(100vh - 131px)">
       <template v-slot:customcol="scope">
         <p>{{scope.column.data[scope.column.columnname]}}</p>
@@ -40,13 +41,25 @@
 </template>
 
 <script>
+import excel from '@/components/export_excel/index.vue'
+
 export default {
+  components:{
+    excel
+  },
   data () {
     return {
       dialogTableVisible:false,
       list:[],
       tablecols:[],
-      attinfos:[]
+      attinfos:[],
+      params:{
+        "classname": "webmanage.saletool.submitedit.submitedit",
+        "method": "selectSubmitDetailList",
+        "content": {
+          "sat_submiteditmodelid": this.$route.query.id
+        }
+      }
     }
   },
   methods:{

src/components/layout/index.vue

@@ -19,11 +19,11 @@
           <p>{{item.systemmodulename}}</p>
         </div>
       </div>
-      <div class="nav-bottom-item">
+      <!-- <div class="nav-bottom-item">
         <div class="item">
            <img width="30" src="../../assets/nav_icon/more.svg" alt="">
         </div>
-      </div>
+      </div> -->
     </div>
     <el-container>
       <socket-message></socket-message>
@@ -105,7 +105,13 @@ export default {
         }
       })
       this.$store.dispatch('setUsershortcuts')
-      this.$router.go(-1)
+      
+      // 若当前删除模块为激活红的模块则返回首页
+      let systemmodulename = JSON.parse(sessionStorage.getItem('active_modules')).systemmodulename
+      if (item.systemmodulename === systemmodulename) {
+        this.$router.replace({path:'/home'})
+      }
+      
     }
   },
   created () {
@@ -146,6 +152,11 @@ export default {
   background: #f1f2f3;
   overflow: hidden;
 }
+.nav-top-item{
+  overflow-y: scroll;
+  
+}
+
 .item{
   position: relative;
   width: 40px;

src/components/layout/modules/header.vue

@@ -5,7 +5,7 @@
     <el-dropdown>
       <span class="el-dropdown-link">
         <div class="flex">
-          <img height="30" src="../../../assets/avatar.png" alt="">&emsp;{{siteinfo.enterprisename}}<i class="el-icon-arrow-down el-icon--right"></i>
+          {{siteinfo.enterprisename}}<i class="el-icon-arrow-down el-icon--right"></i>
         </div>
       </span>
       <el-dropdown-menu slot="dropdown">

src/components/selectMenber/modules/dep_list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="tree-panel">
-    <el-tree
+    <!-- <el-tree
       ref="cusTreeRef"
       :data="deplist"
       node-key="departmentid"
@@ -18,6 +18,23 @@
           <slot name="operation" :data="data"></slot>
         </span>
       </span>
+    </el-tree> -->
+    <el-tree
+      :data="deplist"
+      show-checkbox
+      highlight-current
+      default-expand-all
+      :check-strictly="true"
+      :default-checked-keys="dep_default"
+      :expand-on-click-node="false"
+      @check="handleCheck"
+      @check-change="handleCheckChange">
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <span>{{ node.label }}</span>
+        <span>
+          <slot name="operation" :data="data"></slot>
+        </span>
+      </span>
     </el-tree>
   </div>
 </template>

src/style/style.css

@@ -17,6 +17,9 @@ input[type=number]::-webkit-outer-spin-button {
   -webkit-appearance: none;
   margin: 0;
 }
+::-webkit-scrollbar{
+  width: 0px;
+}
 ul{
   list-style:none;
 }

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/css/702.8d710704.css

@@ -1 +0,0 @@
-.el-input-group__append,.el-input-group__prepend{background-color:#4f7bfd;color:#fff;border:1px solid #4f7bfd;cursor:pointer}.search-panel p[data-v-819aa2b2]{flex:1 0 auto;width:40px;font-size:14px}.dialog-footer[data-v-070e76b2],.dialog-footer[data-v-189d68b6]{margin-top:32px;text-align:center}.role_panel{padding:10px;border:1px solid #ebe3e3;font-size:.875rem;cursor:pointer;border-radius:4px;color:#666;transition:.2s linear}.on[data-v-0096b51c]{border:1px solid #4f7bfd;background:#4f7bfd;color:#fff}.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}.borderRight[data-v-4cff6729]{border-right:1px solid #ccc}

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>

yos/index.html

@@ -1 +0,0 @@
-<!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.b1222ca2.js"></script><link href="css/app.3f7651de.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.01abcfd5.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>