ソースを参照

Merge branch 'file-share' into 'test-new'

部门共享文件优化

See merge request spfm-group/spfm-market-front!27
韩兵 3 年 前
コミット
b3b1244119

+ 27 - 5
src/components/upload.vue

@@ -16,7 +16,7 @@
 </template>
 <script>
     export default {
-        props: ['fileInfo', 'fileList'],
+        props: ['fileInfo', 'fileList','type'],
         data() {
             return {
                 fileLists: [],
@@ -121,10 +121,32 @@
                     if (this.fileInfo.type === 'btn') {
                         this.$refs['upload'].clearFiles();
                         this.$emit('uploadBack',res)
-                        _this.$message({
-                            message: res.data.desc,
-                            type: 'success'
-                        });
+                        if(res.data.result==0){
+                            _this.$message({
+                                message: res.data.desc,
+                                type: 'success'
+                            });
+                        }else if(res.data.result==1){
+                            _this.$message({
+                                message: res.data.desc,
+                                type: 'error'
+                            });
+                        }else if(res.data.result==2){
+                            _this.$message({
+                                message: res.data.desc,
+                                type: 'warning'
+                            });
+                        }else if(res.data.result==3){
+                            _this.$message({
+                                message: res.data.desc,
+                                type: 'info'
+                            });
+                        }else{
+                            _this.$message({
+                                message: res.data.desc,
+                                type: 'success'
+                            });
+                        }
                         this.num--;
                         if (this.num == 0) {
                             this.loading = false;

+ 18 - 18
src/pages/main/busitime/busiTime.vue

@@ -14,40 +14,40 @@
             </div>
             <div class="tabbox">
 
-                    <el-table height="calc(100% - 40px)" v-loading="loading" class="com-table" ref="multipleTable"
+                    <el-table height="100%" v-loading="loading" class="com-table" ref="multipleTable"
                               :data="tableData" tooltip-effect="dark" size="small" border style="width: 100%">
                     <el-table-column prop="region" fixed label="地市"> </el-table-column>
                     <el-table-column align="center" label="业务办理平均时长(秒)-自有渠道">
-                        <el-table-column prop="zyYxhdbl" label="营销活动办理"></el-table-column>
+                        <el-table-column prop="zyYxhdbl" label="营销活动办理" width="100px"></el-table-column>
                         <el-table-column prop="zyZfbg" label="资费变更"></el-table-column>
                         <el-table-column prop="zyPtjf" label="普通缴费"></el-table-column>
                         <el-table-column prop="zyKh" label="开户"></el-table-column>
                         <el-table-column prop="zyBk" label="补卡"></el-table-column>
-                        <el-table-column prop="zyYxhdqx" label="营销活动取消"></el-table-column>
-                        <el-table-column prop="zyZnzwjz" label="智能组网加装业务受理"></el-table-column>
-                        <el-table-column prop="zyXhzwkh" label="携号转网开户"></el-table-column>
-                        <el-table-column prop="zyJtcygl" label="家庭成员管理"></el-table-column>
+                        <el-table-column prop="zyYxhdqx" label="营销活动取消" width="100px"></el-table-column>
+                        <el-table-column prop="zyZnzwjz" label="智能组网加装业务受理" width="150px"></el-table-column>
+                        <el-table-column prop="zyXhzwkh" label="携号转网开户" width="100px"></el-table-column>
+                        <el-table-column prop="zyJtcygl" label="家庭成员管理" width="100px"></el-table-column>
                         <el-table-column prop="zyGh" label="过户"></el-table-column>
-                        <el-table-column prop="zyYhmmgq" label="用户密码修改"></el-table-column>
+                        <el-table-column prop="zyYhmmgq" label="用户密码修改" width="100px"></el-table-column>
                         <el-table-column prop="zyXh" label="销户"></el-table-column>
-                        <el-table-column prop="zyLlgx" label="流量共享业务"></el-table-column>
-                        <el-table-column prop="zyRhkd" label="融合宽带业务"></el-table-column>
+                        <el-table-column prop="zyLlgx" label="流量共享业务" width="100px"></el-table-column>
+                        <el-table-column prop="zyRhkd" label="融合宽带业务" width="100px"></el-table-column>
                     </el-table-column>
                     <el-table-column align="center" label="业务办理平均时长(秒)-社会渠道">
-                        <el-table-column prop="shYxhdbl" label="营销活动办理"></el-table-column>
+                        <el-table-column prop="shYxhdbl" label="营销活动办理" width="100px"></el-table-column>
                         <el-table-column prop="shZfbg" label="资费变更"></el-table-column>
                         <el-table-column prop="shPtjf" label="普通缴费"></el-table-column>
                         <el-table-column prop="shKh" label="开户"></el-table-column>
                         <el-table-column prop="shBk" label="补卡"></el-table-column>
-                        <el-table-column prop="shYxhdqx" label="营销活动取消"></el-table-column>
-                        <el-table-column prop="shZnzwjz" label="智能组网加装业务受理"></el-table-column>
-                        <el-table-column prop="shXhzwkh" label="携号转网开户"></el-table-column>
-                        <el-table-column prop="shJtcygl" label="家庭成员管理"></el-table-column>
+                        <el-table-column prop="shYxhdqx" label="营销活动取消" width="100px"></el-table-column>
+                        <el-table-column prop="shZnzwjz" label="智能组网加装业务受理" width="150px"></el-table-column>
+                        <el-table-column prop="shXhzwkh" label="携号转网开户" width="100px"></el-table-column>
+                        <el-table-column prop="shJtcygl" label="家庭成员管理" width="100px"></el-table-column>
                         <el-table-column prop="shGh" label="过户"></el-table-column>
-                        <el-table-column prop="shYhmmgq" label="用户密码修改"></el-table-column>
+                        <el-table-column prop="shYhmmgq" label="用户密码修改" width="100px"></el-table-column>
                         <el-table-column prop="shXh" label="销户"></el-table-column>
-                        <el-table-column prop="shLlgx" label="流量共享业务"></el-table-column>
-                        <el-table-column prop="shRhkd" label="融合宽带业务"></el-table-column>
+                        <el-table-column prop="shLlgx" label="流量共享业务" width="100px"></el-table-column>
+                        <el-table-column prop="shRhkd" label="融合宽带业务" width="100px"></el-table-column>
                     </el-table-column>
                 </el-table>
 
@@ -80,7 +80,7 @@ export default {
           {
               type: 'date',
               tit: '数据时间',
-              value: new Date(),
+              value: new Date(new Date()-24*60*60*1000),
               width: '100%',
           }
         ],

+ 27 - 27
src/pages/main/busitime/busiTimeout.vue

@@ -16,14 +16,14 @@
                 <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
             </div>
             <div class="tabbox">
-                <el-table height="calc(100% - 40px)" v-loading="loading" class="com-table" ref="multipleTable"
+                <el-table height="100%" v-loading="loading" class="com-table" ref="multipleTable"
                           :data="tableData" tooltip-effect="dark" size="small" border style="width: 100%">
-                    <el-table-column prop="region" fixed label="地市"> </el-table-column>
+                    <el-table-column prop="region" label="地市"> </el-table-column>
                     <el-table-column prop="channelType" label="渠道类型"></el-table-column>
                     <el-table-column prop="opName" label="业务类型"></el-table-column>
                     <el-table-column prop="normalTime" label="标准用时(秒)"></el-table-column>
-                    <el-table-column prop="busiTimeoutTime" label="异常业务平均用时(秒)"></el-table-column>
-                    <el-table-column prop="busiTimeoutPercentage" label="异常用时超出比例"></el-table-column>
+                    <el-table-column prop="busiTimeoutTime" label="异常业务平均用时(秒)" width="160px"></el-table-column>
+                    <el-table-column prop="busiTimeoutPercentage" label="异常用时超出比例" width="140px"></el-table-column>
                     <el-table-column prop="busiTotal" label="总业务笔数"></el-table-column>
                     <el-table-column prop="timeoutTotal" label="超时业务笔数"></el-table-column>
                     <el-table-column prop="timeoutPercentage" label="超时业务量占比"></el-table-column>
@@ -37,10 +37,10 @@
             </div>
         </fullscreen>
         <el-dialog title="异常数据监控(超时业务笔数达到或超过10%)" :visible.sync="dialogStatus" width="50%" :destroy-on-close="true"
-                   :modal-append-to-body="false" :close-on-click-modal="true" :before-close="closedia">
-            <div v-loading="loadinged">
+                   :modal-append-to-body="false" :close-on-click-modal="true" >
+            <div>
                 <el-table
-                    height="calc(90%)"
+                    height="400px"
                     v-loading="loadingDialog"
                     class="com-table"
                     ref="multipleTable"
@@ -54,13 +54,13 @@
                 >
                     <el-table-column prop="region" fixed label="地市"> </el-table-column>
                     <el-table-column prop="channelType" label="渠道类型"></el-table-column>
-                    <el-table-column prop="opName" label="业务类型"></el-table-column>
-                    <el-table-column prop="shop" label="网点"></el-table-column>
+                    <el-table-column prop="opName" label="业务类型" width="180px"></el-table-column>
+                    <el-table-column prop="shop" label="网点" width="200px"></el-table-column>
                     <el-table-column prop="channelCode" label="渠道编码"></el-table-column>
                     <!-- <el-table-column prop="busiType" label="业务类型"></el-table-column> -->
                     <el-table-column prop="normalTime" label="标准用时"></el-table-column>
-                    <el-table-column prop="timeoutTotal" label="超时业务笔数"></el-table-column>
-                    <el-table-column prop="aveTime" label="平均实际用时"></el-table-column>
+                    <el-table-column prop="timeoutTotal" label="超时业务笔数" width="120px"></el-table-column>
+                    <el-table-column prop="aveTime" label="平均实际用时" width="120px"></el-table-column>
                     <el-table-column prop="timeoutFlag" label="是否超时"></el-table-column>
                 </el-table>
                 <div slot="footer" class="dialog-footer myfooter">
@@ -98,19 +98,19 @@ export default {
           value: '-',
           width: '32%',
           options: [{dataName:'全部',dataCode:'-'},
-              {dataName:'哈尔滨',dataCode:'哈尔滨'},
-              {dataName:'齐齐哈尔',dataCode:'齐齐哈尔'},
-              {dataName:'牡丹江',dataCode:'牡丹江'},
-              {dataName:'佳木斯',dataCode:'佳木斯'},
-              {dataName:'大庆',dataCode:'大庆'},
-              {dataName:'鸡西',dataCode:'鸡西'},
-              {dataName:'双鸭山',dataCode:'双鸭山'},
-              {dataName:'伊春',dataCode:'伊春'},
-              {dataName:'七台河',dataCode:'七台河'},
-              {dataName:'鹤岗',dataCode:'鹤岗'},
-              {dataName:'黑河',dataCode:'黑河'},
-              {dataName:'绥化',dataCode:'绥化'},
-              {dataName:'大兴安岭地区',dataCode:'大兴安岭地区'}],
+              {dataName:'哈尔滨',dataCode:'哈尔滨'},
+              {dataName:'齐齐哈尔',dataCode:'齐齐哈尔'},
+              {dataName:'牡丹江',dataCode:'牡丹江'},
+              {dataName:'佳木斯',dataCode:'佳木斯'},
+              {dataName:'大庆',dataCode:'大庆'},
+              {dataName:'鸡西',dataCode:'鸡西'},
+              {dataName:'双鸭山',dataCode:'双鸭山'},
+              {dataName:'伊春',dataCode:'伊春'},
+              {dataName:'七台河',dataCode:'七台河'},
+              {dataName:'鹤岗',dataCode:'鹤岗'},
+              {dataName:'黑河',dataCode:'黑河'},
+              {dataName:'绥化',dataCode:'绥化'},
+              {dataName:'大兴安岭',dataCode:'大兴安岭'}],
       },{
           type: 'sel',
           tit: '渠道类型',
@@ -142,7 +142,7 @@ export default {
           {
               type: 'date',
               tit: '数据时间',
-              value: new Date(),
+              value: new Date(new Date()-24*60*60*1000),
               width: '32%',
           }
         ],
@@ -329,11 +329,11 @@ export default {
 
   created() {
 
-      var date = new Date(this.searchList[2].value);//时间戳为10位需*1000,时间戳为13位的话不需乘1000
+      var date = new Date(this.searchList[3].value);//时间戳为10位需*1000,时间戳为13位的话不需乘1000
       var Y = date.getFullYear();
       var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
       var D = (date.getDate()+1 < 10 ? '0'+(date.getDate()) : date.getDate())
-      this.params={opTime:Y+M+D,channelType:this.searchList[1].value,opName:this.searchList[2].value}
+      this.params={opTime:Y+M+D,channelType:this.searchList[1].value}
       this.getList(this.params, this.pageSize);
 
   },

+ 4 - 4
src/pages/main/competitor/competitorInfoNew.vue

@@ -39,11 +39,11 @@
                         <div>{{tableData.preFee}} (元)</div>
                     </div>
                     <div class="box-line">
-                        <span>资费名称</span>
+                        <span>套餐名称</span>
                         <div>{{tableData.tariffName}}</div>
                     </div>
                     <div class="box-line">
-                        <span>资费内容</span>
+                        <span>套餐内容</span>
                         <div>{{tableData.taffiffContent}}</div>
                     </div>
                     <div class="box-line">
@@ -257,7 +257,7 @@ export default {
             console.log(data)
             if (v === 1) {
                 this.$http({
-                    url: "/market/cwcompetitor/writeImg",
+                    url: "/market/cwcompetitor/writeImg1",
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",
@@ -287,7 +287,7 @@ export default {
             } else {
                 data.id = this.tableData.id;
                 this.$http({
-                    url: "/market/cwcompetitor/write2Doc",
+                    url: "/market/cwcompetitor/write2Doc1",
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",

+ 102 - 1
src/pages/main/competitor/index.vue

@@ -434,7 +434,7 @@
                                     fixed="right"
                                 >
                                     <template slot-scope="scope" class="tab-btn">
-                                        <el-dropdown @command="outlineinfo">
+                                        <el-dropdown @command="outlineinfo1">
                                             <i class="el-icon-download"></i>
                                             <el-dropdown-menu slot="dropdown">
                                                 <el-dropdown-item :command="scope"
@@ -958,6 +958,107 @@ export default {
                 });
             }
         },
+        //导出
+        outlineinfo1(v) {
+            if (v.row) {
+                let data = {
+                    provinceName: v.row.provinceName,
+                    operatorName: v.row.operatorName,
+                    violationCateName: v.row.violationCateName,
+                    violationItemName: v.row.violationItemName,
+                    violationItem: v.row.violationItemName,
+                    monthFee: v.row.monthFee,
+                    tariffName: v.row.tariffName,
+                    taffiffContent: v.row.taffiffContent,
+                    remFee: v.row.remFee,
+                    preFee: v.row.preFee,
+                    saleScope: v.row.saleScope,
+                    saleChnl: v.row.saleChnl,
+                    monthSale: v.row.monthSale,
+                    violationContent: v.row.violationContent,
+                    recordRegionName: v.row.recordRegionName,
+                };
+                this.$http({
+                    url: "/market/cwcompetitor/writeImg1",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    responseType: "blob",
+                    data: data,
+                }).then((response) => {
+                    if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                        let blob = new Blob([response.data], {
+                            type: "application/vnd.ms-excel",
+                        });
+                        window.navigator.msSaveOrOpenBlob(
+                            blob,
+                            new Date().getTime() + ".png"
+                        );
+                    } else {
+                        /* 火狐谷歌的文件下载方式 */
+                        var blob = new Blob([response.data]);
+                        var downloadElement = document.createElement("a");
+                        var href = window.URL.createObjectURL(blob);
+                        downloadElement.href = href;
+                        downloadElement.download = new Date().getTime() + ".png";
+                        document.body.appendChild(downloadElement);
+                        downloadElement.click();
+                        document.body.removeChild(downloadElement);
+                        window.URL.revokeObjectURL(href);
+                    }
+                });
+            } else {
+                let data = {
+                    provinceName: v.provinceName,
+                    operatorName: v.operatorName,
+                    violationCateName: v.violationCateName,
+                    violationItemName: v.violationItemName,
+                    violationItem: v.violationItemName,
+                    monthFee: v.monthFee,
+                    tariffName: v.tariffName,
+                    taffiffContent: v.taffiffContent,
+                    remFee: v.remFee,
+                    preFee: v.preFee,
+                    saleScope: v.saleScope,
+                    saleChnl: v.saleChnl,
+                    monthSale: v.monthSale,
+                    violationContent: v.violationContent,
+                    recordRegionName: v.recordRegionName,
+                    id: v.id,
+                };
+                this.$http({
+                    url: "/market/cwcompetitor/write2Doc1",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    responseType: "blob",
+                    data: data,
+                }).then((response) => {
+                    if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                        let blob = new Blob([response.data], {
+                            type: "application/vnd.ms-excel",
+                        });
+                        window.navigator.msSaveOrOpenBlob(
+                            blob,
+                            new Date().getTime() + ".docx"
+                        );
+                    } else {
+                        /* 火狐谷歌的文件下载方式 */
+                        var blob = new Blob([response.data]);
+                        var downloadElement = document.createElement("a");
+                        var href = window.URL.createObjectURL(blob);
+                        downloadElement.href = href;
+                        downloadElement.download = new Date().getTime() + ".docx";
+                        document.body.appendChild(downloadElement);
+                        downloadElement.click();
+                        document.body.removeChild(downloadElement);
+                        window.URL.revokeObjectURL(href);
+                    }
+                });
+            }
+        },
         //导出表格---------------------------------------------------------------------------------------------------
         closeMessage(v) {
             this.centerDialogVisible = false;

+ 21 - 16
src/pages/main/cooOperation/index.vue

@@ -389,22 +389,27 @@
 					this.titname = '审批';
 					this.disableStatus = true;
 				} else if (v === 3) {
-                    this.$http({
-                        url: '/market/bpmTemp/query',
-                        method: "post",
-                        headers: {"Content-Type": "application/json",},
-                        data: {bpmType: "5"},
-                    }).then((res) => {
-                        if (res.data) {
-                            let content = JSON.parse(res.data.content);
-                            this.infolist = content.infolist;
-                            this.attList = content.attList;
-                            this.fileInfo.fileList =  content.fileList;
-                        }
-                        this.tempSave = true;
-                        this.titname = '添加';
-                        this.disableStatus = false;
-                    });
+                    // this.$http({
+                    //     url: '/market/bpmTemp/query',
+                    //     method: "post",
+                    //     headers: {"Content-Type": "application/json",},
+                    //     data: {bpmType: "5"},
+                    // }).then((res) => {
+                    //     if (res.data) {
+                    //         let content = JSON.parse(res.data.content);
+                    //         this.infolist = content.infolist;
+                    //         this.attList = content.attList;
+                    //         this.fileInfo.fileList =  content.fileList;
+                    //     }
+                    //     this.tempSave = true;
+                    //     this.titname = '添加';
+                    //     this.disableStatus = false;
+                    // });
+					//todo 查询历史数据会导致节点id为空的bug(添加失败)临时解决方案此处流程待梳理
+					this.infolist = {};
+					this.tempSave = true;
+					this.titname = '添加';
+					this.disableStatus = false;
                     return
 				}
 				this.$http({

ファイルの差分が大きいため隠しています
+ 1133 - 0
src/pages/main/file/flieList.vue


+ 2 - 0
src/plugins/element-ui.js

@@ -61,6 +61,7 @@ import {
 	Drawer,
 	Badge,
 	TimePicker,
+	Alert
 } from 'element-ui';
 Vue.use(TimePicker);
 Vue.use(Badge);
@@ -119,6 +120,7 @@ Vue.use(Carousel)
 Vue.use(Tabs)
 Vue.use(TabPane)
 Vue.use(TimeSelect)
+Vue.use(Alert)
 Vue.prototype.$confirm = MessageBox.confirm;
 Vue.prototype.$prompt = MessageBox.prompt;
 Vue.prototype.$notify = Notification;

+ 6 - 0
src/router/index.js

@@ -1093,6 +1093,12 @@ const routes = [{
             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/knowledge/knowledgeType'], resolve)
         },
         {
+            meta: { name: '附件库', keepAlive: true },
+            path: '/flieList',
+            name: 'flieList',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/file/flieList'], resolve)
+          },
+        {
             meta: { name:  '公告', keepAlive: false },
             path: '/noticec',
             name: 'noticec',

+ 1 - 1
vue.config.js

@@ -127,7 +127,7 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
-                target: "http://192.168.1.228:9600/spfm",
+                target: "http://192.168.0.66:9600",
                 changeOrigin: true,
             },
         },