解决冲突

src/components/organization/index.vue

@@ -14,16 +14,12 @@
         <div class="dptBox" v-show="active == 0">
           <el-scrollbar style="height: 100%">
             <el-tree :data="data" :check-strictly="true" show-checkbox @node-click="nodeClick" @check-change="currentChange" :props="defaultProps" default-expand-all :default-checked-keys="checkedKeys" :expand-on-click-node="false" :node-key="nodekey" ref="tree" highlight-current>
-              <template v-if="orgType == 'org'">
-                <span slot-scope="{ data }" :title="data.OrganName" class="org-data-tree-node">
-                  {{ data.OrganName }}
-                </span>
-              </template>
-              <template v-else>
-                <span slot-scope="{ data }" :title="data.AuthName" class="org-data-tree-node">
-                  {{ data.AuthName }}
-                </span>
-              </template>
+              <span v-if="orgType == 'org'" slot-scope="{ data }" :title="data.OrganName" class="org-data-tree-node">
+                {{ data.OrganName }}
+              </span>
+              <span v-else slot-scope="{ data }" :title="data.AuthName" class="org-data-tree-node">
+                {{ data.AuthName }}
+              </span>
             </el-tree>
           </el-scrollbar>
         </div>
@@ -198,7 +194,7 @@ export default {
   height: 100%;
   .org-data-tree-node {
     font-size: 14px;
-    max-width: 12vw;
+    max-width: 10vw;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;

src/components/usergrouptree/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-02-09 15:47:09
- * @LastEditTime: 2022-02-18 16:50:48
+ * @LastEditTime: 2022-02-18 19:59:34
  * @LastEditors: your name
  * @Description: 用户组树
  * @FilePath: \Foshan4A4.0\src\components\usergrouptree\index.vue
@@ -136,6 +136,7 @@ export default {
   ::v-deep .content {
     .custom-tree-node {
       margin-left: 10px;
+      font-size: 14px;
     }
   }
   ::v-deep .radioBg {