From a5868e8546e43dc8be9df7f24c3a77136caee238 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 20 May 2024 18:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/desensitization.js                  |  4 +-
 .../components/ResourceScheduling.vue         | 88 +++++++++----------
 2 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/src/utils/desensitization.js b/src/utils/desensitization.js
index acc5b952d..aa619ae1a 100644
--- a/src/utils/desensitization.js
+++ b/src/utils/desensitization.js
@@ -1,6 +1,6 @@
 export default function desensitizeSubstring(inputString, start, end) {
-    if (!inputString) {
-        return ''
+    if (!inputString||inputString.length<11) {
+        return '--'
     }
     if (end >= inputString.length) {
         end = inputString.length - 1
diff --git a/src/views/dataBoard/overview/components/ResourceScheduling.vue b/src/views/dataBoard/overview/components/ResourceScheduling.vue
index 070b97bfb..f8390f357 100644
--- a/src/views/dataBoard/overview/components/ResourceScheduling.vue
+++ b/src/views/dataBoard/overview/components/ResourceScheduling.vue
@@ -1,74 +1,73 @@
 <template>
   <div>
-    <el-dialog
-        :before-close="handleClose"
-        :modal="true"
-        :modal-append-to-body="false"
-        :visible.sync="dialogVisible"
-        class="dissatisfied-detail"
-        title=""
-        width="1366px"
-    >
+    <el-dialog :before-close="handleClose" :modal="true" :modal-append-to-body="false" :visible.sync="dialogVisible"
+      class="dissatisfied-detail" title="" width="1366px">
       <div class="content">
         <div class="main-title main-title2">
-          <Title text="资源调度"/>
+          <Title text="资源调度" />
         </div>
 
         <div class="contents">
           <el-row :gutter="30">
             <el-col :span="5">
               <div class="tree">
-                <el-tree
-                    :data="data"
-                    :default-expand-all="true"
-                    :props="defaultProps"
-                    highlight-current
-                    icon-class="el-icon-arrow-right"
-                    node-key="value"
-                    @node-click="handleNodeClick"
-                />
+                <el-tree :data="data" :default-expand-all="true" :props="defaultProps" highlight-current
+                  icon-class="el-icon-arrow-right" node-key="value" @node-click="handleNodeClick" />
               </div>
             </el-col>
             <el-col :span="19">
               <div class="table">
                 <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
-                          max-height="600px">
-                  <el-table-column label="资源类型" min-width="120" prop="personnelType">
+                  max-height="600px">
+                  <el-table-column label="资源类型" min-width="120" prop="personnelType" v-if="peopleType!='4'">
                     <template slot-scope="{row}">
                       {{
-                        (row.personnelType ?
-                            data[0].children.filter(item => item.value === row.personnelType)[0].label : '') || peopleTypeLabel
+                      (row.personnelType ?
+                      data[0].children.filter(item => item.value === row.personnelType)[0].label : '') ||
+                      peopleTypeLabel
                       }}
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="所属组织" min-width="180"
-                                   prop="orgName"/>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="姓名/名称" min-width="120"
-                                   prop="name"/>
-                  <el-table-column v-if="peopleType !== '4' && peopleType !== '5'&& peopleType !== 'volunteer'&& peopleType !== 'publicWelfareNum'" label="联系电话" min-width="120"
-                                   prop="mobile">
-                    <template slot-scope="scope">
+                  <el-table-column v-if="peopleType !== '4'" label="所属组织" min-width="180"
+                    :prop="peopleType === '5'?'agencyName':'orgName'" />
+                  <el-table-column v-if="peopleType !== '4'" label="姓名/名称" min-width="120"
+                    :prop="peopleType === '5'?'unitName':'name'" />
+                  <el-table-column v-if="peopleType !== '4'&&peopleType !== '5'" label="联系电话" min-width="120"
+                    :prop="peopleType === '5'?'unitName':'name'">
+                    <template slot-scope="scope" v-if="peopleType !== '4'">
                       {{ $sensitive(scope.row.mobile, 3, 7) }}
                     </template>
                   </el-table-column>
+                  <el-table-column v-if="peopleType === '5'" label="联系人" min-width="120"
+                    prop="contact" />
+                  <el-table-column v-if="peopleType === '5'" label="联系电话" min-width="120" prop="contactMobile">
+                    <template slot-scope="scope">
+                      {{ $sensitive(scope.row.contactMobile, 3, 7) }}
+                    </template>
+                  </el-table-column>
+
                   <!--                  <el-table-column label="状态" prop="" width="120"/>-->
                   <!--                  <el-table-column label="距离" prop="" width="120"/>-->
-
-                  <el-table-column v-if="peopleType === '4'" label="所属组织" min-width="180" prop="agencyName"/>
-                  <el-table-column v-if="peopleType === '4'" label="负责人" min-width="120" prop="principalName"/>
+                  <el-table-column v-if="peopleType === '4'" label="名称" min-width="180" prop="organizationName" />
+                  <el-table-column v-if="peopleType === '4'" label="类别" min-width="180" prop="categoryName" />
+                  <el-table-column v-if="peopleType === '4'" label="所属组织" min-width="180" prop="agencyName" />
+                  <el-table-column v-if="peopleType === '4'" label="负责人" min-width="120" prop="principalName" />
                   <el-table-column v-if="peopleType === '4'" label="联系电话" min-width="120" prop="principalPhone">
                     <template slot-scope="scope">
                       {{ $sensitive(scope.row.principalPhone, 3, 7) }}
                     </template>
                   </el-table-column>
 
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="所属组织" min-width="180" prop="agencyName">
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="所属组织"
+                    min-width="180" prop="agencyName">
                     <template scope-row="row">
-                        {{this.$store.state.user.agencyName}}
+                      {{this.$store.state.user.agencyName}}
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系人" min-width="120" prop="name"/>
-                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系电话" min-width="120" prop="mobile">
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系人"
+                    min-width="120" prop="name" />
+                  <el-table-column v-if="peopleType === 'publicWelfareNum' || peopleType=== 'volunteer'" label="联系电话"
+                    min-width="120" prop="mobile">
                     <template slot-scope="scope">
                       {{ $sensitive(scope.row.mobile, 3, 7) }}
                     </template>
@@ -76,27 +75,22 @@
 
                   <el-table-column label="操作" prop="op" width="250">
                     <template slot-scope="scope">
-                      <CallPhone :mobile="scope.row.mobile" text="拨打电话"/>
+                      <CallPhone :mobile="scope.row.mobile" text="拨打电话" />
                       <span class="handle" @click="handleHandle">处理</span>
                       <span class="view" @click="handleViews(scope.row)">查看</span>
                     </template>
                   </el-table-column>
                 </el-table>
               </div>
-              <Pagination
-                  v-if="peopleType === '5' || peopleType === '4'"
-                  v-show="total > 0"
-                  :limit.sync="queryParams.pageSize"
-                  :page.sync="queryParams.pageNo"
-                  :total="total"
-                  @pagination="pageChange"
-              />
+              <Pagination v-if="peopleType === '5' || peopleType === '4'" v-show="total > 0"
+                :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNo" :total="total"
+                @pagination="pageChange" />
             </el-col>
           </el-row>
         </div>
       </div>
     </el-dialog>
-    <ResourceInfo ref="ResourceInfo" :currentLevelData="currentLevelData" @ok="handleHandle"/>
+    <ResourceInfo ref="ResourceInfo" :currentLevelData="currentLevelData" @ok="handleHandle" />
   </div>
 </template>