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:
  文件类型和大小修改

src/components/breadcrumb.vue

 <template>
     <div class="bread-crumb">
         <el-breadcrumb separator="/">
-            <el-breadcrumb-item>{{curmbFirst}}</el-breadcrumb-item>
-            <el-breadcrumb-item v-if="curmbSecond" :to="{ path:  jumPathThird }">{{curmbSecond}}</el-breadcrumb-item>
+            <el-breadcrumb-item :to="{ path:  jumPathThird }">{{curmbFirst}}</el-breadcrumb-item>
+            <el-breadcrumb-item v-if="curmbSecond">{{curmbSecond}}</el-breadcrumb-item>
             <el-breadcrumb-item v-if="curmbThird">{{curmbThird}}</el-breadcrumb-item>
         </el-breadcrumb>
     </div>

src/router/router.js

@@ -26,9 +26,6 @@ export default [{
         {
             path: '',
             redirect: '/waiting-session-list'
-        }, {
-            path: '/home',
-            component: waitingSessionList
         }, {
             path: '/waiting-session-list',
             component: waitingSessionList

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

@@ -20,16 +20,20 @@
       </el-row>
       <el-table :data="tableData" style="width: 100%" v-loading="loading">
         <el-table-column prop="id" label="任务ID" min-width="50" align="center"></el-table-column>
-        <el-table-column prop="subject" label="任务名" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="title" label="任务名" min-width="100" align="center"></el-table-column>
         <el-table-column prop="totalNumber" label="群发人数" min-width="50" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="发送日期" min-width="100" align="center"></el-table-column>
+        <el-table-column label="发送日期" min-width="100" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.createdTime | dateFilter}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="createdName" label="发送者" min-width="50" align="center"></el-table-column>
         <el-table-column label="发送状态" min-width="50" align="center">
           <template slot-scope="scope">
             <span>{{scope.row.status | statusFilter}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" min-width="100">
+        <el-table-column label="任务详情" fixed="right" align="center" min-width="100">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="edit(scope.row)">查看</el-button>
           </template>
@@ -81,6 +85,9 @@ export default {
   },
   computed: {},
   filters: {
+    dateFilter(val) {
+      return new Date(val).format("yyyy-MM-dd")
+    },
     statusFilter(index) {
       let str = "";
       if (index == 1 || index == 0) {

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

@@ -29,7 +29,16 @@
             <div class="content-container" v-for="(item, index) in searchParam.contentModelList" :key="index">
                 <div class="text-content" v-if="item.type === 0">
                     <p>文本信息<i class="el-icon-error" @click="deleteText(item,index)"></i></p>
-                    <el-input type="textarea" clearable v-model="item.info" size="mini" placeholder="请输入文本信息" style="width: 300px;"></el-input>
+                    <el-input 
+                    :autosize="{ minRows: 4 }"
+                    type="textarea" 
+                    clearable 
+                    v-model="item.info" 
+                    size="mini"
+                    maxlength="499"
+                    show-word-limit 
+                    placeholder="请输入文本信息" 
+                    style="width: 300px;"></el-input>
                 </div>
                 <div class="file-content" v-if="item.type == 1">
                     <p>文件信息<i class="el-icon-error" @click="deleteFile(item,index)"></i></p>
@@ -37,6 +46,7 @@
                     <el-upload
                         class="upload-demo"
                         action="#"
+                        accept="image/jpeg,image/jpg,image/png,application/pdf"
                         :before-upload="uploadImportFile">
                         <el-button type="default" size="mini" @click="getFileIndex(index)">
                             <img src="../../../assets/image/IM/upload.png"/>
@@ -174,29 +184,27 @@ export default {
         uploadImportFile(file) {
             let _this = this;
             let FileExt = file.name.replace(/.+\./, "");
-            if (["pdf", "png", "jpg", "jpeg"].indexOf(FileExt.toLowerCase()) === -1) {
-                _this.$message({
-                    type: "warning",
-                    message: "请上传后缀名为png、jpg、jpeg、pdf的文件！",
-                });
-                return false;
-            }else {
-                if(FileExt == 'png' || FileExt == 'jpg' || FileExt == "jpeg") {
-                    _this.searchParam.contentModelList[this.fileIndex].type = 1;  // 图片
-                    let imgFile = new FileReader();
-                    imgFile.readAsDataURL(file);
-                    imgFile.onload = function(theFile) {
-                        let image = new Image();
-                        image.src = theFile.target.result;
-                        image.onload = function() {
-                            _this.searchParam.contentModelList[this.fileIndex].width = this.width;
-                            _this.searchParam.contentModelList[this.fileIndex].height = this.height;
-                        }
+            const isLt5M = file.size / 1024 / 1024 < 6;
+            if (!isLt5M) {
+                this.$message.error('上传文件不能超过 5MB!');
+                return isLt5M
+            }
+            if(FileExt == 'png' || FileExt == 'jpg' || FileExt == "jpeg") {
+                _this.searchParam.contentModelList[this.fileIndex].type = 1;  // 图片
+                let imgFile = new FileReader();
+                imgFile.readAsDataURL(file);
+                imgFile.onload = function(theFile) {
+                    let image = new Image();
+                    image.src = theFile.target.result;
+                    image.onload = function() {
+                        _this.searchParam.contentModelList[this.fileIndex].width = this.width;
+                        _this.searchParam.contentModelList[this.fileIndex].height = this.height;
                     }
-                }else if(FileExt == 'pdf') {
-                    _this.searchParam.contentModelList[this.fileIndex].type = 2; // pdf
                 }
+            }else if(FileExt == 'pdf') {
+                _this.searchParam.contentModelList[this.fileIndex].type = 2; // pdf
             }
+            
              _this.searchParam.contentModelList[this.fileIndex].fileSize = file.size;
             doUpload(_this, file, getFilePath(file,null), 'preview4', 'progress1', 1).then( path => {
                 _this.searchParam.contentModelList[this.fileIndex].url = path.fullPath;

src/views/IM/search-message/detail.vue

 
 <template>
   <div class="search-msg-detail">
-    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :jumPathThird="jumPathThird"></bread-crumb>
     <div ref="msg-container" class="detail-content screenSet" id="screenSet">		
 		<div class="msg-container" v-for="(item, index) in detailData" :key="index">
 			<div class="msg-item-img">
@@ -52,6 +52,7 @@ export default {
   },
   data() {
 		return {
+			jumPathThird: '/search-message-list',
 			curmbFirst:'消息查询',
 			curmbSecond:'消息详情',
 			picakfAccId: '',

src/views/IM/search-message/list.vue

@@ -143,11 +143,11 @@ export default {
 
     handleSizeChange(value) {
         this.searchParam.pageSize = value;
-        this.handleGoSearch();
+        this.searchMessage();
     },
     handleCurrentChange(value) {
         this.searchParam.pageNo = value;
-        this.handleGoSearch();
+        this.searchMessage();
     }
   }
 };

src/views/layout/slidebar.vue

@@ -82,12 +82,12 @@ export default {
             title: "消息查询"
           },{
             icon: 'el-icon-setting',
-            index: "chain-history-list",
+            index: "chain-message",
             subs: [],
             title: "我要群发"
           },{
             icon: 'el-icon-setting',
-            index: "chain-message",
+            index: "chain-history-list",
             subs: [],
             title: "历史群发"
           }];