From 30a8fb5a23ee4c41b365322f81773742891ed480 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 26 Apr 2023 17:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9bug=E3=80=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=95=B0=E5=A4=AA=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/common.scss                    |  4 ++++
 src/views/Report/ReportManager.vue            | 16 ++++++++++---
 src/views/Report/reportManager/labelModal.vue | 23 ++++++++++---------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss
index 3434b9c..e9fa63e 100644
--- a/src/assets/css/common.scss
+++ b/src/assets/css/common.scss
@@ -45,3 +45,7 @@
     }
   }
 }
+.el-popper  .el-cascader-menu  .el-cascader-node__label{
+  width: 160px !important;
+  overflow: hidden;
+}
diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index 18857c9..80e43ca 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -152,8 +152,8 @@
             <div class="tree">
                 <el-tree class="filter-tree" :data="treeData" default-expand-all :filter-node-method="filterNode" ref="tree">
                     <span class="custom-tree-node" slot-scope="{ node,data}">
-                        <span>{{ node.label }}</span>
-                        <span>
+                        <span   class="textover">{{ node.label }}</span>
+                        <span class="btnover">
                             <!-- <el-button type="text" @click.stop="add">新建</el-button> -->
                             <el-button type="text" v-if="data.parentId != '0'"
                                 @click.stop="update(node, data)">编辑</el-button>
@@ -1163,7 +1163,7 @@ export default {
         align-items: center;
         justify-content: space-between;
         font-size: 14px;
-
+         width: calc(100% - 32px);
     }
 }
 
@@ -1425,4 +1425,14 @@ export default {
 .deleRed{
   color: red !important;
 }
+.btnover{
+  display: inline-block;
+  width: 68px;
+}
+.textover{
+  display: inline-block;
+  width: calc(100% - 120px);
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>
diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
index 5a3057c..7b2e1ae 100644
--- a/src/views/Report/reportManager/labelModal.vue
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -2,20 +2,20 @@
     <div>
         <el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
             <div class="form">
-                <el-form ref="form" :model="form" label-width="80px" >
-                    <el-form-item label="上级标签" prop="nodeLabel" required>
+                <el-form ref="form" :model="form" label-width="80px" :show-message="false">
+                    <el-form-item label="上级标签"  required>
                         <el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable :props="{ checkStrictly: true }" clearable >
                         </el-cascader>
                     </el-form-item>
 
-                    <el-form-item label="标签名称" prop="label" required>
-                        <el-input v-model="form.label" max="100"  placeholder="请输入标签名称"></el-input>
+                    <el-form-item label="标签名称"  required>
+                        <el-input v-model="form.label" maxlength="100"  placeholder="请输入标签名称"></el-input>
                     </el-form-item>
-                    <el-form-item label="排序" prop="orderNum" required>
-                        <el-input v-model="form.orderNum" placeholder="请输入排序"></el-input>
+                    <el-form-item label="排序"  required>
+                        <el-input v-model="form.orderNum" max="100" placeholder="请输入排序"></el-input>
                     </el-form-item>
                     <el-form-item label="备注" prop="remark">
-                        <el-input v-model="form.remark" max="100" placeholder="请输入备注"></el-input>
+                        <el-input v-model="form.remark" maxlength="1000" placeholder="请输入备注"></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button @click="cancel" class="btn">取消</el-button>
@@ -51,14 +51,14 @@ export default {
                 ],
             // rule: {
             //     label: [
-            //         { required: true, trigger: 'blur', message: '请输入标签名称' }
+            //         { required: true, trigger: '' }
             //     ],
             //     nodeLabel: [
-            //         { required: true, trigger: 'change', message: '请选择上级标签' }
+            //         { required: true, trigger: '' }
             //     ],
             //     orderNum: [
-            //          { required: true, trigger: 'change', message: '请输入排序' },
-            //          { validator:checkNum , trigger: 'change'}
+            //          { required: true, trigger: '' },
+            //
             //     ],
             //
             // },
@@ -207,4 +207,5 @@ export default {
     line-height: 40px !important;
     width: 100%;
 }
+
 </style>