Merge branch 'dev-phase1-0111' of...

Merge branch 'dev-phase1-0111' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-IM into dev-phase1-0111

* 'dev-phase1-0111' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-IM:
  test1问题修复
  test1问题修复

src/utils/utils.js

@@ -787,19 +787,19 @@ export const setOptionLabel = (self,selfModel,selfEId,selfEName,list,listEId,lis
 // 将文件大小B转为MB
 export const betaHandle = (limit) => {
     var size = "";
-    if(limit < 0.1 * 1024){                            //小于0.1KB，则转化成B
-        size = limit.toFixed(2) + "B"
-    }else if(limit < 0.1 * 1024 * 1024){            //小于0.1MB，则转化成KB
-        size = (limit/1024).toFixed(2) + "KB"
-    }else if(limit < 0.1 * 1024 * 1024 * 1024){        //小于0.1GB，则转化成MB
-        size = (limit/(1024 * 1024)).toFixed(2) + "MB"
+    if(limit < 1 * 1024){                          //小于0.1KB，则转化成B
+        size = limit.toFixed(1) + "B"
+    }else if(limit < 1 * 1024 * 1024){            //小于0.1MB，则转化成KB
+        size = (limit/1024).toFixed(1) + "KB"
+    }else if(limit < 1 * 1024 * 1024 * 1024){        //小于0.1GB，则转化成MB
+        size = (limit/(1024 * 1024)).toFixed(1) + "MB"
     }else{                                            //其他转化成GB
-        size = (limit/(1024 * 1024 * 1024)).toFixed(2) + "GB"
+        size = (limit/(1024 * 1024 * 1024)).toFixed(1) + "GB"
     }
     var sizeStr = size + "";                        //转成字符串
     var index = sizeStr.indexOf(".");                    //获取小数点处的索引
-    var dou = sizeStr.substr(index + 1 ,2)            //获取小数点后两位的值
-    if(dou == "00"){                                //判断后两位是否为00，如果是则删除00                
+    var dou = sizeStr.substr(index + 1 ,1)            //获取小数点后两位的值
+    if(dou == "0"){                                //判断后两位是否为00，如果是则删除00                
         return sizeStr.substring(0, index) + sizeStr.substr(index + 3, 2)
     }
     return size;

src/views/IM/chain-history/detail.vue

@@ -32,7 +32,7 @@
 <script>
 import BreadCrumb from "@/components/breadcrumb.vue";
 import { doUpload, getFilePath } from "@/utils/qiniu-util";
-import { openLoading, closeLoading } from "@/utils/utils";
+import { openLoading, closeLoading, betaHandle } from "@/utils/utils";
 import * as commonUtil from "@/utils/utils";
 export default {
   components: {
@@ -68,6 +68,14 @@ export default {
         this.loading = false;
         if (res.code == "000000") {
           this.detailData = res.data;
+          this.detailData.contentModelList.map((item) => {
+            if(item.type == 2) {
+              item.fileSize = betaHandle(item.fileSize);
+            }
+            if(item.info.length > 30) {
+              item.info = item.info.slice(0,30) + "..."
+            }
+          })
         }
       });
     },
@@ -85,6 +93,7 @@ export default {
   .component-content {
     padding: 24px 32px;
     background: #fff;
+    overflow: auto;
     .title {
       font-size: 14px;
       color: #000;

src/views/IM/chain-history/list.vue

@@ -131,11 +131,11 @@ export default {
     },
     handleSizeChange(value) {
         this.searchParam.pageSize = value;
-        this.handleGoSearch();
+        this.search();
     },
     handleCurrentChange(value) {
         this.searchParam.pageNo = value;
-        this.handleGoSearch();
+        this.search();
     }
   }
 };
@@ -147,6 +147,7 @@ export default {
     padding: 10px;
     background: #fff;
     // margin: 84px 20px 20px;
+    overflow: auto;
     .search-title {
       display: flex;
       flex-direction: row;

src/views/IM/chain-message/index.vue

@@ -315,6 +315,10 @@ export default {
                             this.searchParam.fileModel = {};
                             this.searchParam.contentModelList = [];
                             this.excelfileName = '';
+                            this.$message({
+                                message: '群发成功',
+                                type: 'success'
+                            });
                         }else {
                             this.$message({
                                 message: res.data.message,