diff --git a/src/api/centerMap/index.js b/src/api/centerMap/index.js
index 6142ce8..1b521d5 100644
--- a/src/api/centerMap/index.js
+++ b/src/api/centerMap/index.js
@@ -44,3 +44,8 @@ export function selZnXmJsSg() {
         method: 'post',
     })
 }
+
+
+export const oneAccountMaterialsForBuildUnitCode=(pay)=>{
+    return $post('/zhDataEngineer/oneAccountMaterialsForBuildUnitCode?pageSize='+10+'&pageNum='+1,pay)
+}
diff --git a/src/api/pageB/environmental/index.js b/src/api/pageB/environmental/index.js
index 00a3c83..33ac873 100644
--- a/src/api/pageB/environmental/index.js
+++ b/src/api/pageB/environmental/index.js
@@ -70,6 +70,11 @@ export const selZccx=()=>{
     return $post('/zhDataMaintain/selZccx')
 }
 // 环保咨询-获取图片
+// 环保咨询-获取图片
+export const selTzyj=(id)=>{
+    return $post('zhDataMaintain/selTzyj')
+}
+// 环保咨询-获取图片
 export const getOne=(id)=>{
     return $postBlob('/zhFile/getOne?id='+id)
 }
diff --git a/src/assets/bdscreenImg/gkskmgdt.png b/src/assets/bdscreenImg/gkskmgdt.png
new file mode 100644
index 0000000..99a7354
Binary files /dev/null and b/src/assets/bdscreenImg/gkskmgdt.png differ
diff --git a/src/components/BgBcpm/environmentalB/bgcenter/index.vue b/src/components/BgBcpm/environmentalB/bgcenter/index.vue
index 164b2e6..14e7be4 100644
--- a/src/components/BgBcpm/environmentalB/bgcenter/index.vue
+++ b/src/components/BgBcpm/environmentalB/bgcenter/index.vue
@@ -14,6 +14,14 @@
       Your browser does not support the HTML5 canvas tag.
     </canvas>
     <div class='tl'></div>
+    <div class='tll'>
+      <div class="tlContent">
+        <div class="fontTit">国控点</div>
+        <div class="listCon">
+        
+        </div>
+      </div>
+    </div>
     <div class="dm dm_bd" @mouseover="mouseOver('baodi')" @mouseout="mouseOut">
       宝坻
     </div>
@@ -797,4 +805,38 @@ const goPage = (item) => {
   right:-344px;
   bottom: 120px;
 }
