Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/materials/index.vue

@@ -33,6 +33,14 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="素材名称" prop="materialsName">
+        <el-input
+          v-model="queryParams.materialsName"
+          placeholder="请输入素材名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!-- <el-form-item label="素材来源" prop="materialsName">
         <el-select
           v-model="queryParams.materialsName"
@@ -117,14 +125,14 @@
             alt=""
             v-if="item.videoCoverFilePath && item.materialsFilePath"
           />
-          <div class="texttitle">{{ item.name }}</div>
+          <div class="texttitle">{{ item.materialsName }}</div>
           <div class="dataliat">
             创建人/创建时间：<span>{{ item.createBy }}</span
             >/<span>{{ item.createTime }}</span>
           </div>
           <div class="dataliat">素材来源：</div>
           <!-- <div class="dataliat">标签：暂无</div> -->
-          <div class="dataliat">
+          <div class="dataliat bq">
             标签：
 
             <span v-if="item.indications">{{ item.indications }}，</span>
@@ -156,14 +164,17 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="500px"
+      width="800px"
       append-to-body
       v-if="open"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
+      <el-form
-        <el-form-item label="素材名称" prop="materialsName">
+        ref="form"
-          <el-input v-model="form.materialsName" placeholder="请输入素材名称" />
+        :model="form"
-        </el-form-item>
+        :rules="rules"
+        label-width="110px"
+        :inline="true"
+      >
         <el-form-item label="素材类型" prop="materialsType">
           <el-radio
             v-model="form.materialsType"
@@ -178,6 +189,12 @@
             >视频</el-radio
           >
         </el-form-item>
+        <br />
+        <el-form-item label="素材名称" prop="materialsName">
+          <el-input v-model="form.materialsName" placeholder="请输入素材名称" />
+        </el-form-item>
+        <br />
+
         <el-form-item
           label="素材上传"
           prop="materialsFilePath"
@@ -215,11 +232,15 @@
 
         <el-form-item label="素材摘要" prop="materialsAbstract">
           <el-input
+            style="width: 530px"
             v-model="form.materialsAbstract"
             type="textarea"
             placeholder="请输入内容"
           />
         </el-form-item>
+        <div style="margin: 20px; font-weight: 700; font-size: 18px">
+          标签管理
+        </div>
 
         <el-form-item label="适用症状" prop="indications">
           <el-input v-model="form.indications" placeholder="请输入适用症状" />
@@ -249,7 +270,7 @@
           <el-select
             v-model="form.crowName"
             placeholder="请选择"
-            style="width: 381px"
+            style="width: 206px"
             @change="crowNamechange"
           >
             <el-option
@@ -436,7 +457,7 @@ export default {
       if (e == 'VIDEO') {
         this.form.materialsFilePath = null
         this.form.videoCoverFilePath = null
-        
+
       } else if (e == 'IMAGE_TEXT') {
         this.form.materialsFilePath = null
         this.form.videoCoverFilePath = null
@@ -642,6 +663,9 @@ export default {
   // top: -84px;
   left: 8px;
 }
+::v-deep .el-textarea__inner{
+  height: 100px;
+}
 video {
   height: 500px;
   width: 100%;
@@ -652,13 +676,15 @@ video {
   // background: #409eff;
   display: flex;
   .left {
+    overflow: auto;
+
     width: 77%;
     height: 500px;
     // background: #989992;
   }
   img {
-    height: 100%;
+    // height: 100%;
-    width: 100%;
+    // width: 100%;
   }
   .right {
     width: 20%;
@@ -691,6 +717,9 @@ video {
     // margin-bottom: 10px;
     margin: 6px;
     .texttitle {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
       font-weight: 700;
       margin: 5px 0px 5px 10px;
     }
@@ -703,6 +732,9 @@ video {
       font-size: 12px;
       color: #989992;
     }
+    .bq {
+      width: 155px;
+    }
     img {
       width: 100%;
       height: 100px;