diff --git a/package.json b/package.json
index f898fc2..7d72e60 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "spark-md5": "^3.0.2",
     "vue": "3.2.45",
     "vue-cropper": "1.0.3",
+    "vue-pdf": "^4.3.0",
     "vue-router": "4.1.4"
   },
   "devDependencies": {
diff --git a/src/api/jj/gctzgl.js b/src/api/jj/gctzgl.js
index 84f4632..2230c67 100644
--- a/src/api/jj/gctzgl.js
+++ b/src/api/jj/gctzgl.js
@@ -51,3 +51,19 @@ export const prjInfoBudgetUploadList=(payload)=>{
 export const approve=(payload)=>{
     return $post(`/zhTEconomy/approve` ,payload)
 }
+//施工图下拉
+
+export const getOne=(id)=>{
+    return $postBlob('/zhFile/getOne?id='+id)
+}
+
+//施工图下拉
+
+export const getApproval=(pay)=>{
+    return $post('/zhSafeWarning/getApproval',pay)
+}
+//施工图下拉
+
+export const updateApproval=(pay)=>{
+    return $post('/zhSafeWarning/updateApproval',pay)
+}
diff --git a/src/api/qzxscxkyxh/index.js b/src/api/qzxscxkyxh/index.js
index 75a7587..05b9d1a 100644
--- a/src/api/qzxscxkyxh/index.js
+++ b/src/api/qzxscxkyxh/index.js
@@ -15,3 +15,14 @@ export const listWorkContent=()=>{
 export const uploadPreReviewFile=(pay)=>{
     return $post(`/zhSafeWarning/uploadPreReviewFile`,pay)
 }
+export const uploadCancelNumFile=(pay)=>{
+    return $post(`/zhSafeWarning/uploadCancelNumFile`,pay)
+}
+
+export const importSafetyWeekly=(pay)=>{
+    return $post(`/zhSafeWarning/importSafetyWeekly`,pay)
+}
+
+export const deleteApproval=(pay)=>{
+    return $post(`/zhSafeWarning/deleteApproval`,pay)
+}
diff --git a/src/components/FilePreview/index.vue b/src/components/FilePreview/index.vue
index c7d7bea..11e6633 100644
--- a/src/components/FilePreview/index.vue
+++ b/src/components/FilePreview/index.vue
@@ -23,12 +23,12 @@
       @rendered="renderedHandler"
       @error="errorHandler"
     /> -->
-    <!-- <pdfjsLib v-for="i in numPages" 
+    <!-- <pdfjsLib v-for="i in numPages"
     v-if="['.pdf'].includes(extenson)"
-     :key="i" 
-     :src="filePreviewUrl" 
-     :page="i"  
-     @page-loaded="pageLoaded" > 
+     :key="i"
+     :src="filePreviewUrl"
+     :page="i"
+     @page-loaded="pageLoaded" >
 </pdfjsLib> -->
 <div v-if="['.pdf','.ofd'].includes(extenson)" v-for="i in numPages" :key="i" class="pdf-page">
       <canvas  :id="'canvas-' + i"></canvas>
@@ -111,12 +111,12 @@ const pageLoaded=()=>{
 }
 // function blobToBase64(blob, callback) {
 //     const reader = new FileReader();
-    
+
 //     // 当读取完成时，执行回调并返回 Base64 字符串
 //     reader.onloadend = function() {
 //         callback(reader.result);
 //     };
-    
+
 //     // 读取 Blob 为 Base64 字符串
 //     reader.readAsDataURL(blob);
 // }
diff --git a/src/utils/request.js b/src/utils/request.js
index a10c555..fcdc8a3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -34,7 +34,36 @@ const service = axios.create({
   // 超时
   timeout: 120000
 })
-let whitePage=['uploadPic']
+let whitePage=['uploadPic',
+  "zhDataMaintain/simpleRead",
+  "/zhMapPro/importBasic",
+  "/zhMapPro/importCertificateBasic"
+  , "/tj/safetyPro/contractorImport"
+  , "/tj/safetyPro/contractorSubcontractingImport"
+  , "/tj/safetyPro/subcontractingImport"
+  , "/zhFile/upload"
+  , "/zhFile/uploadFile"
+  , "/zhFile/uploadPic"
+  , "/tj/safetyPro/uploadViolationImg"
+  , "/zhUploadSlice/upload"
+  , "/zhUploadSlice/uploadFile"
+  , "/zhTEconomy/uploadDrawing"
+  , "/zhTEconomy/uploadBudgetDrawing"
+  , "/zhTEconomy/reUploadDrawing"
+  , "/zhTEconomy/reUploadBudgetDrawing"
+  , "/zhDataMaintain/simpleWrite"
+  , "/tj/safetyPro/contractorExport"
+  , "/tj/safetyPro/contractorSubcontractingExport"
+  , "/tj/safetyPro/contractorTemplateExport"
+  , "/tj/safetyPro/contractorSubcontractingTemplateExport"
+  , "/tj/safetyPro/subcontractingExport"
+  , "/tj/safetyPro/subcontractingTemplateExport"
+  , "/zhFile/show"
+  , "/zhFile/getOne"
+  , "/zhFile/getOneObs"
+  , "/zhFile/download"
+  , "/zhUploadSlice/download"
+]
 // request拦截器
 service.interceptors.request.use(config => {
   // 是否需要设置 token
@@ -75,6 +104,7 @@ service.interceptors.request.use(config => {
     }
   }
   //  加密状态&&   排除白名单
+  console.log(config,config.data,'config.data')
   if(isNeedcry==true&&!whitePage.some(ele=>config.url.includes(ele))){
     if(config.data!=undefined){
 
diff --git a/src/views/pages/anquan/qzxscxkyxh.vue b/src/views/pages/anquan/qzxscxkyxh.vue
index 798455c..9849365 100644
--- a/src/views/pages/anquan/qzxscxkyxh.vue
+++ b/src/views/pages/anquan/qzxscxkyxh.vue
@@ -14,6 +14,7 @@
         <el-select
             v-model="selectName"
             filterable
+            clearable
             placeholder="请输入名称"
             style="width: 500px"
         >
@@ -21,9 +22,9 @@
               v-for="item in prjOptions"
               :key="item.code"
               :label="item.value"
-              @click.native="setSelectItem(item)"
               :value="item.value"
           />
+
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -47,21 +48,21 @@
         <!--        </el-upload>-->
         <el-button type="success" @click="openDia(0)" >上传前置审查资料</el-button>
         <el-button type="primary" @click="openDia(1)" >上传销号佐证材料</el-button>
-        <el-button type="primary" @click="openDia(2)" >上传风险作业计划</el-button>
+<!--        <el-button type="primary" @click="openDia(2)" >上传风险作业计划</el-button>-->
         <!--        <el-button type="success" @click="isOpenDialog=true">物资上传</el-button>-->
-        <!--        <el-upload-->
-        <!--            ref="upload1"-->
-        <!--            action="#"-->
-        <!--            :http-request="submitUpload1"-->
-        <!--            :on-change="handleFileChange1"-->
-        <!--            accept=".xls,.xlsx"-->
-        <!--            :show-file-list="false"-->
-        <!--            :limit="1"-->
-        <!--        >-->
-        <!--          <template #trigger>-->
-        <!--            <el-button type="primary"  @click="isOpenDialog=true">施工图预算上传</el-button>-->
-        <!--          </template>-->
-        <!--        </el-upload>-->
+                <el-upload
+                    ref="upload1"
+                    action="#"
+                    :http-request="submitUpload1"
+                    :on-change="handleFileChange2"
+                    accept=".xls,.xlsx"
+                    :show-file-list="false"
+                    :limit="1"
+                >
+                  <template #trigger>
+                    <el-button type="primary">上传风险作业计划</el-button>
+                  </template>
+                </el-upload>
       </el-form-item>
     
     </el-form>
@@ -83,7 +84,6 @@
                 v-model="upLoadname"
                 clearable
                 filterable
-                
                 :disabled="diaDisabled"
                 placeholder="请输入名称"
                 style="width: 400px"
@@ -92,9 +92,10 @@
                   v-for="item in prjOptions"
                   :key="item.code"
                   :label="item.value"
-                  @click.native="setSelectItemUpload(item)"
                   :value="item.code"
               />
+<!--              @click.native="setSelectItemUpload(item)"-->
+
             </el-select>
           </el-form-item>
           <el-form-item label="主要作业内容：" prop="name" label-position="left" class="labelItem" label-width="130">
@@ -114,6 +115,9 @@
                 :disabled="diaDisabled"
                 placeholder="请输入名称"
                 style="width: 400px"
+                collapse-tags
+                collapse-tags-tooltip
+                :max-collapse-tags="8"
             >
               <!--                  @click.native="setSelectItemZynr(item)"-->
   
@@ -138,7 +142,6 @@
                 v-model="upLoadOrName"
                 clearable
                 filterable
-                :disabled="diaDisabled"
                 placeholder="请输入名称"
                 style="width: 400px"
             >
@@ -151,12 +154,13 @@
                   ref="upload"
                   action=""
                   :auto-upload="false"
+                  :on-exceed="handleExceed"
                   :on-change="handleFileChange"
-                  :before-upload="beforeUpload"
-                  accept=".xls,.xlsx,.zip"
-                  :show-file-list="true"
+                  accept=".xls,.xlsx,.zip,.doc,.docx"
                   :limit="1"
               >
+<!--                :on-change="handleFileChange"-->
+  
                 <template #trigger>
                   <el-button type="primary">选取文件</el-button>
                 </template>
@@ -189,11 +193,12 @@
     
     </el-dialog>
     <div style="padding: 20px;
-    box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
-    overflow-x: auto;
-    border-radius: 6px;background-color: #fff;">
-      <el-table v-loading="loading" :data="tableData">
-        <el-table-column label="序号" type="index" width="50" align="center">
+        box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+        overflow-x: auto;
+        border-radius: 6px;background-color: #fff;"
+    class="tableWrapCon">
+      <el-table v-loading="loading" :data="tableData" :header-cell-style="{ background:'rgb(244, 249, 253)',border:'1px solid rgb(235, 238, 242,.5)' }">
+        <el-table-column label="序号" type="index" width="90" align="center">
           <template #default="scope">
             <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
           </template>
@@ -209,22 +214,22 @@
         </el-table-column>
         <el-table-column label="结束时间"  width="150" align="center" prop="endTime" :show-overflow-tooltip="false"/>
         
-        <el-table-column label="前置审查资料名称"  align="center" prop="preReviewMaterialsName" :show-overflow-tooltip="true" width="180">
+        <el-table-column label="前置审查资料名称"  align="center" prop="preReviewMaterialsName" :show-overflow-tooltip="true" width="220" >
           <template #default="scope">
-            <el-link>{{ scope.row.preReviewMaterialsName }}</el-link>
-            <el-link v-show="scope.row.showUpdatePreReview" @click="changeFun" type="primary" style="border-bottom: 1px solid #0E9CFF">修改</el-link>
+              <el-link>{{ scope.row.preReviewMaterialsName }}</el-link>
+            <el-link v-show="scope.row.showUpdatePreReview" @click="changeFun(scope.row,0)" type="primary" style=";border-bottom: 1px solid #0E9CFF">修改</el-link>
           </template>
         </el-table-column>
         <el-table-column label="状态"  align="center" prop="preReviewMaterialsStatus" :show-overflow-tooltip="false" width="80"/>
         <el-table-column label="销号佐证名称"  align="center" prop="cancelNumName" :show-overflow-tooltip="true" width="180">
           <template #default="scope">
           <el-link>{{ scope.row.cancelNumName }}</el-link>
-          <el-link v-show="scope.row.showUpdateCancelNum" @click="changeFun" type="primary" style="border-bottom: 1px solid #0E9CFF">修改</el-link>
+          <el-link v-show="scope.row.showUpdateCancelNum" @click="changeFun(scope.row,1)" type="primary" style="border-bottom: 1px solid #0E9CFF">修改</el-link>
           </template>
         </el-table-column>
         <el-table-column label="状态"  align="center" prop="cancelNumStatus" :show-overflow-tooltip="false" width="120"/>
         <el-table-column label="操作" align="center"
-                         width="400"
+                         width="150"
                          fixed="right"
                          :show-overflow-tooltip="false" >
           <template #default="scope">
@@ -233,7 +238,7 @@
                   type="primary"
                   link
                   v-show="scope.row.showOptionDelete"
-                  @click="editFun(scope.row,0)"
+                  @click="deleteRow(scope.row,0)"
               >删除</el-button>
            
             </div>
@@ -256,7 +261,9 @@
 // import { list as  recordList,reUploadDrawing,reUploadBudgetDrawing,prjInfoDrawingUploadList,
 // prjInfoBudgetUploadList,prjInfoList as  getPrjList,uploadDrawing as importCm ,
 // uploadBudgetDrawing as importCm1,deleteInfo as deleteitem} from '@/api/jj/gctzgl'
-import { list as  recordList,listSiteName as  getPrjList,listWorkContent as prjInfoDrawingUploadList,uploadPreReviewFile as importCm} from '@/api/qzxscxkyxh/index.js'
+import { list as  recordList,listSiteName as  getPrjList,
+  listWorkContent as prjInfoDrawingUploadList,
+  uploadPreReviewFile as importCm,uploadCancelNumFile as importCm1,importSafetyWeekly,deleteApproval as deleteitem} from '@/api/qzxscxkyxh/index.js'
 import { getOne } from '@/api/pageB/environmental/index.js'
 // ,importCm,importCm1,deleteitem
 import {defineProps, onMounted, ref} from 'vue';
@@ -266,6 +273,32 @@ const props = defineProps({
   pageType: String,
   moduleName: String,
 });
+let upload1=ref(null)
+const submitUpload1 = () => {
+  
+  const formData = new FormData();
+  formData.append('file', file2.value);
+  // 使用 fetch 发送请求
+  importSafetyWeekly(formData).then(response => response)
+      .then(data => {
+        // 清空文件输入框
+        upload1.value.clearFiles();
+        ElMessage.success('上传成功')
+        file2.value=null
+        resetQuery()
+      }).then(res=>{
+    if(res.code==200){
+      ElMessage.success(res.msg)
+    }
+  })
+  return
+};
+let file2=ref(null)
+const handleFileChange2 = (fileObj) => {
+  console.log(fileObj)
+  file2.value = fileObj.raw;
+};
+
 //图纸线
 let tzLine=ref([])
 //施工图线
@@ -301,6 +334,9 @@ const downloadFile=(pay)=>{
     ElMessage.error('点击错误')
   }
 }
+const hcell=()=>{
+  return 'hcell'
+}
 let clickType=ref('')
 const downmloadFile=(row,num)=>{
   clickType.value=num
@@ -367,6 +403,48 @@ const downmloadFile=(row,num)=>{
   //
   // }
 }
+let isNewUp=ref(true)
+let currentRow= ref({})
+const changeFun=(row,pay)=>{
+  console.log(row,'585')
+  currentRow.value=row
+  console.log(pay!==false,'pay!==false')
+  if(pay!==false){
+    isNewUp.value=false
+  }else {
+    isNewUp.value=true
+  }
+  console.log(row)
+  console.log(upLoadZynrName,'000')
+  diaDisabled.value=true
+  openDia(pay)
+  upLoadname.value=row.id
+  // upLoadZynrName.value=row.workContent.split(',')
+  // upLoadZynrName upLoadname
+  if(pay==0){
+    getApprovalFun({
+      "preReviewMaterialsId":row.preReviewMaterialsId, //前置审查资料id
+      "cancelNumId":'', //销号佐证Id
+    }).then(res=>{
+      console.log(res)
+      upLoadZynrName.value=res.data.preReviewWorkContentId
+      console.log(upLoadZynrName,111)
+    })
+  }else if(pay==1){
+    getApprovalFun({
+      "preReviewMaterialsId":'', //前置审查资料id
+      "cancelNumId":row.cancelNumId, //销号佐证Id
+    }).then(res=>{
+      console.log(res)
+      upLoadZynrName.value=res.data.cancelNumWorkContentId
+    })
+  }
+}
+const getApprovalFun=(pay)=>{
+  return  getApproval(pay)
+}
+let typeName=ref('')
+//前置.销号
 let diaType=ref(0)
 const openDia=(pay)=>{
   diaType.value=pay
@@ -396,6 +474,8 @@ let isOpenDialog =ref(false)
 let isOpenTimeLine =ref(false)
 const closeDialog=()=>{
   upLoadname.value=''
+  qzscId.value=''
+  isNewUp.value=true
   upLoadZynrName.value=[]
   upLoadOrName.value=''
   diaDisabled.value=false
@@ -404,6 +484,7 @@ const closeDialog=()=>{
     value:'',
     code:''
   }
+  diaDisabled.value=false
   console.log(upload.value,'upload.value')
   upload.value.clearFiles();
   getPrjListFun()
@@ -417,6 +498,7 @@ const router=useRouter()
 const route=useRoute()
 // 编辑
 let diaDisabled =ref(false)
+
 let editFun = (rowData,pay) => {
   diaType.value=pay
   reDia.value=1
@@ -495,10 +577,12 @@ const resetQuery=()=> {
 // 保存
 let deleteRow = (rowData) => {
   console.log(rowData,'...')
-  deleteitem(rowData.prjCode).then(res=>{
-    handleQuery()
+  deleteitem({
+    id:rowData.id
+  }).then(res=>{
+    resetQuery()
   },error=>{
-    handleQuery()
+    resetQuery()
   })
   
   
@@ -551,7 +635,7 @@ let getList = () => {
     pageSize:pageSize.value,
     pageNum:pageNo.value,
   },{
-    "siteName": selectItem.value.value
+    "siteName": selectName.value
   }).then(res=>{
     console.log(res)
     loading.value = false
@@ -560,8 +644,9 @@ let getList = () => {
     // pageNo.value = res.data.current
   })
 }
-import {ElMessage} from "element-plus";
-import {historyList, uploadDrawing} from "../../../api/jj/gctzgl";
+import {ElMessage, genFileId} from "element-plus";
+import {getApproval, historyList, uploadDrawing} from "../../../api/jj/gctzgl";
+import {uploadCancelNumFile} from "../../../api/qzxscxkyxh";
 let prjOptions=ref([])
 let zynrOption=ref([])
 const getPrjListFun=()=>{
@@ -597,7 +682,7 @@ const setSelectItemUpload=(item)=>{
   selectItemUpload.value=JSON.parse(JSON.stringify(item))
   upLoadname.value=item.value
 }
-const setSelectItemZynrsetSelectItemZynr=(item)=>{
+const setSelectItemZynr=(item)=>{
   console.log(item,'作业内容')
   selectItemZynrUpload.value=JSON.parse(JSON.stringify(item))
   upLoadZynrName.value=item.value
@@ -605,6 +690,13 @@ const setSelectItemZynrsetSelectItemZynr=(item)=>{
 const upload = ref(null);
 const file = ref(null);
 const file1 = ref(null);
+const handleExceed=(files)=>{
+  console.log(files)
+  upload.value.clearFiles()
+  file.value = files[0]
+  file.value.uid = genFileId()
+  upload.value.handleStart(file.value)
+}
 const handleFileChange = (fileObj) => {
   console.log(fileObj)
   file.value = fileObj.raw;
@@ -615,20 +707,31 @@ const handleFileChange1 = (fileObj) => {
 };
 const beforeUpload = (fileObj) => {
   if (!fileObj.type.includes('application/vnd.ms-excel') && !fileObj.type.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')) {
-    alert('只能上传 .xls 或 .xlsx 文件!');
+    alert('只能上传 .xls 或 .xlsx ,.zip文件!');
     return false;
   }
   return true;
 };
 let reDia=ref(0)
 let qzscId=ref('')
+let cancelNumId=ref('')
 const submitUpload = () => {
+  if(isNewUp.value==true){
+    qzscId.value=''
+  }else {
+    qzscId.value=currentRow.value.preReviewMaterialsId
+    cancelNumId.value=currentRow.value.cancelNumId
+  }
+  console.log(isNewUp.value)
+  console.log(selectItemUpload.value)
+  console.log(upLoadname.value)
   console.log(upLoadZynrName.value)
+  console.log(file.value)
   if (!file.value) {
     alert('请选择一个文件');
     return;
   }
-  if(!selectItemUpload.value.code){
+  if(upLoadname.value==''){
     ElMessage.error('请选择现场名称')
     return;
   }
@@ -642,82 +745,69 @@ const submitUpload = () => {
   }
   const formData = new FormData();
   formData.append('file', file.value);
-  formData.append('preReviewId', qzscId.value);
-  formData.append('siteNameId', selectItemUpload.value.code);
+  formData.append('siteNameId', upLoadname.value);
   formData.append('workContents', upLoadZynrName.value.join(','));
-  formData.append('preViewName', upLoadOrName.value);
+  if(diaType.value==0){
+    formData.append('preReviewId', qzscId.value);
+    formData.append('preViewName', upLoadOrName.value);
+  
+  }else if(diaType.value==1){
+    formData.append('cancelNumId', cancelNumId.value);
+    formData.append('cancelName', upLoadOrName.value);
+  }
   // 使用 fetch 发送请求
   if(diaType.value==0){
-    if(reDia.value==1){
-      reUploadDrawing(formData).then(response => response)
-          .then(data => {
-            selectItemUpload.value={
-              code:'',
-              value:''
-            }
-            upLoadname.value=''
-            upLoadZynrName.value=[]
-            upLoadOrName.value=''
-  
-            console.log('Success:', data);
-            // 清空文件输入框
-            upload.value.clearFiles();
-            ElMessage.success('上传成功')
-            file.value=null
-            selectItem.value.code=''
-            selectItem.value.value=''
-            selectName.value=''
-            handleQuery()
-            isOpenDialog.value=false
-          })
-    }else if(reDia.value==0){
-      importCm(formData).then(response => response)
-          .then(data => {
-            selectItemUpload.value={
-              code:'',
-              value:''
-            }
-            upLoadname.value=''
-            upLoadZynrName.value=[]
-            upLoadOrName.value=''
-            console.log('Success:', data);
-            // 清空文件输入框
-            upload.value.clearFiles();
-            ElMessage.success('上传成功')
-            file.value=null
-            selectItem.value.code=''
-            selectItem.value.value=''
-            selectName.value=''
-            handleQuery()
-            isOpenDialog.value=false
-          })
-    }
+    importCm(formData).then(response => response)
+        .then(data => {
+          selectItemUpload.value={
+            code:'',
+            value:''
+          }
+          upLoadname.value=''
+          upLoadZynrName.value=[]
+          upLoadOrName.value=''
+          console.log('Success:', data);
+          // 清空文件输入框
+          upload.value.clearFiles();
+          ElMessage.success('上传成功')
+          file.value=null
+          selectItem.value.code=''
+          selectItem.value.value=''
+          selectName.value=''
+          handleQuery()
+          isOpenDialog.value=false
+        })
+    
+    
+    // if(reDia.value==1){
+    //   reUploadDrawing(formData).then(response => response)
+    //       .then(data => {
+    //         selectItemUpload.value={
+    //           code:'',
+    //           value:''
+    //         }
+    //         upLoadname.value=''
+    //         upLoadZynrName.value=[]
+    //         upLoadOrName.value=''
+    //
+    //         console.log('Success:', data);
+    //         // 清空文件输入框
+    //         upload.value.clearFiles();
+    //         ElMessage.success('上传成功')
+    //         file.value=null
+    //         selectItem.value.code=''
+    //         selectItem.value.value=''
+    //         selectName.value=''
+    //         handleQuery()
+    //         isOpenDialog.value=false
+    //       })
+    // }else if(reDia.value==0){
+    //
+    // }
     
     
   }else {
-    if(reDia.value==1){
-      reUploadBudgetDrawing(formData).then(response => response)
-          .then(data => {
-            selectItemUpload.value={
-              code:'',
-              value:''
-            }
-            upLoadname.value=''
-            upLoadZynrName.value=[]
-            upLoadOrName.value=''
-  
-            console.log('Success:', data);
-            // 清空文件输入框
-            upload.value.clearFiles();
-            ElMessage.success('上传成功')
-            file.value=null
-            selectItem.value.code=''
-            selectItem.value.value=''
-            selectName.value=''
-            handleQuery()
-            isOpenDialog.value=false
-          })
-    }else {
+    
       importCm1(formData).then(response => response)
           .then(data => {
             selectItemUpload.value={
@@ -727,7 +817,7 @@ const submitUpload = () => {
             upLoadname.value=''
             upLoadZynrName.value=[]
             upLoadOrName.value=''
-  
+          
             console.log('Success:', data);
             // 清空文件输入框
             upload.value.clearFiles();
@@ -739,7 +829,52 @@ const submitUpload = () => {
             handleQuery()
             isOpenDialog.value=false
           })
-    }
+    
+    // if(reDia.value==1){
+    //   reUploadBudgetDrawing(formData).then(response => response)
+    //       .then(data => {
+    //         selectItemUpload.value={
+    //           code:'',
+    //           value:''
+    //         }
+    //         upLoadname.value=''
+    //         upLoadZynrName.value=[]
+    //         upLoadOrName.value=''
+    //
+    //         console.log('Success:', data);
+    //         // 清空文件输入框
+    //         upload.value.clearFiles();
+    //         ElMessage.success('上传成功')
+    //         file.value=null
+    //         selectItem.value.code=''
+    //         selectItem.value.value=''
+    //         selectName.value=''
+    //         handleQuery()
+    //         isOpenDialog.value=false
+    //       })
+    // }else {
+    //   importCm1(formData).then(response => response)
+    //       .then(data => {
+    //         selectItemUpload.value={
+    //           code:'',
+    //           value:''
+    //         }
+    //         upLoadname.value=''
+    //         upLoadZynrName.value=[]
+    //         upLoadOrName.value=''
+    //
+    //         console.log('Success:', data);
+    //         // 清空文件输入框
+    //         upload.value.clearFiles();
+    //         ElMessage.success('上传成功')
+    //         file.value=null
+    //         selectItem.value.code=''
+    //         selectItem.value.value=''
+    //         selectName.value=''
+    //         handleQuery()
+    //         isOpenDialog.value=false
+    //       })
+    // }
     
     
   }
@@ -778,4 +913,10 @@ onMounted(()=>{
 .el-button {
   margin-right: 10px;
 }
+.hcell{
+  background-color: rgb(244, 249, 253) !important;
+}
+/deep/.el-upload-list__item-file-name{
+  overflow: visible ;
+}
 </style>
diff --git a/src/views/pages/dataService/wzzysjdr.vue b/src/views/pages/dataService/wzzysjdr.vue
index f6e3b67..a95495b 100644
--- a/src/views/pages/dataService/wzzysjdr.vue
+++ b/src/views/pages/dataService/wzzysjdr.vue
@@ -128,7 +128,7 @@
     box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
     overflow-x: auto;
     border-radius: 6px;background-color: #fff;">
-      <el-table v-loading="loading" :data="tableData">
+      <el-table v-loading="loading" :data="tableData" >
         <el-table-column label="序号" type="index" width="50" align="center">
           <template #default="scope">
             <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
diff --git a/src/views/pages/jj/prjMan.vue b/src/views/pages/jj/prjMan.vue
index de4154d..2d9c33e 100644
--- a/src/views/pages/jj/prjMan.vue
+++ b/src/views/pages/jj/prjMan.vue
@@ -149,6 +149,7 @@
             <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="建管单位"   align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
         <el-table-column label="工程名称"   align="center" prop="prjName" :show-overflow-tooltip="false"/>
         <el-table-column label="图纸名称"  align="center" prop="drawingName" :show-overflow-tooltip="true" width="300">
           <template #default="scope">
@@ -176,11 +177,13 @@
               <el-button
                   type="primary"
                   link
+                  v-show="scope.row.drawingName!=null"
                   @click="editFun(scope.row,0)"
               >重新上传图纸</el-button>
               <el-button
                   type="primary"
                   link
+                  v-show="scope.row.budgetDrawingName!=null"
                   @click="editFun(scope.row,1)"
               >重新上传施工图预算</el-button>
               <el-button
@@ -205,8 +208,10 @@
 </template>
 
 <script setup name="prjMan">
-import { list as  recordList,reUploadDrawing,reUploadBudgetDrawing,prjInfoDrawingUploadList,prjInfoBudgetUploadList,prjInfoList as  getPrjList,uploadDrawing as importCm ,uploadBudgetDrawing as importCm1,deleteInfo as deleteitem} from '@/api/jj/gctzgl'
-import { getOne } from '@/api/pageB/environmental/index.js'
+import { list as  recordList,reUploadDrawing,reUploadBudgetDrawing,
+  prjInfoDrawingUploadList,getOne,prjInfoBudgetUploadList,prjInfoList as  getPrjList,
+  uploadDrawing as importCm ,uploadBudgetDrawing as importCm1,deleteInfo as deleteitem} from '@/api/jj/gctzgl'
+// import { getOne } from '@/api/pageB/environmental/index.js'
 // ,importCm,importCm1,deleteitem
 import {defineProps, onMounted, ref} from 'vue';
 const { proxy } = getCurrentInstance();
diff --git a/src/views/pages/jj/prjapro.vue b/src/views/pages/jj/prjapro.vue
index 3157bcf..f3f3405 100644
--- a/src/views/pages/jj/prjapro.vue
+++ b/src/views/pages/jj/prjapro.vue
@@ -126,8 +126,8 @@
 <!--      </div>-->
 <!--    -->
 <!--    </el-dialog>-->
-    <el-dialog v-model="isOpenTimeLine" width="30vw" @close="closeTimeLine">
-      <div style="height: 500px;overflow: scroll">
+    <el-dialog v-model="isOpenTimeLine" width="30vw" @close="closeTimeLine" :title="titleN" center>
+      <div style="height: 500px;overflow: scroll;position: relative">
         <el-timeline>
           <el-timeline-item
               v-for="(activity, index) in tzLine"
@@ -139,7 +139,7 @@
         
       </div>
       <div v-if="editFunisTrue" style="display: flex;justify-content: flex-end">
-      <el-button type="primary" @click="approveH(1)">同意</el-button>
+      <el-button type="primary" @click="approveH(1)">批准</el-button>
       <el-button type="warning" @click="approveH(2)">驳回</el-button>
       </div>
     </el-dialog>
@@ -153,6 +153,7 @@
             <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="建管单位"   align="center" prop="buildUnitName" :show-overflow-tooltip="false"/>
         <el-table-column label="工程名称"   align="center" prop="prjName" :show-overflow-tooltip="false"/>
         <el-table-column label="图纸名称"  align="center" prop="drawingName" :show-overflow-tooltip="true" width="300">
           <template #default="scope">
@@ -180,12 +181,14 @@
               <el-button
                   type="primary"
                   link
-                  @click="editFun(scope.row,0)"
+                  v-show="scope.row.drawingName!=null&&scope.row.drawingApprovalStatus!='已审批'&&scope.row.drawingApprovalStatus!='驳回'"
+                  @click="editFun(scope.row,0,'审批图纸')"
               >审批图纸</el-button>
               <el-button
                   type="primary"
                   link
-                  @click="editFun(scope.row,1)"
+                  v-show="scope.row.budgetDrawingName!=null&&scope.row.budgetDrawingApprovalStatus!='已审批'&&scope.row.budgetDrawingApprovalStatus!='驳回'"
+                  @click="editFun(scope.row,1,'审批施工图预算')"
               >审批施工图预算</el-button>
 <!--              <el-button-->
 <!--                  type="primary"-->
@@ -209,8 +212,10 @@
 </template>
 
 <script setup name="prjMan">
-import { approve,list as  recordList,reUploadDrawing,reUploadBudgetDrawing,prjInfoDrawingUploadList,prjInfoBudgetUploadList,prjInfoList as  getPrjList,uploadDrawing as importCm ,uploadBudgetDrawing as importCm1,deleteInfo as deleteitem} from '@/api/jj/gctzgl'
-import { getOne } from '@/api/pageB/environmental/index.js'
+import { approve,list as  recordList,reUploadDrawing,reUploadBudgetDrawing,
+  prjInfoDrawingUploadList,prjInfoBudgetUploadList,prjInfoList as  getPrjList,uploadDrawing as importCm ,
+  uploadBudgetDrawing as importCm1,deleteInfo as deleteitem,getOne} from '@/api/jj/gctzgl'
+// import { getOne } from '@/api/pageB/environmental/index.js'
 // ,importCm,importCm1,deleteitem
 import {defineProps, onMounted, ref} from 'vue';
 const { proxy } = getCurrentInstance();
@@ -407,7 +412,9 @@ const approveH=(pay)=>{
 }
 
 let statusApprove=ref('')
-let editFun = (rowData,pay) => {
+let titleN=ref('')
+let editFun = (rowData,pay,titleName) => {
+  titleN.value=titleName
   statusApprove.value=pay
   editFunisTrue.value=true
   
diff --git a/vite.config.js b/vite.config.js
index 62e4e31..f9346c8 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -63,10 +63,10 @@ export default defineConfig(({ mode, command }) => {
           //张新
           // target: "http://192.168.3.210:20241",
           //测试
-          target: "http://192.168.133.127:20241",
+          // target: "http://192.168.133.127:20241",
           // target: "http://192.168.133.127:20241",
           // 相斌
-          // target: "http://192.168.3.33:20241",
+          target: "http://192.168.3.33:20241",
           changeOrigin: true,
           // target: 'http://192.168.3.114:20241',//广瑞
           rewrite: (p) => p.replace(/^\/sgtjzhzxsp-api/, '')