Merge branch 'busi-timeout' into 'master'

Busi timeout

See merge request spfm-group/spfm-market-front!20

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%',
           }
         ],

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>
@@ -40,7 +40,7 @@
                    :modal-append-to-body="false" :close-on-click-modal="true" :before-close="closedia">
             <div v-loading="loadinged">
                 <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%',
           }
         ],