From d92f79e6c08be76fbb637fb6538ac2a775de1ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 19 Mar 2024 15:36:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=9B=B4=E8=A7=82=E5=9B=BE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                         | 30 ++++++++++
 .../dashboard/components/fd/czfdzgtcx.vue     | 56 +++++++++++++++++--
 src/views/dashboard/index.vue                 |  2 +-
 3 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index be150cb..0300021 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -205,6 +205,36 @@ aside {
     height: 24px !important;
   }
 }
+.mytablefdt{
+  .multiselect--active {
+    z-index: 1000 !important;
+  }
+  .vxe-cell .vxe-default-input, .vxe-cell .vxe-default-select, .vxe-cell .vxe-default-textarea, .vxe-table--filter-wrapper .vxe-default-input, .vxe-table--filter-wrapper .vxe-default-select, .vxe-table--filter-wrapper .vxe-default-textarea {
+    height: 20px !important;
+  }
+  .vxe-table--render-default .vxe-body--column.col--ellipsis, .vxe-table--render-default.vxe-editable .vxe-body--column, .vxe-table--render-default .vxe-footer--column.col--ellipsis, .vxe-table--render-default .vxe-header--column.col--ellipsis {
+    height: 26px !important;
+  }
+  .vxe-input {
+    //font-size: 12px;
+    height: 20px !important;
+  }
+  .vxe-table--render-default .vxe-body--column, .vxe-table--render-default .vxe-footer--column, .vxe-table--render-default .vxe-header--column {
+    position: relative;
+    line-height: 12px;
+    text-align: center;
+  }
+  .vxe-table--render-default .vxe-cell {
+    white-space: pre-line;
+    word-break: break-all;
+    padding-left: 2px !important;
+    padding-right: 2px !important;
+  }
+  table{
+    border-spacing: 0 !important;
+    border-collapse: collapse !important;
+  }
+}
 .mytableLfet{
   .multiselect--active {
     z-index: 1000 !important;
diff --git a/src/views/dashboard/components/fd/czfdzgtcx.vue b/src/views/dashboard/components/fd/czfdzgtcx.vue
index a01cceb..ef401e2 100644
--- a/src/views/dashboard/components/fd/czfdzgtcx.vue
+++ b/src/views/dashboard/components/fd/czfdzgtcx.vue
@@ -3,33 +3,59 @@
     <el-header style="width: 100%; height: 30px;font-size: 12px">
       <el-form :inline="true"  label-width="90px" >
         <el-row>
+
           <el-col :span="20">
             <el-form-item label="工程编号:"  >
               <el-select v-model="queryParam.czbh" filterable  placeholder="工程编号" @change="czbhChange" >
                 <el-option
                   v-for="item in projectData"
-                  :key="item.czbh"
-                  :label="item.czbh"
-                  :value="item.czbh">
+                  :key="item.cbbm"
+                  :label="item.cbbm"
+                  :value="item.cbbm">
                 </el-option>
               </el-select>
             </el-form-item>
+
+          </el-col>
+          <el-col :span="4">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="loadData()">查询</el-button>
+                            <el-button type="success"  @click.native="uploadExcel">    <el-upload
+                              :action="uploadAction"
+                              :show-file-list="false"
+                              :before-upload="beforeAvatarUpload"
+                              :data="uploadData"
+                              :on-success="handleAvatarSuccess"
+                              :disabled="uploadState==0?true:false"
+                              :headers="heads"
+                            >
+                              直观图模板导入
+                            </el-upload>   </el-button>
+            </el-form-item>
           </el-col>
         </el-row>
+
+
+
       </el-form>
     </el-header>
     <el-divider></el-divider>
     <el-container  style="padding-top: 0px">
+      <!--    <el-container >-->
+
       <el-main>
+
+
         <div class="mytablefdt" >
+
           <vxe-grid
             id="id"
             ref="xGridFd"
             :empty-text="emtext"
+
             show-footer
             :height="500"
             resizable
-            :custom-config="{storage: true}"
             :columns="tableColumn"
             :data="tableData"
             :show-header="false"
@@ -38,8 +64,12 @@
             border=none
             :cell-style="cellStyle"
           >
+
+
           </vxe-grid>
+
         </div>
+
         <el-tabs v-model="activeName" >
           <el-tab-pane label="汇总" name="first">
             <span slot="label" class="fontClass">汇总</span>
@@ -59,12 +89,14 @@
                 show-header-overflow
                 :cell-style="cellStyle1"
               >
+
                 <template #tpbh="{ row }">
                   <span style="cursor:pointer;color: blue" @click="tpbhClcik(row)">{{ row.tpbh }}</span>
                 </template>
                 <template #fdh="{ row }">
                   <span style="cursor:pointer;color: blue" @click="fdhClcik(row)">{{ row.fdh }}</span>
                 </template>
+
               </vxe-grid>
             </div>
           </el-tab-pane>
@@ -88,13 +120,20 @@
                 :header-cell-style="headerCellStyle"
                 :show-footer="true"
               >
+
+
               </vxe-grid>
+
             </div>
           </el-tab-pane>
+
         </el-tabs>
       </el-main>
+
     </el-container>
+
   </el-container>
+
 </template>
 
 <script>
@@ -102,7 +141,8 @@ import { startLoading, endLoading } from '@/utils'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 import { Message } from 'element-ui'
-import { getCzFdBase, upload, getListFdMx, findTPxqjh } from '@/api/fd/base'
+import { getCzFdBase, getList, upload, getListFdMx, findTPxqjh } from '@/api/fd/base'
+import XEUtils from 'xe-utils'
 import { getSumAdd } from '@/utils/rpkj'
 export default {
   // 船只分段直观图定义
@@ -1341,6 +1381,12 @@ export default {
   font-weight: bold;
 }
 
+.mytablefdt .vxe-table--render-default .vxe-cell {
+  white-space: pre-line;
+  word-break: break-all;
+  padding-left: 2px!important;
+  padding-right: 2px!important;
+}
 </style>
 
 
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index fe75d87..0abc581 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -70,7 +70,7 @@ export default {
 .dashboard-editor-container {
   background-color: #e3e3e3;
   min-height: 100vh;
-  padding: 50px 60px 0px;
+  padding: 10px;
   .pan-info-roles {
     font-size: 12px;
     font-weight: 700;