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

src/views/manage/materials/index.vue

@@ -427,8 +427,6 @@ export default {
     handleClick(e) {
       this.queryParams.materialsType = e.name
       this.getList()
-      // this.type
-      console.log(e.name);
     },
     // 素材类型
     radioChange(e) {
@@ -455,7 +453,6 @@ export default {
 
     // 视频封面
     imgUrl3(imgUrl) {
-      console.log(this.form.videoCoverFilePath)
       this.form.videoCoverFilePath = imgUrl;
 
 
@@ -468,15 +465,10 @@ export default {
       }else{
       this.multiple = true
       }
-     
-      console.log(this.ids)
-      // console.log(item)
-      // console.log(e)
 
     },
     // 预览
     viewshow(item) {
-      console.log(item)
       this.openview = true
       this.viewform = item
 
@@ -489,12 +481,9 @@ export default {
     },
     // 人群点击事件
     crowNamechange(e){
-      this.form.crowdName=this.optionscrowName.find(f=>f.id==e).crowdName
+      this.form.crowName=this.optionscrowName.find(f=>f.id==e).crowdName
       this.form.crowdId=e
-      // this.form.suitTaskTypeName=this.type.find(f=> f.dictCode==e).dictLabel
 
-      console.log(e)
-      console.log(this.form.crowdName)
     
     },
     /** 查询素材信息列表 */
@@ -577,7 +566,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      console.log(this.form)
       this.open = true;
       this.getcrowdInfo()
       this.title = "添加素材信息";
@@ -617,8 +605,6 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.getList();
-
-      console.log(this.ids)
       if(this.ids.length==0){
         this.$modal.msgError("请先选择一条数据");
       }else{

src/views/manage/servicepackage/index.vue

@@ -360,7 +360,7 @@
         <el-form-item label="硬件类型" prop="hardwareType">
           <el-select
             v-model="form.hardwareType"
-            placeholder="请选择"
+            placeholder="请选择硬件类型"
             style="width: 204px"
           >
             <el-option

src/views/system/partition/index.vue

@@ -126,6 +126,8 @@
         label="任务细分备注"
         align="center"
         prop="taskPartitionRemark"
+        :show-overflow-tooltip="true"
+
       />
       <el-table-column
         label="操作"
@@ -192,12 +194,7 @@
           />
         </el-form-item>
 
-        <el-form-item label="二级分类描述" prop="secondClassifyDescribe">
+   
-          <el-input
-            v-model="form.secondClassifyDescribe"
-            placeholder="请输入二级分类描述"
-          />
-        </el-form-item>
         <el-form-item label="执行时间" prop="executionTime">
           <el-time-select
             style="width: 350px"
@@ -225,6 +222,13 @@
             placeholder="请输入任务细分备注"
           />
         </el-form-item>
+        <el-form-item label="二级分类描述" prop="secondClassifyDescribe">
+          <el-input
+          type="textarea"
+            v-model="form.secondClassifyDescribe"
+            placeholder="请输入二级分类描述"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/system/taskType/index.vue

@@ -91,7 +91,7 @@
       <el-table-column label="任务类型名称" align="center" prop="taskTypeName" />
       <el-table-column label="任务类型编码" align="center" prop="taskTypeCode" />
       <el-table-column label="任务类型排序" align="center" prop="taskTypeSort" />
-      <el-table-column label="任务类型备注" align="center" prop="taskTypeRemark" />
+      <el-table-column label="任务类型备注" align="center" prop="taskTypeRemark" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button