+.tll{
+  position: absolute;
+  width: 388px;
+  height: 989px;
+  background-image: url("@/assets/bdscreenImg/gkskmgdt.png");
+  left:-360px;
+  top: 40px;
+  .tlContent{
+      height: 310px;
+      background-color: #0E9CFF;
+      .fontTit{
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        font-size: 36px;
+        color: #FFFFFF;
+      }
+    .listCon{
+      font-family: Microsoft YaHei;
+      font-weight: 400;
+      font-size: 36px;
+      color: #FFFFFF;
+        margin-top: 20px;
+      width: 100%;
+      height: 250px;
+      background-color: #d5065d;
+      .num{
+        font-family: DIN;
+        font-weight: 400;
+        font-size: 50px;
+        color: #00FFCC;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/components/BgBcpm/environmentalB/bgleft/css/index.less b/src/components/BgBcpm/environmentalB/bgleft/css/index.less
index e4f7883..80983bc 100644
--- a/src/components/BgBcpm/environmentalB/bgleft/css/index.less
+++ b/src/components/BgBcpm/environmentalB/bgleft/css/index.less
@@ -223,7 +223,7 @@
         color: white;
         padding-top: 20px;
         div{
-            width: 33%;
+            width: 50%;
             display: flex;
             justify-content: center;
             align-items: center;
diff --git a/src/components/BgBcpm/environmentalB/bgleft/index.vue b/src/components/BgBcpm/environmentalB/bgleft/index.vue
index 27726ac..a2e1bd5 100644
--- a/src/components/BgBcpm/environmentalB/bgleft/index.vue
+++ b/src/components/BgBcpm/environmentalB/bgleft/index.vue
@@ -145,7 +145,7 @@
         <div class="qcHeader">
           <div>国控点/市控点</div>
           <div>生态敏感区</div>
-          <div>水源地</div>
+<!--          <div>水源地</div>-->
         </div>
         <div class="gcqd">
           <div class="gcqdContent flex spaceBetween">
@@ -160,7 +160,7 @@
                 <div class="gcqdItem flex itemsCenter ">
                   <img class="gcqdflagImg" src="@/assets/bdscreenImg/bBg/qcqdflag1.png"/>
                   <div class="gcqdText" :style="{color:item.type==0?'red':'yellow'}">
-                    {{ item.text ? item.text.slice(0, 16) : '' }}
+                    {{ item.text.slice(0, 30) }}
                   </div>
                 </div>
               </el-tooltip>
@@ -178,19 +178,19 @@
               >
                 <div class="gcqdItem flex itemsCenter ">
                   <img class="gcqdflagImg" src="@/assets/bdscreenImg/bBg/qcqdflag1.png"/>
-                  <div class="gcqdText" style="color:#46f0fc">{{ item.text.slice(0, 16) }}</div>
+                  <div class="gcqdText" style="color:#46f0fc">{{ item.text.slice(0, 30) }}</div>
                 </div>
               </el-tooltip>
             </div>
           </div>
-          <div class="gcqdContent flex spaceBetween">
-            <div class="gcqdItemWrap" v-for="(item,i) in []" :key="i">
-              <div class="gcqdItem flex itemsCenter ">
-                <img class="gcqdflagImg" src="@/assets/bdscreenImg/bBg/qcqdflag1.png"/>
-                <div class="gcqdText">{{ item.text }}</div>
-              </div>
-            </div>
-          </div>
+<!--          <div class="gcqdContent flex spaceBetween">-->
+<!--            <div class="gcqdItemWrap" v-for="(item,i) in []" :key="i">-->
+<!--              <div class="gcqdItem flex itemsCenter ">-->
+<!--                <img class="gcqdflagImg" src="@/assets/bdscreenImg/bBg/qcqdflag1.png"/>-->
+<!--                <div class="gcqdText">{{ item.text }}</div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </div>-->
         </div>
       </template>
       <template v-slot:content v-else>
diff --git a/src/components/BgBcpm/environmentalB/bgright/index.vue b/src/components/BgBcpm/environmentalB/bgright/index.vue
index c84a931..265e1d5 100644
--- a/src/components/BgBcpm/environmentalB/bgright/index.vue
+++ b/src/components/BgBcpm/environmentalB/bgright/index.vue
@@ -105,7 +105,7 @@
                 <img src="@/assets/bdscreenImg/webpoint/tz.png" alt="">
           
                   <div style="margin-left: 18px">
-                    {{item.name.slice(0,22)}}
+                    {{item.name}}
                   </div>
              
               </div>
@@ -127,24 +127,24 @@
           <div class="zbjjdContent flex itemsCenter justifyCenter" @click="hbsbwttjFun2">
             <div class="bgImg">
               <div style="position: absolute;left: 278px;top: 40px">六氟化硫</div>
-              <div style="position: absolute;left: 120px;top: 220px">完成</div>
+              <div style="position: absolute;left: 120px;top: 220px">回收量</div>
               <div style="position: absolute;left: 120px;top: 340px;"><span style="color: #00C6FF;font-family: DIN;
 font-weight: 400;
-font-size: 60px;">100</span>
+font-size: 60px;">0</span>
                 &nbsp;<span style="color: #99A0A9">吨</span>
               </div>
               <div style="position: absolute;left: 480px;top: 220px;">回收率</div>
               <div style="position: absolute;left: 480px;top: 340px;color: #00C6FF">
                 <span style="color: #00C6FF;font-family: DIN;
 font-weight: 400;
-font-size: 60px;">100</span>
+font-size: 60px;">0</span>
                 &nbsp;<span style="color: #99A0A9;">%</span>
               </div>
               <div style="position: absolute;left: 1100px;top: 40px">危废处置</div>
               <div style="position: absolute;left: 1100px;top: 110px">
                 <span style="color: #F58161;font-family: DIN;
 font-weight: 400;
-font-size: 60px;">50</span>
+font-size: 60px;">0</span>
                 &nbsp;&nbsp;
                 <span
                     style="font-family: Microsoft YaHei;
@@ -157,7 +157,7 @@ color: #99A0A9;">吨</span>
               <div style="position: absolute;left: 1750px;top: 110px">
                   <span style="color:#00FFCC ;font-family: DIN;
 font-weight: 400;
-font-size: 60px;">10</span>
+font-size: 60px;">5</span>
                 &nbsp;&nbsp;
                 <span
                     style="font-family: Microsoft YaHei;
@@ -170,7 +170,7 @@ color: #99A0A9;">项</span>
               <div style="position: absolute;left: 1100px;top: 320px">
                       <span style="color: #FFD378;font-family: DIN;
 font-weight: 400;
-font-size: 60px;">10</span>
+font-size: 60px;">0</span>
                 &nbsp;&nbsp;
                 <span
                     style="font-family: Microsoft YaHei;
@@ -182,7 +182,7 @@ color: #99A0A9;">项</span>
               <div style="position: absolute;left: 1750px;top: 320px">
                       <span style="color: #B244C6;font-family: DIN;
 font-weight: 400;
-font-size: 60px;">10</span>
+font-size: 60px;">0</span>
                 &nbsp;&nbsp;
                 <span
                     style="font-family: Microsoft YaHei;
@@ -243,8 +243,10 @@ color: #99A0A9;">项</span>
         </div>
       </template>
     </diyTable>
+    <FilePreview ref="filePreviewModel"  :filePreviewUrl="url" @hideClose="close" :extenson="extenson" />
 
   </div>
+
 </template>
 
 <script setup name="environmentalBbgright">
@@ -253,16 +255,14 @@ import {onMounted, ref, reactive} from "vue";
 import * as echarts from 'echarts'
 import popover from '../../../common/popover'
 import diyTable from '@/components/common/diytable/index'
-import { selHbsbwttjqk,selZbjjdhfwcqk,selHbsbcssslswcqk,hsbTooltip,selZccx } from '@/api/pageB/environmental/index'
+import { selHbsbwttjqk,selZbjjdhfwcqk,selHbsbcssslswcqk,hsbTooltip,selZccx ,selTzyj} from '@/api/pageB/environmental/index'
 import useAppStore from '@/store/modules/app'
 const store = useAppStore();
 let onOff = ref(false)
 
 let zclist=ref([])
 onMounted(()=>{
-  selZccx().then(res=>{
-    console.log(res)
-  })
+  setWttjType(0)
 })
 // 环水保措施设施落实完成情况
 let hsblsColumnProps = ref([
@@ -390,6 +390,12 @@ const setWttjType = (setValue) => {
       zclist.value=res.data
     })
   }
+  if(setValue=='0'){
+    selTzyj().then(res=>{
+      console.log(res)
+      zclist.value=res.data
+    })
+  }
   // getSelHbsbwttjqk();
 }
 let wttjData = ref({})
@@ -482,17 +488,38 @@ const hbsbwttjFun=()=>{
   }
 
 }
+const filePreviewModel=ref(null)
+const url=ref('')
+const close=()=>{
+  window.URL.revokeObjectURL(url.value);
+}
+const extenson=ref('');
+
+//预览
 const openPdf=(item)=>{
-  console.log(item)
   getOne(item.id).then(res=>{
-    const file =[]
-    file.push(res)
-    var pdfUrl =window.URL.createObjectURL(new Blob(file,{type:'application/pdf'}));
-    if(pdfUrl){
-      handlePrint(pdfUrl)
-    }
+    extenson.value = '.' + item.name.split('.').pop();
+    const blob = new Blob([res]);
+    url.value = window.URL.createObjectURL(blob);
+    filePreviewModel.value.open();
   })
 }
+// const close=()=>{
+//   window.URL.revokeObjectURL(url.value);
+// }
+
+// const openPdf=(item)=>{
+//   console.log(item)
+//   getOne(item.id).then(res=>{
+//     const file =[]
+//     file.push(res)
+//     var pdfUrl =window.URL.createObjectURL(new Blob(file,{type:'application/pdf'}));
+//     // window.open(pdfUrl)
+//     // if(pdfUrl){
+//     //   handlePrint(pdfUrl)
+//     // }
+//   })
+// }
 const handlePrint=(pdf)=> {
   if (document.getElementById("print-iframe")) {
     document.body.removeChild(document.getElementById("print-iframe"));
@@ -640,12 +667,11 @@ const net=(item)=>{
   width: 1200px ;
 }
 .tzyj{
-  width: 2028px ;
-  height: 430px;
-  margin-top: 20px;
+  width: 100% ;
+  height: 421px;
   display:flex;
   flex-wrap: wrap;
-  align-content: space-between;
+  align-content: flex-start;
   overflow-y: scroll;
   scrollbar-width: none;
   /* 滚动条整体 */
@@ -654,20 +680,26 @@ const net=(item)=>{
   }
   .tcItem{
     width: 50%;
-    height: 87px;
+    height: 103px;
     overflow: hidden;
-    padding-left: 20px;
+    margin-top: 10px;
     font-family: Microsoft YaHei;
     font-weight: 400;
-    font-size: 36px;
     color: #FFFFFF;
+    display: flex;
+    padding-left: 100px;
     .conItem{
       width: 90%;
       height: 100%;
       display: flex;
       justify-content: flex-start;
       align-items: center;
-
+      white-space: nowrap; /* 防止文本换行 */
+      overflow: hidden; /* 隐藏超出部分 */
+      text-overflow: ellipsis; /* 显示省略号 */
+      padding: 5px; /* 可选：添加内边距 */
+      font-size: 36px;
+  
     }
     img {
       width: 64px;
diff --git a/src/components/BgBcpm/materialsB/bgcenter/css/index.less b/src/components/BgBcpm/materialsB/bgcenter/css/index.less
index 5376877..c5a2f13 100644
--- a/src/components/BgBcpm/materialsB/bgcenter/css/index.less
+++ b/src/components/BgBcpm/materialsB/bgcenter/css/index.less
@@ -15,7 +15,7 @@
     .databoard{
       position: absolute;
       right: 42px;
-      z-index: 10000;
+      z-index: 500;
       top: -864px;
       background-color: rgba(12, 15, 16, 0.5);
       width: 451px;
diff --git a/src/components/BgBcpm/materialsB/bgcenter/index.vue b/src/components/BgBcpm/materialsB/bgcenter/index.vue
index 6c01574..57445ca 100644
--- a/src/components/BgBcpm/materialsB/bgcenter/index.vue
+++ b/src/components/BgBcpm/materialsB/bgcenter/index.vue
@@ -1,7 +1,10 @@
 <template>
     <div class="jsyl-map" @click="istableShow=false">
       <div class="customtable" v-show="istableShow">
-        <diyTableMap></diyTableMap>
+        <diyTableMap
+            @emitClick="emitClick"
+          :tableData="tableData"
+        ></diyTableMap>
 <!--        <el-table :data="tableData" style="width: 100%">-->
 <!--          <el-table-column prop="date" label="Date" width="150" />-->
 <!--          <el-table-column label="Delivery Info">-->
@@ -180,75 +183,38 @@
         </div>
         </div>
     </div>
+  <el-dialog  style="transform: translate(-1600px,90px);background-color: transparent"   v-model="wzybz" @close="wzybzClose" :showClose="false" :close-on-click-modal="true" :close-on-press-escape="false">
+    <diyTable :columnProps="wzybzProps"
+              @close="dialogClose"
+              :ispagion="true"
+              :title="kTitle"
+              :tableData="kgList"
+              :pagionProp="pagionProp"
+              @currentChange="currentChange"
+              v-model:dialogShow="wzybz"
+    >
+    </diyTable>
+    
+    
+    <!--      <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%">-->
+    <!--        <el-table-column prop="materialNumber" label="物料编号" width="180"></el-table-column>-->
+    <!--        <el-table-column prop="shortText" label="短文本" width="180"></el-table-column>-->
+    <!--        &lt;!&ndash; 其他列 &ndash;&gt;-->
+    <!--        <el-table-column prop="otherField1" label="其他字段1" width="180"></el-table-column>-->
+    <!--        <el-table-column prop="otherField2" label="其他字段2" width="180"></el-table-column>-->
+    <!--      </el-table>-->
+  </el-dialog>
 
 </template>
 <script setup>
 import diyTableMap from '@/components/common/diyTableMap'
 import {reactive, ref, defineEmits, onMounted, watch} from "vue";
-import {selGsYsJs, selZlgkdt, selZnXmJsSg} from "../../../../api/centerMap";
+import {selGsYsJs, selZlgkdt, selZnXmJsSg,oneAccountMaterialsForBuildUnitCode} from "../../../../api/centerMap";
 const emit=defineEmits(['update:message','goA', 'goC','goB'])
+import diyTable from '@/components/common/diytable/indexCopy'
 
 
-let tableData=reactive([
-
-  {
-    date: '2016-05-03',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-  },
-  {
-    date: '2016-05-02',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-  },
-  {
-    date: '2016-05-04',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-  },
-  {
-    date: '2016-05-08',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-  },
-  {
-    date: '2016-05-06',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-  },
-  {
-    date: '2016-05-07',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-  },
-
-])
+let tableData=ref([])
 
 let mapIem=['baodi','beichen','binghaixinqu','dongli','jizhou','wuqing','jinghai','xiqing','jinnan','ninghe','tianjin']
 let toMap={}
@@ -298,7 +264,96 @@ const closeTable=()=>{
   closeTable
 })
 
+let prjCode=ref('')
+const emitClick=(item)=>{
+  console.log(item,'首都奥的')
+  prjCode.value=item.prjCode
+  openWzybz()
+}
+
+let wzybz=ref(false)
+const wzybzClose=()=>{
+  wzybz.value=false
+}
+const wzybzProps = [
+  {label: "物料号", prop: "materialNumber", minWidth: "180px"},
+  {label: "物料描述", prop: "materialDescription", minWidth: "120px"},
+  {label: "设计数量", prop: "num", minWidth: "100px"},
+  {label: "单位", prop: "unit", minWidth: "120px"},
+  {label: "采购总量", prop: "purchaseTotal", width: "200px"},
+  {label: "采购误差检验", prop: "procurementErrorInspection", minWidth: "100px"},
+  {label: "采购误差值", prop: "procurementErrorNum", minWidth: "100px"},
+  {label: "采购数量", prop: "quantity", minWidth: "100px"},
+  
+  {label: "采购单位", prop: "baseUnitOfMeasure", minWidth: "100px"},
+  
+  {label: "采购申请号行号", prop: "purchaseRequestNumberAndLineItemNumber", minWidth: "100px"},
+  {label: "采购订单号行号", prop: "purchaseDocumentNumberAndItemNumber", minWidth: "70px"},
+  {label: "厂家名称", prop: "supplierName", minWidth: "100px"},
+  {label: "计划采购进度", prop: "plannedProcurementProgress", minWidth: "100px"},
+  {label: "实际采购进度", prop: "actualProcurementProgress", minWidth: "100px"},
+  {label: "进度预警", prop: "progress", minWidth: "100px"},
+];
+const dialogClose= () => {
+  wzybz.value = false;
+}
+let kTitle=ref('物资一本账')
+const kgList = ref([])
+const pagionProp = ref({})
+let pageNum=ref(1)
+const currentChange = (val) => {
+  pageNum.value = val
+  queryList()
+}
+import { ElLoading } from 'element-plus'
+import {oneAccountMaterials} from "../../../../api/pageC/sbd";
+let loadingInstance = ref(null)
+const queryList=()=>{
+  oneAccountMaterials({
+    pageNum: pageNum.value,
+    pageSize: 10,
+  },{
+    projectDefinition:prjCode.value
+  }).then(res=>{
+    console.log(res,'一本账')
+    kgList.value=res.rows
+    console.log('进来合并0')
+  })
+}
+const openWzybz=()=>{
+  loadingInstance.value = ElLoading.service({
+    fullscreen: true
+  })
+  oneAccountMaterials({
+    pageNum: pageNum.value,
+    pageSize: 10,
+  },{
+    projectDefinition:prjCode.value
+  }).then(res=>{
+    console.log('进来合并01')
+    
+    console.log(res,'一本账')
+    kgList.value=res.rows
+    wzybz.value = true;
+    loadingInstance.value.close()
+    loadingInstance.value=null
+  },err=>{
+    loadingInstance.value.close()
+    loadingInstance.value=null
+  })
+}
+
+
 let igMouseOver=(pay,e)=>{
+  console.log(pay)
+  if(pay=='ig_js'){
+    oneAccountMaterialsForBuildUnitCode({
+      "buildUnitCode":"0301"
+    }).then(res=>{
+      tableData.value=res.rows
+      console.log(tableData.value)
+    })
+  }
   istableShow.value=true
   return
   console.log(centerMap)
@@ -457,4 +512,5 @@ const goPage=(item)=>{
 
 <style lang="less" scoped>
 @import "./css/index.less";
+
 </style>
diff --git a/src/components/BgCcpm/sbd/bgright/index.vue b/src/components/BgCcpm/sbd/bgright/index.vue
index 1dd84c4..605f93c 100644
--- a/src/components/BgCcpm/sbd/bgright/index.vue
+++ b/src/components/BgCcpm/sbd/bgright/index.vue
@@ -418,13 +418,12 @@ const wzybzProps = [
   
   {label: "采购单位", prop: "baseUnitOfMeasure", minWidth: "100px"},
   
-  {label: "采购批次", prop: "procurementBatch", width: "150px"},
   {label: "采购申请号行号", prop: "purchaseRequestNumberAndLineItemNumber", minWidth: "100px"},
   {label: "采购订单号行号", prop: "purchaseDocumentNumberAndItemNumber", minWidth: "70px"},
   {label: "厂家名称", prop: "supplierName", minWidth: "100px"},
   {label: "计划采购进度", prop: "plannedProcurementProgress", minWidth: "100px"},
-  {label: "系统采购进度", prop: "actualProcurementProgress", minWidth: "100px"},
-  {label: "进度预计", prop: "progress", minWidth: "100px"},
+  {label: "实际采购进度", prop: "actualProcurementProgress", minWidth: "100px"},
+  {label: "进度预警", prop: "progress", minWidth: "100px"},
 ];
 const dialogClose= () => {
   wzybz.value = false;
diff --git a/src/components/common/diyTableMap/index.vue b/src/components/common/diyTableMap/index.vue
index 4ef3c55..fa7a33b 100644
--- a/src/components/common/diyTableMap/index.vue
+++ b/src/components/common/diyTableMap/index.vue
@@ -3,8 +3,8 @@
       <div class="tableContent">
         <el-table :data="props.tableData" :cell-class-name="cellClassnameFun"
                   :height="1100"
+                  @row-click="emitClick"
                   :header-cell-class-name="headerCellclassnameFun" class="transparent-table">
-     
           <tableColumn v-for="(item,i) in props.columnProps" :key="i" :columnOptions="item">
           </tableColumn>
           <!--      <el-table-column v-for="item in columnProps" :prop="item.prop" :label="item.label">-->
@@ -72,10 +72,14 @@ onMounted(()=>{
   console.log($attrs.pagionProp,'prop' )
 })
 const store = useAppStore();
-const emits = defineEmits(['close'])
+const emits = defineEmits(['close','emitClick'])
 const dialogClose = ()=>{
   emits('close')
 }
+const emitClick=(item)=>{
+  console.log('emitClick',item)
+  emits('emitClick',item)
+}
 const props = defineProps({
   title:"123",
   size:"large",
@@ -85,24 +89,24 @@ const props = defineProps({
     type: Array,
     default:
       [
-      {prop: 'date', label: '建设单位'},
-      {prop: 'date', label: '工程名称'},
+      {prop: 'buildUnitName', label: '建设单位'},
+      {prop: 'prjName', label: '工程名称'},
       {
         label: '计划申报阶段', children: [
-          {prop: 'name', label: '未审批数量'},
-          {prop: 'name', label: '未审批数量'},
-          {prop: 'name', label: '未审批数量'},
-          {prop: 'name', label: '未审批数量'},
+          {prop: 'jhsbjd_wspsl', label: '未审批数量'},
+          {prop: 'jhsbjd_tjgsscsl', label: '天津公司审查数量'},
+          {prop: 'jhsbjd_dsgssc/lksl', label: '地市公司审查/利库数量'},
+          {prop: 'jhsbjd_gwgsscsl', label: '国网公司审查数量'},
         ]
       },
       {
         label: '招标采购阶段', children: [
-          {prop: 'name', label: '发布招标\n' +
+          {prop: 'zbcgjd_fbzbggsl_all', label: '发布招标' +
                 '公告数量'},
-          {prop: 'name', label: '评标中数量'},
-          {prop: 'name', label: '发布中标\n' +
+          {prop: 'zbcgjd_pbzsl', label: '评标中数量'},
+          {prop: 'zbcgjd_fbzbggsl', label: '发布中标' +
                 '公告数量'},
-          {prop: 'name', label: '生成订单/签\n' +
+          {prop: 'zbcgjd_scdd/qdhtsl', label: '生成订单/签' +
                 '订合同数量'},
         ]
       },
@@ -118,17 +122,17 @@ const props = defineProps({
       // },
       {
         label: '运输配送阶段', children: [
-          {prop: 'name', label: '通知发货数量'},
-          {prop: 'name', label: '正在运输的\n' +
+          {prop: 'yspsjd_tzfhsl', label: '通知发货数量'},
+          {prop: 'yspsjd_zzyssl', label: '正在运输的' +
                 '数量'},
-          {prop: 'name', label:'已完成运输数量'},
+          {prop: 'yspsjd_ywcyssl', label:'已完成运输数量'},
         ]
       },
       {
         label: '入账结算阶段', children: [
-          {prop: 'name', label: '入账数量'},
-          {prop: 'name', label: '未入账数量'},
-          {prop: 'name', label: '剩余转入其\n' +
+          {prop: 'rzjsjd_rzsl', label: '入账数量'},
+          {prop: 'rzjsjd_wrzsl', label: '未入账数量'},
+          {prop: 'rzjsjd_syzrqtgcsl', label: '剩余转入其' +
                 '他工程数量'},
         ]
       },
diff --git a/src/components/common/diyTableMap/tableColumn.vue b/src/components/common/diyTableMap/tableColumn.vue
index 777a6f5..bd0b54f 100644
--- a/src/components/common/diyTableMap/tableColumn.vue
+++ b/src/components/common/diyTableMap/tableColumn.vue
@@ -1,20 +1,35 @@
 <template>
   <!-- width="880" -->
-  <el-table-column :label="columnOptions.label" :prop="columnOptions.prop" align="center">
+  <el-table-column :label="columnOptions.label" :prop="columnOptions.prop" align="center" >
     <template v-slot:header>
-      <span v-if="columnOptions.label === '投产时间'">
+             <span v-if="columnOptions.label === '投产时间'">
         {{ columnOptions.label }}&nbsp;&nbsp;&nbsp;&nbsp;<popover :content="production"></popover>
       </span>
-      <span v-else>
+        <span v-else>
         {{ columnOptions.label }}
       </span>
+    
     </template>
    <!-- 如果有子列，递归渲染子列 -->
-   <template v-if="columnOptions.children">
+   <template v-if="columnOptions.children" #default="scope">
       <tableColumn v-for="item in columnOptions.children" :key="item.prop" :column-options="item" />
     </template>
+    
   </el-table-column>
-  
+<!--  -->
+<!--  <template  v-if="columnOptions.children">-->
+<!--    <el-table-column :label="columnOptions.label" :prop="columnOptions.prop" align="center" >-->
+<!--      <tableColumn v-for="item in columnOptions.children" :key="item.prop" :column-options="item"/>-->
+<!--    </el-table-column>-->
+<!--  </template>-->
+<!--  <template  v-else>-->
+<!--    <el-table-column :label="columnOptions.label" :prop="columnOptions.prop" align="center">-->
+<!--      <template #default="scope">-->
+<!--        <div @click="emitClick(scope)">{{scope.row[columnOptions.prop]}}</div>-->
+<!--      </template>-->
+<!--    </el-table-column>-->
+<!--  </template>-->
+<!--  -->
 </template>
 
 <script>
@@ -28,5 +43,11 @@ export default {
 </script>
 <script setup>
 let production=ref('列表还包括:当年下达投资、本年累计完成投资。')
+const emits=defineEmits([
+    'emitClick'
+])
+const emitClick=(scoped)=>{
+  console.log(scoped,'scoped')
+}
 </script>
 
diff --git a/src/components/common/diytable/indexCopy.vue b/src/components/common/diytable/indexCopy.vue
index 157b0d2..cd63bde 100644
--- a/src/components/common/diytable/indexCopy.vue
+++ b/src/components/common/diytable/indexCopy.vue
@@ -473,7 +473,7 @@ let getSpanCount = (rowIndex, columnIndex) => {
 
 .dialogTable{
   position: absolute;
-  z-index:10000;
+  z-index:1000;
   left: 0%;
   top:15%;
   width: 7000px;
diff --git a/src/router/index.js b/src/router/index.js
index bf65b4f..135b94f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -980,18 +980,7 @@ export const constantRoutes = [
         name: 'threeMap',
         meta: { title: '三维地图', icon: 'time' }
       },
-      {
-        path: 'wzdr',
-        component: () => import('@/views/pages/dataService/wzzysjdr'),
-        name: 'wzdr',
-        meta: { title: '物资专业数据导入', icon: 'time' }
-      },
-      {
-        path: 'wzdrxq',
-        component: () => import('@/views/pages/dataService/wzdrxq'),
-        name: 'wzdrxq',
-        meta: { title: '物资详情', icon: 'time' }
-      },
+
     ]
   },
   //环保专业
@@ -1020,6 +1009,32 @@ export const constantRoutes = [
     ]
   },
 
+  //环保专业
+  {
+    path: '/wzzy',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    meta: {
+      title: '物资专业',
+      icon: 'l-gw-nocheck'
+    },
+    children: [
+      {
+        path: 'wzdr',
+        component: () => import('@/views/pages/dataService/wzzysjdr'),
+        name: 'wzdr',
+        meta: { title: '物资一本账', icon: 'time' }
+      },
+      {
+        path: 'wzdrxq',
+        component: () => import('@/views/pages/dataService/wzdrxq'),
+        name: 'wzdrxq',
+        meta: { title: '物资详情', icon: 'time' }
+      },
+    ]
+  },
+
   // 国网综合考核指标
 
   // {
diff --git a/src/views/pages/dataService/wzzysjdr.vue b/src/views/pages/dataService/wzzysjdr.vue
index 6c36564..9951bab 100644
--- a/src/views/pages/dataService/wzzysjdr.vue
+++ b/src/views/pages/dataService/wzzysjdr.vue
@@ -45,7 +45,8 @@
 <!--            <el-button type="primary">选取文件</el-button>-->
 <!--          </template>-->
 <!--        </el-upload>-->
-        <el-button type="success" @click="isOpenDialog=true">上传</el-button>
+        <el-button type="success" @click="isOpenDialog=true">设计上传</el-button>
+        <el-button type="success" @click="isOpenDialog=true">物资上传</el-button>
       
       </el-form-item>
       
diff --git a/src/views/pages/warning/setting.vue b/src/views/pages/warning/setting.vue
index 663258c..df9b70d 100644
--- a/src/views/pages/warning/setting.vue
+++ b/src/views/pages/warning/setting.vue
@@ -89,10 +89,10 @@ border-radius: 6px;background-color: #fff;">
             <el-table-column label="智能预警规则"  width="400" align="center" prop="warningRule" >
               <template #default="scope">
                 <div style="display: flex;align-items: center;justify-content:space-between;">
-                  
-                 <span style="width:337px;text-align:center;">{{ scope.row.warningRule }}</span> 
+                 
+                 <span style="width:337px;text-align:center;">{{ scope.row.warningRule }}</span>
                  <span style="cursor: pointer;margin-left: 10px;"><Edit @click="editChange(scope.row.id)" style="width: 1.5em; height: 1.5em; margin-right: 8px" /></span>
-                  
+                 
                 </div>
               </template>
             </el-table-column>
@@ -114,7 +114,7 @@ border-radius: 6px;background-color: #fff;">
         />
 
 </div>
-     
+  
   <el-dialog v-model="dialogVisible" width="50%" title="查看图片">
    <div style="width:100%;height:500px;">
     <img style="width:100%;height:100%;object-fit: contain;" :src="imaUrl" alt="">
@@ -127,7 +127,7 @@ border-radius: 6px;background-color: #fff;">
     </template>
     <div class="visible-box">
          <div class="vis-top">
-            <p style="display:flex;align-items:center;justify-content:start;padding-bottom:10px;border-bottom:2px solid #eeeeee"> 
+            <p style="display:flex;align-items:center;justify-content:start;padding-bottom:10px;border-bottom:2px solid #eeeeee">
                 <div style="width:6px;height:27px;background:#409eff;margin-right:4px;"></div>
                 <span>基本信息</span>
             </p>
@@ -160,7 +160,7 @@ border-radius: 6px;background-color: #fff;">
                   </el-radio-group>
                   </el-form-item>
                 <el-form-item label="回执人" prop="username">
-                      <el-select style="width:100%;" v-model="yzForm.receipt" placeholder="请选择回执人">
+                      <el-select style="width:100%;" v-model="yzForm.receiptUser" placeholder="请选择回执人">
                         <el-option
                           v-for="item in user"
                           :label="item.name"
@@ -169,7 +169,7 @@ border-radius: 6px;background-color: #fff;">
                         </el-option>
                       </el-select>
                 </el-form-item>
-                <p style="display:flex;align-items:center;justify-content:start;padding-bottom:10px;border-bottom:2px solid #eeeeee"> 
+                <p style="display:flex;align-items:center;justify-content:start;padding-bottom:10px;border-bottom:2px solid #eeeeee">
                 <div style="width:6px;height:27px;background:#409eff;margin-right:4px;"></div>
                 <span>预警设置</span>
             </p>
@@ -231,7 +231,7 @@ border-radius: 6px;background-color: #fff;">
             </el-form>
             
          </div>
-         <div class="vis-bottom"></div>   
+         <div class="vis-bottom"></div>
             </div>
   </el-drawer>
 </div>
@@ -253,6 +253,7 @@ const yzForm=ref({
   majorName:'',//专业名称
   warningName:'',//预警名称
   receipt:'',//回执人
+  receiptUser:'',//回执人
   notificationType:['系统通知','推送大屏'],//通知方式
   state:'',//启动状态
   radio:'1',
@@ -294,7 +295,7 @@ const week=ref(
   label:'星期日',//
   value:7
 }
-]  
+]
 )
 const hours=ref(
 [{
@@ -387,7 +388,7 @@ const hours=ref(
   label:'24',//
   value:24
 }
-]  
+]
 )
 
 const imaUrl=ref('')
@@ -443,13 +444,15 @@ if(yzForm.value.notificationType.length==1){
 }else{
   yzForm.value.notificationType='0,1'
 }
+  console.log(yzForm.value,'yzForm.value')
+
   yzEdit(yzForm.value).then(res=>{
     if(res.code==200){
       proxy.$modal.msgSuccess('修改成功')
       visible.value=false
       queryList()
     }
-  }) 
+  })
 }
 
 
@@ -525,7 +528,7 @@ onMounted(()=>{
   userList();
   store.setPalteId('', false);
 })
-     
+
 </script>
 <style scoped lang="less">
 /deep/ .el-input{