diff --git a/src/api/wzybz/index.js b/src/api/wzybz/index.js
new file mode 100644
index 0000000..98f6b97
--- /dev/null
+++ b/src/api/wzybz/index.js
@@ -0,0 +1,21 @@
+import {$get,$post,$getBlob,$postBlob} from '@/utils/requestHook'
+
+export const recordList=(pay1,payload)=>{
+    return $post(`/zhOneAccountMaterials/recordList?pageNum=`+pay1.pageNum+`&pageSize=`+pay1.pageSize, payload)
+}
+
+export const getPrjList=()=>{
+    return $post(`/zhOneAccountMaterials/getPrjList`)
+}
+
+export const importCm=(payload)=>{
+    return $post(`/zhOneAccountMaterials/importOneAccountMaterialsDesign`,payload)
+}
+
+export const deleteitem=(deleteitem)=>{
+    return $post(`/zhOneAccountMaterials/delete?projectDefinition=`+deleteitem)
+}
+
+export const zhOneMaterialAccountList=(pay1,pay)=>{
+    return $post(`/zhOneAccountMaterials/zhOneMaterialAccountList?pageNum=`+pay1.pageNum+`&pageSize=`+pay1.pageSize,pay)
+}
diff --git a/src/assets/bdscreenImg/bc7000.png b/src/assets/bdscreenImg/bc7000.png
new file mode 100644
index 0000000..e5e23d8
Binary files /dev/null and b/src/assets/bdscreenImg/bc7000.png differ
diff --git a/src/assets/bdscreenImg/webpoint/hsbyd.png b/src/assets/bdscreenImg/webpoint/hsbyd.png
new file mode 100644
index 0000000..f0e5d01
Binary files /dev/null and b/src/assets/bdscreenImg/webpoint/hsbyd.png differ
diff --git a/src/assets/bdscreenImg/webpoint/tz.png b/src/assets/bdscreenImg/webpoint/tz.png
new file mode 100644
index 0000000..5e51258
Binary files /dev/null and b/src/assets/bdscreenImg/webpoint/tz.png differ
diff --git a/src/components/BgAcpm/bgleft/index.vue b/src/components/BgAcpm/bgleft/index.vue
index 3e9009d..52722b2 100644
--- a/src/components/BgAcpm/bgleft/index.vue
+++ b/src/components/BgAcpm/bgleft/index.vue
@@ -294,7 +294,7 @@
       </template>
       <template v-slot:rightTit>
         <div @click="goB('hbzy')">
-          环保咨询
+          环保监督
         </div>
 <!--        &nbsp;&nbsp;&nbsp;-->
 <!--        <div @click="goB('hbzhzx')">-->
diff --git a/src/components/BgBcpm/environmentalB/bgleft/index.vue b/src/components/BgBcpm/environmentalB/bgleft/index.vue
index 3552f63..e406eed 100644
--- a/src/components/BgBcpm/environmentalB/bgleft/index.vue
+++ b/src/components/BgBcpm/environmentalB/bgleft/index.vue
@@ -167,7 +167,7 @@
             </div>
           </div>
           <div class="gcqdContent flex spaceBetween">
-            <div class="gcqdItemWrap" v-for="(item,i)  in reDataArrstmgq" :key="i">
+            <div class="gcqdItemWrap" v-for="(item,i)  in reDataArrstmgq" :key="i" @click="openDiaologShowImg(item)">
   
               <el-tooltip
                   popper-class="popperClass"
@@ -468,25 +468,25 @@ const getEPPrjistInfo = () => {
     reData.value = [...gkd.value, ...skd.value].filter(item => {
       return item.text != null
     })
-    reDataArr.value = reData.value.slice(index, index + 3)
-    reDataArrstmgq.value = stmgq.value.slice(index, index + 3)
+    reDataArr.value = reData.value
+    reDataArrstmgq.value = stmgq.value
     console.log(reData.value, '总')
-    setTimer.value = setInterval(() => {
-      let result = reData.value.slice(index, index + 3);
-      let result1 = stmgq.value.slice(index, index + 3);
-      if (result.length < 3) {
-        result = result.concat(reData.value.slice(0, 3 - result.length));
-      }
-      if (result1.length < 3) {
-        result1 = result1.concat(stmgq.value.slice(0, 3 - result1.length));
-      }
-      console.log(result, '定时');
-      reDataArr.value = result
-      reDataArrstmgq.value = result1
-      console.log(reDataArr.value[0])
-      index = (index + 3) % reData.value.length;
-      index1 = (index1 + 3) % stmgq.value.length;
-    }, 3000);
+    // setTimer.value = setInterval(() => {
+    //   let result = reData.value.slice(index, index + 3);
+    //   let result1 = stmgq.value.slice(index, index + 3);
+    //   if (result.length < 3) {
+    //     result = result.concat(reData.value.slice(0, 3 - result.length));
+    //   }
+    //   if (result1.length < 3) {
+    //     result1 = result1.concat(stmgq.value.slice(0, 3 - result1.length));
+    //   }
+    //   console.log(result, '定时');
+    //   reDataArr.value = result
+    //   reDataArrstmgq.value = result1
+    //   console.log(reDataArr.value[0])
+    //   index = (index + 3) % reData.value.length;
+    //   index1 = (index1 + 3) % stmgq.value.length;
+    // }, 3000);
   })
 
 
@@ -631,6 +631,7 @@ let setGcList = (value) => {
 const prjCodeByHuanBaoWin = ref('')
 let showImage=ref(false)
 const openDiaologShowImg=(item)=>{
+  console.log(item)
   showImage.value = true
   // prjCodeByHuanBaoWin.value = item.code
   prjCodeByHuanBaoWin.value = item.text
diff --git a/src/components/BgBcpm/environmentalB/bgright/css/index.less b/src/components/BgBcpm/environmentalB/bgright/css/index.less
index 02a9e0c..6dc85a4 100644
--- a/src/components/BgBcpm/environmentalB/bgright/css/index.less
+++ b/src/components/BgBcpm/environmentalB/bgright/css/index.less
@@ -185,9 +185,14 @@
             .bgImg{
                 width: 2028px;
                 height: 430px;
-                //background-image: url('@/assets/bdscreenImg/bBg/zbbg.png');
+                background-image: url('@/assets/bdscreenImg/webpoint/hsbyd.png');
                 background-size: contain;
                 position: relative;
+                font-family: Microsoft YaHei;
+                font-weight: bold;
+                font-size: 36px;
+                color: #FFFFFF;
+                line-height: 48px;
                 #myVideo{
                     position: absolute;
                     right: 0;
diff --git a/src/components/BgBcpm/environmentalB/bgright/index.vue b/src/components/BgBcpm/environmentalB/bgright/index.vue
index eda0a3b..d3ecf36 100644
--- a/src/components/BgBcpm/environmentalB/bgright/index.vue
+++ b/src/components/BgBcpm/environmentalB/bgright/index.vue
@@ -77,20 +77,25 @@
     <BbgCpm style="height:608px;">
       <template v-slot:leftTit>
         <div style="width: 900px">
-          环保水保问题统计情况
+          环水保信息发布
         </div>
       </template>
       <template v-slot:rightTit>
         <div>
-          <span :class="wttjType=='0'?'titleColor1':'titleColor2'" @click="setWttjType('0')">环保</span>
+          <span :class="wttjType=='0'?'titleColor1':'titleColor2'" @click="setWttjType('0')">通知预警</span>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <span :class="wttjType=='1'?'titleColor1':'titleColor2'" @click="setWttjType('1')">水保</span>
+          <span :class="wttjType=='1'?'titleColor1':'titleColor2'" @click="setWttjType('1')">政策查询</span>
           &nbsp;&nbsp;&nbsp;&nbsp;
         </div>
       </template>
       <template v-slot:content>
         <div class="hsbpfqk" @click="hbsbwttjFun1">
-          <div class="hsbpfqkContent flex itemsCenter justifyCenter"  ref="hsbpfqkdom">
+<!--          <div class="hsbpfqkContent flex itemsCenter justifyCenter"  ref="hsbpfqkdom">-->
+<!--          </div>-->
+          <div class="tzyj">
+            <div class="tcItem" v-for="item in 12">
+              <img src="@/assets/bdscreenImg/webpoint/tz.png" alt="">
+            </div>
           </div>
         </div>
       </template>
@@ -98,39 +103,54 @@
     <BbgCpm style="height:608px;">
       <template v-slot:leftTit>
         <div style="width: 900px">
-          植被及迹地恢复完成情况
-          <popover :content="zbjdtip"></popover>
+          环水保月度完成情况
+<!--          <popover :content="zbjdtip"></popover>-->
         </div>
       </template>
       <template v-slot:content>
         <div class="zbjjd">
           <div class="zbjjdContent flex itemsCenter justifyCenter" @click="hbsbwttjFun2">
             <div class="bgImg">
-              <video id="myVideo" loop autoplay muted>
-                <source src="../../../../assets/bdscreenImg/bBg/zbbg.mp4" type="video/mp4">
-                Your browser does not support HTML5 video.
-              </video>
-              <div class="one absolute tc">
-                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_jhhfs}}</div>
-                <div class="zbjjdDec">计划恢复</div>
-              </div>
-              <div class="two absolute tc">
-                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_whfs}}</div>
-                <div class="zbjjdDec">未恢复</div>
-              </div>
-              <div class="three absolute tc">
-                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_hfdshs}}</div>
-                <div class="zbjjdDec">恢复待审核</div>
-              </div>
-              <div class="four absolute tc">
-                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_hfytgs}}</div>
-                <div class="zbjjdDec">恢复已通过</div>
-              </div>
-              <div class="five absolute tc">
-                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_hfwtgs}}</div>
-                <div class="zbjjdDec">恢复未通过</div>
-              </div>
+              <div style="position: absolute;left: 300px;top: 40px">六氟化硫</div>
+              <div style="position: absolute;left: 120px;top: 220px">完成</div>
+              <div style="position: absolute;left: 120px;top: 340px">100吨</div>
+              <div style="position: absolute;left: 480px;top: 220px">回收率</div>
+              <div style="position: absolute;left: 480px;top: 340px">100%</div>
+              <div style="position: absolute;left: 1100px;top: 40px">危废处置</div>
+              <div style="position: absolute;left: 1100px;top: 110px">50吨</div>
+              <div style="position: absolute;left: 1750px;top: 40px">投诉处置</div>
+              <div style="position: absolute;left: 1750px;top: 110px">10项</div>
+              <div style="position: absolute;left: 1100px;top: 250px">环境监测</div>
+              <div style="position: absolute;left: 1100px;top: 320px">10项</div>
+              <div style="position: absolute;left: 1750px;top: 250px">外部检查</div>
+              <div style="position: absolute;left: 1750px;top: 320px">10项</div>
             </div>
+<!--            <div class="bgImg">-->
+<!--              <video id="myVideo" loop autoplay muted>-->
+<!--                <source src="../../../../assets/bdscreenImg/bBg/zbbg.mp4" type="video/mp4">-->
+<!--                Your browser does not support HTML5 video.-->
+<!--              </video>-->
+<!--              <div class="one absolute tc">-->
+<!--                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_jhhfs}}</div>-->
+<!--                <div class="zbjjdDec">计划恢复</div>-->
+<!--              </div>-->
+<!--              <div class="two absolute tc">-->
+<!--                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_whfs}}</div>-->
+<!--                <div class="zbjjdDec">未恢复</div>-->
+<!--              </div>-->
+<!--              <div class="three absolute tc">-->
+<!--                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_hfdshs}}</div>-->
+<!--                <div class="zbjjdDec">恢复待审核</div>-->
+<!--              </div>-->
+<!--              <div class="four absolute tc">-->
+<!--                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_hfytgs}}</div>-->
+<!--                <div class="zbjjdDec">恢复已通过</div>-->
+<!--              </div>-->
+<!--              <div class="five absolute tc">-->
+<!--                <div class="zbjjdNum">{{zbjjdhfwcqkData.zbjjdhfwcqk_hfwtgs}}</div>-->
+<!--                <div class="zbjjdDec">恢复未通过</div>-->
+<!--              </div>-->
+<!--            </div>-->
           </div>
         </div>
       </template>
@@ -506,8 +526,37 @@ const net=(item)=>{
 // }
 
 </style>
-<style>
+<style lang="less">
 .dialogTable .topHeader .option{
   width: 1200px ;
 }
+.tzyj{
+  width: 2028px ;
+  height: 430px;
+  margin-top: 20px;
+  background-color: #ff461d;
+  display:flex;
+  flex-wrap: wrap;
+  align-content: space-between;
+  overflow-y: scroll;
+  scrollbar-width: none;
+  /* 滚动条整体 */
+  ::-webkit-scrollbar {
+    display: none;
+  }
+  .tcItem{
+    width: 50%;
+    height: 87px;
+    overflow: hidden;
+    border: 1px skyblue solid;
+    padding-left: 20px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    img {
+      width: 64px;
+      height: 63px;
+    }
+  }
+}
 </style>
diff --git a/src/components/BgCcpm/sbd/bgright/index.vue b/src/components/BgCcpm/sbd/bgright/index.vue
index abd5470..d1bdf1d 100644
--- a/src/components/BgCcpm/sbd/bgright/index.vue
+++ b/src/components/BgCcpm/sbd/bgright/index.vue
@@ -247,7 +247,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog style="transform: translate(-600px,150px)"  v-model="wzybz" @close="wzybzClose" :showClose="false" :close-on-click-modal="true" :close-on-press-escape="false">
+    <el-dialog style="transform: translate(-1600px,-100px)"  v-model="wzybz" @close="wzybzClose" :showClose="false" :close-on-click-modal="true" :close-on-press-escape="false">
       <diyTable :columnProps="wzybzProps"
                 @close="dialogClose"
                 :ispagion="false"
@@ -275,7 +275,7 @@ const $store = useAppStore();
 import { getPicInfo } from '@/api/pageB/environmental/index'
 import {prjInfo,oneAccountMaterials} from '../../../../api/pageC/sbd'
 //物资一本账
-import diyTable from '@/components/common/diytable/index'
+import diyTable from '@/components/common/diytable/indexCopy'
 let kTitle=ref('物资一本账')
 let wzybz=ref(false)
 const kgList = ref([])
@@ -307,7 +307,7 @@ const wzybzProps = [
   {label: "厂家名称", prop: "cjmc", minWidth: "100px"},
   {label: "采购误差检验", prop: "cgwcjy", minWidth: "100px"},
   {label: "计划采购进度", prop: "jhcgjd", minWidth: "100px"},
-  {label: "系统采购进度", prop: "xtcgjd", minWidth: "100px"},
+  {label: "实际采购进度", prop: "xtcgjd", minWidth: "100px"},
   {label: "进度预警", prop: "juyj", minWidth: "100px"},
 ];
 const dialogClose= () => {
@@ -322,7 +322,7 @@ const getprjInfo=()=>{
   prjInfo(appStore.currentJumpInfo.prjCode).then(res=>{
     console.log(res,'项目工程列表1')
     infoData.value=res.data
-    showStatus.value =  (/南麻|北马|望都/).test(infoData.value.prjName)
+    showStatus.value =  (/武清北马庄220千伏输变电工程|天津北辰南麻瘩220kV输变电工程|宝坻望都220kV输变电工程/).test(infoData.value.prjName)
     console.log(showStatus.value,'匹配')
   })
 }
@@ -719,7 +719,7 @@ watch(currentJumpInfo,(a,b)=>{
 }
 .imageShow{
   width: 3900px;
-  height: 2000px;
+  height: 1700px;
   background-image: url("@/assets/images/tcdt1.png");
   background-size: 100%;
   position:absolute ;
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index d33065b..bf2694c 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -50,7 +50,7 @@ const props = defineProps({
   // 大小限制(MB)
   fileSize: {
     type: Number,
-    default: 20,
+    default: 1300,
   },
   // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileType: {
diff --git a/src/components/common/diytable/indexCopy.vue b/src/components/common/diytable/indexCopy.vue
new file mode 100644
index 0000000..6d2c23c
--- /dev/null
+++ b/src/components/common/diytable/indexCopy.vue
@@ -0,0 +1,615 @@
+<template>
+  <div class="dialogTable">
+    <div class="topHeader">
+      <div class="title">
+        {{props.title}}
+      </div>
+      <div class="option">
+        <slot name="option"></slot>
+      </div>
+
+      <div class="close" @click="dialogClose">X</div>
+    </div>
+    <div class="tableArea">
+      <div class="tableContent">
+        <slot name="searchInput"></slot>
+        <el-table :data="props.tableData" :row-class-name="cellClassnameFun"
+        :span-method="store.useSpan?spanMethod:undefined"
+                  style="width:100%;"
+                  @row-click="rowClick"
+                  :height="props.title=='工程列表'?'90%':'100%'"
+                  :header-cell-class-name="headerCellclassnameFun" class="transparent-table">
+          <el-table-column type="index" width="160" align="center" label="序号">
+            <template #default="scope">
+              <div @click="ppp(scope)">
+                {{(currentPage*1-1)*10+(scope.$index+1)}}
+              </div>
+            </template>
+          </el-table-column>
+          <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">-->
+          <!--      </el-table-column>-->
+        </el-table>
+      </div>
+      <div class="pagi" @click="clo" v-show="props.ispagion">
+        <div class="demo-pagination-block">
+          <div class="demonstration"></div>
+          <el-pagination  @current-change="currentChange"  v-model:current-page="currentPage"   v-bind="{...pagionprops,...$attrs,...$attrs.pagionProp}"/>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+</template>
+
+<script setup>
+import {defineProps, defineEmits, onMounted,useAttrs,ref,watch,defineExpose} from 'vue';
+import tableColumn from "./tableColumn";
+import useAppStore from '@/store/modules/app'
+const $attrs =useAttrs()
+const $store =useAppStore()
+const pagionprops=ref({
+  pageSizes:[100, 200, 300, 400],
+  size:"size",
+  nextText:"下一页",
+  prevText:"上一页",
+  layout:" prev, pager, next,total, jumper",
+  total:400
+})
+const emits = defineEmits(['close','rowClick'])
+
+const rowClick=(rowInfo)=>{
+  emits('rowClick',rowInfo)
+}
+let currentPage=ref(1)
+let currentChange=(a,b)=>{
+  // console.log(a,b,'ab')
+  // currentPage.value=a
+  // emits('currentChange',a)
+}
+watch(currentPage,()=>{
+  console.log(currentPage.value,'监听')
+  emits('currentChange',currentPage.value)
+})
+
+watch(()=>props.dialogShow,()=>{
+  if(props.dialogShow==false){
+    currentPage.value=1;
+  }
+})
+
+const ppp=(pay)=>{
+  console.log(pay)
+}
+const handleSizeChange=()=>{
+  console.log(111)
+}
+const handleCurrentChange=()=>{
+  console.log(11221)
+}
+const pp=ref({
+  pageSizes:"[100, 200, 300, 400]",
+  size:"size",
+  nextText:"下一页",
+  layout:"prev, pager, next,total, jumper",
+  total:400
+})
+const clo=()=>{
+  console.log(  {...$attrs,},9999)
+  console.log(  {...$attrs.pagionProp,},9999)
+  console.log($attrs,'$attrs' )
+  console.log($attrs.pagionProp,'$attrs.pagion-rop' )
+}
+onMounted(()=>{
+  console.log($attrs,'$attrs' )
+  console.log($attrs.pagionProp,'$attrs.pagionProp' )
+  console.log($attrs.pagionProp,'prop' )
+})
+const store = useAppStore();
+const dialogClose = ()=>{
+  emits('close')
+}
+const props = defineProps({
+  title:"123",
+  size:"large",
+  dialogShow:false,
+  ispagion:true,
+  columnProps: {
+    type: Array,
+    default:
+      [
+      {prop: 'date', label: 'Date'},
+
+      {
+        label: 'Delivery Info', children: [
+          {prop: 'name', label: 'Name'},
+          {
+            prop: 'Address Info', children: [
+              {prop: 'state', label: 'State'},
+              {prop: 'city', label: 'City'},
+              {prop: 'address', label: 'Address'},
+              {prop: 'zip', label: 'Zip'},
+            ]
+          },
+        ]
+      },
+      {
+        label: 'Delivery', children: [
+          {prop: 'name', label: 'Name'},
+          {
+            prop: 'Address Info', children: [
+              {prop: 'state', label: 'State'},
+              {prop: 'city', label: 'City'},
+              {prop: 'address', label: 'Address'},
+              {
+                prop: 'zip', label: 'Zip', children: [
+                  {prop: 'state', label: 'State'},
+                  {prop: 'city', label: 'City'},
+                  {prop: 'address', label: 'Address'},
+                  {prop: 'zip', label: 'Zip'},
+                ]
+              },
+            ]
+          },
+        ]
+      },
+    ]
+  },
+  tableData: {
+    type: Array,
+    default: [
+      {
+        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',
+      },
+      {
+        date: '2016-05-07',
+        name: 'Tom',
+        state: 'California',
+        city: 'Los Angeles',
+        address: 'No. 189, Grove St, Los Angeles',
+        zip: 'CA 90036',
+      },
+    ]
+  }
+});
+
+const columnProps = ref([
+  {prop: 'date', label: 'Date'},
+
+  {
+    label: 'Delivery Info', children: [
+      {prop: 'name', label: 'Name'},
+      {
+        prop: 'Address Info', children: [
+          {prop: 'state', label: 'State'},
+          {prop: 'city', label: 'City'},
+          {prop: 'address', label: 'Address'},
+          {prop: 'zip', label: 'Zip'},
+        ]
+      },
+    ]
+  },
+  {
+    label: 'Delivery', children: [
+      {prop: 'name', label: 'Name'},
+      {
+        prop: 'Address Info', children: [
+          {prop: 'state', label: 'State'},
+          {prop: 'city', label: 'City'},
+          {prop: 'address', label: 'Address'},
+          {
+            prop: 'zip', label: 'Zip', children: [
+              {prop: 'state', label: 'State'},
+              {prop: 'city', label: 'City'},
+              {prop: 'address', label: 'Address'},
+              {prop: 'zip', label: 'Zip'},
+            ]
+          },
+        ]
+      },
+    ]
+  },
+])
+const tableData = [
+  {
+    date: 'xx',
+    name: 'Tom',
+    state: 'California',
+    city: 'Los Angeles',
+    address: 'No. 189, Grove St, Los Angeles',
+    zip: 'CA 90036',
+  },
+  {
+    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',
+  },
+  {
+    date: '2016-05-07',
+    name: 'Tom',
+    state: 'California',
+    city: 'Los Angeles',
+    address: 'No. 189, Grove St, Los Angeles',
+    zip: 'CA 90036',
+  },
+]
+
+
+const cellClassnameFun = ({row}) => {
+  console.log(row,'每一行')
+  if(row.cameraStatus&&row.cameraStatus=='0'){
+    console.log('进入')
+    return 'redClass'
+  }
+  return 'cellClassname'
+}
+const headerCellclassnameFun = () => {
+  return 'headerCellclassname'
+}
+
+//表格合并
+const spanMethod=({ row, column, rowIndex, columnIndex })=>{
+ if(store.useSpan){
+  if (columnIndex === 1) {
+        // 统计当前行的 group 分组数
+        let currentGroup = row.group;
+        let rowCount = props.tableData.filter(item => item.group === currentGroup).length;
+
+        // 如果当前行是分组的第一个元素，则返回该分组的行数，否则返回 { rowspan: 0, colspan: 0 } 来禁用合并
+        if (rowIndex === 0 || (rowIndex > 0 && props.tableData[rowIndex - 1].group !== currentGroup)) {
+          return {
+            rowspan: rowCount,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }
+      return {
+        rowspan: 1,
+        colspan: 1
+      };
+    }
+
+}
+</script>
+<style scoped lang="less">
+.tableContent{
+  /deep/.cellClassname {
+    font-family: Microsoft YaHei !important;
+    font-weight: 400 !important;
+    font-size: 35px !important;
+    color: #FFFFFF !important;
+  }
+  /deep/.redClass{
+    background-color: red!important;
+  }
+}
+
+
+.headerCellclassname {
+  font-family: Microsoft YaHei !important;
+  font-weight: bold !important;
+  font-size: 35px !important;
+  // background-color: transparent!important;
+}
+
+.dialogTable{
+  position: absolute;
+  z-index:10000;
+  left: 0%;
+  top:15%;
+  width: 7000px;
+  height: 1500px;
+  background-size: cover;
+  background-image: url("../../../assets/bdscreenImg/bc7000.png");
+  .topHeader{
+    height: 200px;
+    width: 100%;
+    position: relative;
+    //border: 1px solid firebrick;
+    .title{
+      height: 100%;
+      width: 580px;
+      position: absolute;
+      left: 80px;
+      top:20px;
+      font-size: 70px;
+      font-weight: 600;
+      //white-space: nowrap;
+      word-break: normal;
+      color: whitesmoke;
+    }
+    .option{
+      position: absolute;
+      right: 185px;
+      top:100px;
+      // width: 700px;
+      width: 100%;
+      height: 110px;
+      display: flex;
+      justify-content: flex-end;
+    }
+    .close{
+      position: absolute;
+      font-size: 50px;
+      font-weight: 500;
+      color: white;
+      right: 100px;
+      top:130px;
+      cursor: pointer;
+    }
+  }
+  .tableArea{
+    height: 1200px;
+    width: 100%;
+    padding: 20px 80px;
+    .pagi{
+      height: 10%;
+      position: absolute;
+      right: 30px;
+      bottom: 0px;
+      margin-right: 50px;
+     .el-pagination{
+        /deep/ button.btn-prev.is-first{
+            width: 140px;
+            height: 70px;
+            background-image: url("../../../assets/bdscreenImg/bBg/preNext.png");
+            background-size: 100%;
+            outline: none;
+            background-color: transparent!important;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            span{
+              font-family: Microsoft YaHei;
+              font-weight: 400;
+              font-size: 32px;
+              color: #FFFFFF;
+            }
+          }
+       /deep/ button.btn-next{
+            width: 140px;
+            height: 70px;
+            background-image: url("../../../assets/bdscreenImg/bBg/preNext.png");
+            background-size: 100%;
+            outline: none;
+            background-color: transparent!important;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            span{
+              font-family: Microsoft YaHei;
+              font-weight: 400;
+              font-size: 32px;
+              color: #FFFFFF;
+            }
+          }
+        /deep/ .el-pager{
+            margin-left: 20px;
+            margin-right: 20px;
+          }
+        }
+      /deep/ li.is-active.number{
+        background-image: url("../../../assets/bdscreenImg/bBg/isselect.png");
+      }
+      /deep/ .number, /deep/.more{
+        width: 71px;
+        height: 71px;
+        background-color: rgba(111,112,113,.5);
+        background-image: url("../../../assets/bdscreenImg/bBg/noSelect.png");
+        background-size: 100% 100%;
+        margin-left: 8px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        font-size: 32px;
+        color: #FFFFFF;
+      }
+      /deep/span.el-pagination__total{
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        font-size: 32px;
+        color: #FFFFFF;
+        margin-left: 20px;
+      }
+      /deep/span.el-pagination__jump.is-last{
+        height: 72px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        font-size: 32px;
+        color: #FFFFFF;
+        .el-input.el-input--small.el-pagination__editor.is-in-pagination{
+          height: 38px;
+          width: 75px;
+          .el-input__wrapper{
+            width: 100%;
+            height: 100%;
+            font-weight: 400;
+            font-size: 22px;
+            color: #FFFFFF;
+            background-color: transparent;
+            .el-input__inner{
+              color: #FFFFFF;
+              font-size: 28px;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.tableContent {
+  width: 100%;
+  height: 90%;
+  position: relative;
+
+  /deep/.el-table {
+    --el-table-border-color: none;
+    --el-table-tr-bg-color: transparent !important;
+    --el-table-bg-color: transparent !important;
+    --el-table-row-hover-bg-color: transparent !important;
+
+   tr td {
+      border: 2px solid rgba(85, 255, 253);
+      border-right: 2px solid rgba(85, 255, 253) !important;
+      border-left: none;
+      border-bottom: none;
+      font-weight: bold;
+      font-family: Microsoft YaHei !important;
+  font-weight: 400 !important;
+  font-size: 35px !important;
+  color: #FFFFFF !important;
+    }
+
+    tr th {
+      border: 2px solid rgba(85, 255, 253);
+      border-right: 3px solid rgba(85, 255, 253) !important;
+      border-left: none;
+      border-bottom: none;
+      background-color: transparent !important;
+      color: rgba(85, 255, 253);
+  font-family: Microsoft YaHei !important;
+  font-weight: bold !important;
+  font-size: 45px !important;
+    }
+
+   /deep/ .el-scrollbar__bar.is-vertical {
+      width: 46px;
+      opacity: 1;
+    }
+
+     .el-scrollbar__bar.is-horizontal {
+      height: 46px;
+      opacity: 1;
+    }
+  }
+  /deep/.el-table {
+    /deep/.el-table__header-wrapper,  /deep/.el-table__fixed-header-wrapper {
+      /deep/ th {
+        background-color: transparent;
+      }
+    }
+  }
+  /deep/ .el-table .cell {
+    padding: 30px 12px;
+    line-height: normal;
+  }
+  /deep/ .el-table__row:hover {
+    background-color: rgba(128, 126, 126, .4) !important;
+  }
+  /deep/ .el-table .el-table__header-wrapper th,  /deep/.el-table .el-table__fixed-header-wrapper th {
+    background-color: transparent !important;
+
+  }
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 394d601..bf65b4f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -979,7 +979,19 @@ export const constantRoutes = [
         component: () => import('@/views/pages/dataService/threeMap'),
         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' }
+      },
     ]
   },
   //环保专业
diff --git a/src/utils/request.js b/src/utils/request.js
index 84b7868..af832f7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -32,7 +32,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: import.meta.env.VITE_APP_BASE_API,
   // 超时
-  timeout: 35000
+  timeout: 120000
 })
 let whitePage=['uploadPic']
 // request拦截器
diff --git a/src/views/pages/dataService/wzdrxq.vue b/src/views/pages/dataService/wzdrxq.vue
new file mode 100644
index 0000000..f440056
--- /dev/null
+++ b/src/views/pages/dataService/wzdrxq.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="tableWrap">
+    <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">
+          <template #default="scope">
+            <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工厂"   align="center" prop="factory" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="项目定义"  align="center" prop="projectDefinition" :show-overflow-tooltip="false"/>
+        <el-table-column width="400" label="项目定义描述"  align="center" prop="projectDefinitionDescription" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="创建人"  align="center" prop="creator" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="采购申请编号"  align="center" prop="purchaseRequestNumber" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="采购申请行项目号"  align="center" prop="purchaseRequestLineItemNumber" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="物料编号"  align="center" prop="materialNumber" :show-overflow-tooltip="false"/>
+        <el-table-column width="400" label="短文本"  align="center" prop="shortText" :show-overflow-tooltip="false"/>
+        <el-table-column width="400" label="物料组"  align="center" prop="materialGroup" :show-overflow-tooltip="false"/>
+        <el-table-column label="数量"  align="center" prop="quantity" :show-overflow-tooltip="false"/>
+        <el-table-column label="基本计量单位"  align="center" prop="baseUnitOfMeasure" :show-overflow-tooltip="false"/>
+        <el-table-column label="删除标识"  align="center" prop="eDeleteFlag" :show-overflow-tooltip="false"/>
+        <el-table-column label="批准标识"  align="center" prop="approvalFlag" :show-overflow-tooltip="false"/>
+        <el-table-column label="采购凭证号"  align="center" prop="purchaseDocumentNumber" :show-overflow-tooltip="false"/>
+        <el-table-column label="采购凭证的项目编号"  align="center" prop="purchaseDocumentItemNumber" :show-overflow-tooltip="false"/>
+        <el-table-column label="凭证日期"  align="center" prop="documentDate" :show-overflow-tooltip="false"/>
+        <el-table-column label="删除标识（备用）"  align="center" prop="eDeleteFlag2" :show-overflow-tooltip="false"/>
+        <el-table-column label="价格（不含税）"  align="center" prop="priceExcludingTax" :show-overflow-tooltip="false"/>
+        <el-table-column label="税率"  align="center" prop="taxRate" :show-overflow-tooltip="false"/>
+        <el-table-column label="含税总价"  align="center" prop="totalPriceIncludingTax" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="供应商名称"  align="center" prop="supplierName" :show-overflow-tooltip="false"/>
+        <el-table-column label="联系人"  align="center" prop="contactPerson" :show-overflow-tooltip="false"/>
+        <el-table-column label="联系方式"  align="center" prop="contactInformation" :show-overflow-tooltip="false"/>
+        <el-table-column label="收货时间"  align="center" prop="receivingTime" :show-overflow-tooltip="false"/>
+        <el-table-column label="已收货数量"  align="center" prop="receivedQuantity" :show-overflow-tooltip="false"/>
+        <el-table-column label="交货已完成标识"  align="center" prop="deliveryCompletedFlag" :show-overflow-tooltip="false"/>
+        <el-table-column label="技术变更单号"  align="center" prop="technicalChangeOrderNumber" :show-overflow-tooltip="false"/>
+        <el-table-column label="技术变更累计金额变更比例"  align="center" prop="cumulativeAmountChangeRatioTechnical" :show-overflow-tooltip="false"/>
+        <el-table-column label="商务变更单号"  align="center" prop="commercialChangeOrderNumber" :show-overflow-tooltip="false"/>
+        <el-table-column label="商务变更累计金额变更比例"  align="center" prop="cumulativeAmountChangeRatioCommercial" :show-overflow-tooltip="false"/>
+        <el-table-column label="入账数量"  align="center" prop="accountedQuantity" :show-overflow-tooltip="false"/>
+        <el-table-column label="利库方案"  align="center" prop="inventorySolution" :show-overflow-tooltip="false"/>
+        <el-table-column label="数量（备用）"  align="center" prop="quantity2" :show-overflow-tooltip="false"/>
+        <el-table-column label="批号"  align="center" prop="batchNumber" :show-overflow-tooltip="false"/>
+        <el-table-column label="转换后的批次"  align="center" prop="convertedBatchNumber" :show-overflow-tooltip="false"/>
+        <el-table-column label="不含税总价"  align="center" prop="totalPriceExcludingTax" :show-overflow-tooltip="false"/>
+        <el-table-column width="300" label="对向工程定义"  align="center" prop="oppositeProjectDefinition" :show-overflow-tooltip="false"/>
+        <el-table-column width="400" label="对向工程描述"  align="center" prop="oppositeProjectDescription" :show-overflow-tooltip="false"/>
+<!--        <el-table-column label="创建时间"  align="center" prop="createTime" :show-overflow-tooltip="false"/>-->
+<!--        <el-table-column label="更新时间"  align="center" prop="updateTime" :show-overflow-tooltip="false"/>-->
+      </el-table>
+      <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="pageNo"
+          v-model:limit="pageSize"
+          @pagination="getCmListFun"
+      />
+    </div>
+  
+  </div>
+</template>
+
+<script setup name="dataService">
+// import { zhOneMaterialAccountList } from '@/api/wzybz'
+import {defineProps, onMounted, ref} from 'vue';
+import {useRoute} from "vue-router";
+import {zhOneMaterialAccountList} from "../../../api/wzybz";
+const { proxy } = getCurrentInstance();
+
+const props = defineProps({
+  pageType: String,
+  moduleName: String,
+});
+
+let loading = ref(false)
+let tableData = ref([])
+let total = ref(0)
+let pageNo = ref(1)
+let pageSize = ref(10)
+let selectName = ref('')
+let upLoadname=ref  ('')
+let isOpenDialog =ref(false)
+// 获取列表数据
+
+const route=useRoute()
+let getList = () => {
+  loading.value = true
+  
+  zhOneMaterialAccountList({
+    pageSize:pageSize.value,
+    pageNum:pageNo.value,
+  },{
+    projectDefinition: history.state.prjId,
+  }).then(res=>{
+    console.log(res)
+    loading.value = false
+    tableData.value = res.rows
+    total.value = res.total
+    // pageNo.value = res.data.current
+  })
+}
+onMounted(()=>{
+  console.log(history.state)
+  getList()
+})
+
+
+
+</script>
+<style scoped lang="less">
+.tableWrap{
+  padding: 20px;
+}
+.queryRef{
+  display: flex;
+  align-items: center;
+}
+.labelItem {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%; /* 设置高度为父容器的高度 */
+}
+.el-upload {
+  display: inline-block;
+}
+
+.el-button {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/pages/dataService/wzzysjdr.vue b/src/views/pages/dataService/wzzysjdr.vue
new file mode 100644
index 0000000..6c36564
--- /dev/null
+++ b/src/views/pages/dataService/wzzysjdr.vue
@@ -0,0 +1,447 @@
+<template>
+  <div class="tableWrap">
+    <el-form class="queryRef"  ref="queryRef" :inline="true" style="position: relative;padding: 20px; box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+             border-radius: 6px;background-color: #fff;margin-bottom: 20px">
+      <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
+        <!--        <el-input-->
+        <!--            v-model="name"-->
+        <!--            placeholder="请输入名称"-->
+        <!--            clearable-->
+        <!--            style="width: 200px"-->
+        <!--            @keyup.enter="handleQuery"-->
+        <!--        />-->
+        <!--  -->
+        <el-select
+            v-model="selectName"
+            filterable
+            placeholder="请输入名称"
+            style="width: 500px"
+        >
+          <el-option
+              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>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <el-form-item class="ei" style="position: absolute;right: 0px">
+        <!--            <el-button type="primary" icon="UploadFilled" @click="importData">导入</el-button>-->
+<!--        <el-upload-->
+<!--            ref="upload"-->
+<!--            action=""-->
+<!--            :auto-upload="false"-->
+<!--            :on-change="handleFileChange"-->
+<!--            :before-upload="beforeUpload"-->
+<!--            accept=".xls,.xlsx"-->
+<!--            :show-file-list="false"-->
+<!--        >-->
+<!--          <template #trigger>-->
+<!--            <el-button type="primary">选取文件</el-button>-->
+<!--          </template>-->
+<!--        </el-upload>-->
+        <el-button type="success" @click="isOpenDialog=true">上传</el-button>
+      
+      </el-form-item>
+      
+    </el-form>
+    <el-dialog v-model="isOpenDialog" width="30vw" @close="closeDialog">
+      <div style="height: 300px">
+      <el-form      style="position: relative;padding: 20px;
+                     box-shadow: 0px 0px 8px 1px rgba(180, 190, 199, 0.5);
+                     border-radius: 6px;background-color: #fff;margin-bottom: 20px">
+          <el-form-item label="工程名称：" prop="name" label-position="left" class="labelItem">
+            <!--        <el-input-->
+            <!--            v-model="name"-->
+            <!--            placeholder="请输入名称"-->
+            <!--            clearable-->
+            <!--            style="width: 200px"-->
+            <!--            @keyup.enter="handleQuery"-->
+            <!--        />-->
+            <!--  -->
+            <el-select
+                v-model="upLoadname"
+                clearable
+                filterable
+                placeholder="请输入名称"
+                style="width: 500px"
+            >
+              <el-option
+                  v-for="item in prjOptions"
+                  :key="item.code"
+                  :label="item.value"
+                  @click.native="setSelectItemUpload(item)"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="ei" style="display: flex;justify-content: flex-start">
+            <!--            <el-button type="primary" icon="UploadFilled" @click="importData">导入</el-button>-->
+            <div>
+              <el-upload
+                  ref="upload"
+                  action=""
+                  :auto-upload="false"
+                  :on-change="handleFileChange"
+                  :before-upload="beforeUpload"
+                  accept=".xls,.xlsx"
+                  :show-file-list="true"
+                  :limit="1"
+              >
+                <template #trigger>
+                  <el-button type="primary">选取文件</el-button>
+                </template>
+                <el-button  style="transform: translateY(-1px)"  type="primary" @click="submitUpload">上传到服务器</el-button>
+              </el-upload>
+            </div>
+           
+            <template #tip>
+              <div class="el-upload__tip text__red">
+                限制文件上传数量为1
+              </div>
+            </template>
+          </el-form-item>
+  
+        </el-form>
+      </div>
+    
+    </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">
+          <template #default="scope">
+            <span>{{(pageNo - 1) *pageSize + scope.$index + 1}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工程名称"   align="center" prop="projectDefinitionDescription" :show-overflow-tooltip="false"/>
+        <el-table-column label="工程编码"  align="center" prop="projectDefinition" :show-overflow-tooltip="false"/>
+        <el-table-column label="更新时间"  align="center" prop="updateTime" :show-overflow-tooltip="false"/>
+        <el-table-column label="操作" align="center"
+                         width="170"
+                         fixed="right"
+                         :show-overflow-tooltip="false" >
+          <template #default="scope">
+            <div style="display:flex;justify-content: center;">
+              <el-button
+                  type="primary"
+                  link
+                  @click="editFun(scope.row)"
+              >详情</el-button>
+              <el-button
+                  type="primary"
+                  link
+                  @click="saveFun(scope.row)"
+              >删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="pageNo"
+          v-model:limit="pageSize"
+          @pagination="getCmListFun"
+      />
+    </div>
+  
+  </div>
+</template>
+
+<script setup name="dataService">
+import { recordList,getPrjList,importCm,deleteitem } from '@/api/wzybz'
+import {defineProps, onMounted, ref} from 'vue';
+const { proxy } = getCurrentInstance();
+
+const props = defineProps({
+  pageType: String,
+  moduleName: String,
+});
+
+let loading = ref(false)
+let tableData = ref([])
+let total = ref(0)
+let pageNo = ref(1)
+let pageSize = ref(10)
+let selectName = ref('')
+let upLoadname=ref  ('')
+let isOpenDialog =ref(false)
+const closeDialog=()=>{
+  upLoadname.value=''
+  selectItemUpload.value={
+    value:'',
+    code:''
+  }
+  
+}
+import { useRoute,useRouter} from 'vue-router'
+const router=useRouter()
+const route=useRoute()
+// 编辑
+let editFun = (rowData) => {
+  router.push({
+    name:'wzdrxq',
+    state:{
+      prjId:rowData.projectDefinition,
+    }
+  })
+  // rowData.isEdit = false
+  //跳转
+}
+// 开关
+let rowOpenFun=(rowData) => {
+  saveFun(rowData)
+}
+//导入数据
+const importData=()=>{
+
+}
+const setName=(payload)=>{
+  console.log(payload)
+  let result;
+  switch (payload) {
+    case '0':
+      result = '综合';
+      break
+    case '1':
+      result =  '专业';
+      break
+    case '2':
+      result =  '工程';
+      break
+  }
+  return result
+}
+//导出数据
+import {encrptfun,decrptfun} from "@/utils/request.js";
+
+const exportData=()=>{
+  exportDataApi({
+    "pageType": props.pageType, //页面（0综合看板,1专业看板,2工程看板）
+    "moduleName": props.moduleName, //专业名称
+    "condition": name.value //模糊条件
+  }).then(response=>{
+    let a = decrptfun('4D68D20BDF1B0450F54380FAD06C415EDCC5956564BE821C751C4C1CDAC402CBF8339A62210BA6BD111570721DE1F03B31374B225486ECB60B09FB0F61644D79B6B02132711FD489718EFEECF7C6357E71C72A8C4F15F91957431EA7ED938603E63BD151218D7613D54D2C161470E7037B5057FCF6DF09D2B8AE79AC4F5BCDD6CEA46D8B2657BF85A9EA9B90932DCD28357D6558F0D39744649D1D18A42E130D97323463060FF9C6591CC783AF86D09D454CB27852C84D8D6633D6BC4175AC47410652A259CA1D95F4C1DE71AB3CF0CCA0BF077082DBCC45A794F3BB162E9D116C2738A9B0932D5A51667050EAAEF64636EAC9170DF9AAADAB099294653A9982C082815DF02A4793F4ACBB8AE621A79363D296A28C618109B00527F8CFFB64A45131E03521AA8545AEA02028F912E94962F30AF1693053B1238A19409415DB955B7213B5395CDCA252A4D0FCB2AE15DBA1D0982CB8A00E8B8E64D5D2548C5AE2C903862585087D51C87D92B4B97E6459018420D7A19386AE7963B0C90B8331B0259872770B2F546AF9555795BF051A5622B89092104EB816AABF1E970ABF984DC6678FCBBF138A5C00FB10FD68CCFA80FFE9867C82703F25B9BF55AB4B339C320801D694E39300ADEF643F0D70E49AB164E676778041E80108C81844C9FB23F291D08E8BB9DAB673EA20DB68954BF731B22E51F17E60BEE4A64599A700249A944EFD1F5A1EE8A17288A4F80368FEBB3C4D887725A2A4FAD8446299FBBF9F013B37E78AD0A2E20AD4ADF513B2FF294ED1AC850E524423F5D77BD197D1159A68CFF3E9E071154C96B35DF11FF7C4EAF61D21C6E40A00E5A876878FBBE0BCB0DBE5591B72DD3C69EE0EFFA0CEF9B8410E2A3CC1C97E75AF98813FAA3B35D4A5E27DF322E7E73414AA6B78C8FC50DC07C6EC72D6C414DD2A0250C58059BD3C55F40229651D9DC9561800D486DF091AFACC7199646C98D1B263DD3C407EC31F429E00E368A4A7BECA429022BB2D2487B184B2DD6416A6BFD8256E5F7266A93A84A68BB587EA130DAD039FA9A38A889004C0312F5F8AD6BEE7DB35064D0BAB05E75E72AECC8A6502469CF9726C8FDD9A60E64ED77B56C5ECD31F169D23C8B4CC30AD70C5B58F23415BE64D4A5A32FB3EAFE6FD406CD1A4268B5C84717E0A0B286C21442DAED60476A1FA29B024EA6E2835EA7E39BA07A4FAB236A7499DBA6A191978F6680B05165363C281F808CECA343D848B3B8FE67BB3D1F7D35B50118432B3E8D946AEEDF48B16C50799F2AC1BA04443AF62BB50116CF5A8B4FF27F852C2E315E6D39891B26C3D549F4EEA471C488E0CB940ECF55497B181E9FD5899D384B1BC7E29A44B685441024CC58F72D6E852815BFB07448EEC2BBF15ECD22B6CEC0E7CDD4159267F5B19821D913E68539C88352D726AFBEAAF98F3BF26A1BD5A11113A78A26BC292932A8E99013F417FD42897379EA529A6B8CDD1BB04192C0F93670D2F59D012D7DF5D858138F6E74424BF7E76756144BFB85D79ED391CB9C22A2BCAF1D9E0A80A12039684A33A450B730F8B374CFB4C4EDE19179FF7B7C49139B571A82686FBCE595686CF9F5C1F1F7EA2785F64CDDC0124FBF96C95E0B05510E178959F6BE3F4BB8591E1F50BA30892E58CC2C731046C6EA55A31DBBE66D115BFEE4CB2A3D46BCF856FBE717B40BAEA3D4B4F3B527540B4DD672622CDEDE4A06F860FBA392769209507A7120247760DFCDA4C8DDE8238B749D8A3B2C52F9F1EC7B35186C4D9C5724677CB3C4F4BF507D0CF05407443B5A7EEC6508CE07108A703448EB3AC92043F0FF32448AE87DAFDDA8E6CBA4B26ED4E9F870CACCF11A2D18A416F36D3D969A258D9D33628D7CDFCF157151E9C7964987747F0CC1EB03B0CD99DCC4FD8D4065860CE8CC49387F8B5990061B36366212737294B2F624F364A0068D15828B9FE578E0760A0410ECF6BC70147B9AE6C9AE77174D006A5D8CC9D46D0FECC3F75BE6161A08B649A54E6EDB6993AEFE3B7BC6D299F5B54FF29F0DD8A2E1C2359D7A6CF1846B4D20FF4CE4491D8A34AC3F61F556FD722EF0605BF5ECCF8757C23E7DFF3B7DF2C72640D30F53E36F467FF9F284834EB417CB797F80749D79234283D79E1FA61014A2E35B43FFBC97C41A276A1E196CCDA7DD609EE8E7A9709BE819F60CAAC985427CB88361D66AD52B9E3DEBAAE46BC2F422F05E10257BBE36E6894B0B0261D7FE7DC0D17AF4B59AEAB09A244BC1DFD1DC89FD6BA0A938B8CFAD78875DA9AE11BF27A0D005E30C3F88573A6E549932A4B947FFB9C940EAE3D62D9994BF2072172668C51BB985077FFE649A6136A6E6AA66A79DFC5880C5885A87FF772106EB566F0B2A87AB214749C38EDD9E650A70AA92A06A3550FBD2B30F2DE2B8B925DDBB6057959BECF6A503C8721B8AC44AA87E2FD875050DD0CC6497628D83C84B49BE4EA32719F39CAF1071C2D9099A206771FFCD72740C1477EC12D5DB55387F9D5A0DA75E68767DA426621364E336CBDA97EE95343A520EA1FF6CAE2057627D4A66468BC4B71EDBF297C19114B1D50A025C9C555E31462C5B58D893B5438B5A25A52F7A5AAC8ED3636CF93A7A85212587F5E28F69B901D3149E16C9C90441613442358FA3E9581458894E86FB608E339076FAFD17FD40714762FF9F0AADA5E476CEEBAFC5C111A7B14D52938D0AE5DE2896C4267FBD36ADE5F25846E75BE958A5F41846AFA4B06002F4C49D0974BBAFAAB4478E7A25F63F09CA7BA4CF5223764EFD0FFC342E97D800A170271F5DA672B4A69A4A08FC6A7BA3F43A4E89D0F85311E00347EC5B87D76CB953E8487E362F15906290A3EC6E2D2F3FD67E0533E2E4ED5FCC93F27D54DC9A1296640308E37C64FED12C498357F01CE06EC5FE21AF6537DC6E890661B3B86B62D1948CD0A6A9D7F9C0028959B4C02774C0AE529D024BA24B3848504C096B6F4AD8C604433C0C8B4268E74AF3391AE1E1930F2BAE220B08CE16C418C88FC453EDDC7C59BFF6B64F74D57AFD60146BBBC293CD529035A80D11E5C53317A7925EE4AEE90FBDB01F7E0DF204AEA97FC0C0D29E0559A705F9B0FEFA900734DB542D2CF576C48ED2536D56F70B7D0C8FD4EA9BB8EE7097BDEC8866829406F52DA6863AE5995EE44C30AD4F7F62D401285088E27298E91FB2E723BC2A7A76B3AE33E6FDB0A6F88D9B1F84F4A1107EF87E735C3AC0137D3A5355D587D3D3F152E89F92756FF24828AF12AD1E219557D0442C1C5FEF94FB4472CF9B8A5BCBB1D2C095E7EFB4A40033C31C46E509376BCABAB30E6F4D5F3B9F6409975A043304224786EF710840F799FC986FB5A88BD267CD4FD3A3134681C3344502BEF495AE096F63AE30173CCE596448D79FD9599690124A2EF7C8E73C9962516EAA608665BC7F88EEC67D6C905BD010196F94398684F9A0CE16B0E2FB282ABB8D9D8B0E1558D8EE5D2D600CD1E9F7AF78FA0B14E04EDC5446EDBBF36EF55A6C5E79E84537D7B5AEC6BBA858797B75C46AFA8B7FD474199B51FB720DA807AF501FDBB9B614CADF698D3560F8656C734AFC1E27EC69CBE97AB8D2457FFABB26807B323A721FA473D3F67FD111D98F8BE8396658C64FDC68043A1577ED0B7A7FABBAB5315EC24BA5E2B370588B94E22BB6405B70BA93ADF9A09CE331D08237575ECED71BBAB3E962A8082E7BFAEE84CB274BDD05E3B39540DD35DAD7540DA2AA6E4AC06E81B38903E2870B76019D2E57F048F976E0E31B07887802E247A266C2C424B8DE93316B9628B80143F3F13706679ABF23A70164C0E8C96FC842518D6D3B0B66265F9F0353195BFE75162D978D6C52CD19EFDD92AE552A280B7BF6BC4D49902F9FD6FE7A86A56D4E70E8AE6076D177DA15CE4DF8780478C5C9D2F81221B6D3B757895CF76A5766038AFF2D8DE7845F614CF4328CA10B315A32AC8F36B78F2A946CAFA32DF75FA1341F36CD1C428DF95EA475529B132413B108CF8D423822B524F0DDE8A91DB165D8AC92E11451742742032F79E0C1451BFBE0E6EF99CDCC9907D343FAA532A28B4C32F2553BBEF41E7FFEFEA648A75399D01167EB42D17CC654D50125CCCB38F2844003DE7A6F9899A99807CB71ACEF5C9B19CDBDDF0E8A08C26B4EF137B677487CE68E4FB67ECE619585453E79B9B6D82D5F8EC9C69DC564C6C8B944459B7D06A3B2E9530B91994F86B7C4BC4AAE0F2A2E576E66C42D6C361068E90B62A59297C7D43B8368005E5EC15D3E83D101DA70EA1AA71E38639D5AB9CDE54EB6DB214B089F9461F4F856CA23A96B6E67EEAD663FD09EC8F4C0838706F2891941C8FFA60098EA951C9FC2421A311074C44EC86AC9F69D8D9C6B2AEDAAE4ADD0A6A761A8E27984A606DE57EEA6D052967B3422D54E9A990780B1CB141F61F2D30F34F1C4B9491EC06990A2CB9158F345AADB79B08914C9A93AA75D956355F1E25490A9E2B0B257815E51391F75F5C71276DFFF3FCC6A3FFA5A52F0391387EB198B188E60980097FC21F82ED1CB1EF82D486745408637E11D0031357FEC81F067543B9079044C1EDC6BEE51B805C1B4DD8B96A7140EFD9B462142988758BBC1D3BFCFC60053B0CC7BC0B560219B7A7CEE988DE28AEAA023CE33E5080E6FA5B2278C16DCCD5C29FF6C3D5371F96896604BAE127C2C928D8DC339722C6DC18F6ED6ED467256AFBE72FA7C6491CDE98E9D159F947BB03B00FB193C71010A400AAE0A48F2519E942DFD649CB67785F397DF38CCCFB0A59C040F92D3AF7AEB3B5CE2D905219591EB1B983B3A2CCAD7031E4A5B160E2460E5729E9AB1E78034F8FBD9894AF8ADB3C70913C6E100478AF393FA21A9CCEA78EED4886E072B6EC13EDA1023049A9148DF33156DB2C7A7BC9408CEEC5628A3268D7636F48AFC4EBF293F7A9CD7E68F2DDD30CC2834A658BF964C82238805B22C4357D9603A2BE6C9301298C6B61511B6FB9A3A6ED7E71AEDCDCEAA2DD7D3DFE8ABD4F4DAAA5F290608FA24C2BEC3224DB6C7492FE7AE76ACD86DE89E3C38D3D72F4E9719EDFD63551F1DB8A40683951E47074C10C369E7E58D81245348989C1D28EA113E2D5D85C4CADA076724F61E7F4F6ADDD64EF7BC3655E261705AB5A28E9479CF5F75B5CE68AEB6DC026A9A042AFF2936F516CF574B87D874CB6E0A1AE6117D9AA55C91173BA7C43B2731FBF2624162C6D90DF38CA1521198134B836A80C3CB6C161AA1752C69C6569E2DAE1B1FBC98CE6053E264E54C3B3CF1240EDA0A8EEAA05DE599423C9AE9AF4E1D166B00C2004EF0A8BBCD88CB9BBF46DB5059FD2FCB231A54B3F639666712E422E9AF5FF2B06C0FA2FC7CDFD1591B188CF2BE42EF8C3532C2CCFF783E3F3F6BC921BC576FD3A055AEA15ECE84FF3A3F494FDAFC9FDB81979E20D5DB07CB309CD6CE95D818F8F0F310D3EBB552095F7CFE125595BD1376C68B3BC8A25917F56F84F488C2D1F2091BD0E29C4ADF38E4EF1F78921C378C89AB4B026DC8E7287F494CC7F7958F819FEB0B2CECF374594A426980D903947A2E9EC44D6FFF78E201F12675415D5770BC0F94F8CFB8D07B00917BF5A7B23A91BA93E8CFD22476F02D35B01E050E9E59A8602D1079D52B32BDAABB8D67FF343AB04C66172ABE017B38675E5EEC1C1DD71B119A23E8EC127F0490D144808D15D385B30CA90A41290897472BD95403ACE0F4BB69FC5BE25F56B0EA307DAA9007F3E55EF1C19DCE9D63B7E0FC68920418B21D3E1461EC7E00EB0DC63ED4FC132EDC27ABB6F9084A599D995200A1D653C3DE1B9E6D687196C03DB69F9A38748299CDEFF41931612588FACA11D667ED7BB28BBC2EF906477EC36EABC1B05C7DA9F0777B725A57DEA774DCBEC27E598EA86B810E4655FE3302DC04A13DF6ED4BB02A6485A5EE014BE66B7097F2B21F224CDF02FE2BAA5FF032C4F2B990E5A7021D37FAF68DEC2D62AA51A91E6E796730E88EF12A0E61FADF26600509F4E6A382A7873C8F451D7AB7E3C949A964DF27C0D8DE9C13ED15FEBE9110C82A17A414A810CDD1EC5F89462AD7472A65A3F98D569F70D31413C73ACA5CF517408EE6BC70567F5BACA40C5747EB1700BD1DCFE5DD8360EC93AE4E54D91710C8D72843856B12879C135A2FD1F12C541238BE2E8EFD24F46074AD3BF7ECD6CA9C1C9BA00BE72483E6C8A983897BFD9B903E83F4FCC51D2F478DFBCA311A71747B495199B042144E5634BFC57A84ED72C5BF74330EE9DD397A213E33BAE388F4BF98D645384A9DAD5B6D2974895C92790110347F22EB7B991E6DC9D708F9EC0A9921D2CB62D174425FBDBDD55D21F491A3A6F2E2E33B9C2224D5E92ECB950E5BD4A7C036F2B59B35FF5D2FAA0EE1A7FDFA09C86E06085462DB4E5257E53A990FEEB65319B1653FCC031284DCEB55EFD50D245D8349EC0F1101195C47333AFF6D39CF475765A041D1DF9AD72086C1618AC1728DDE3BFBA3F005DD870999F8E70B398B7276CF7640F1BA3CDAC86D4204A0AF3C8D01240B690A29F7A28C331C1D039237D0E46F66BC35225CB3021A49101A39A3FDF830BFBFC4111707201E9998ED7F9DD7390C14E05A8786663A15D3B1D22FAEAA2DF851C10D73722AA0F435490B29ACB17AFDF649909310133413DAFCFD1D5ACC6D6782A73AA3CE466BAF6DBD84B07F09597F264874DCCEA84894A74CD0014E26826F03CB8F45FD95E0243FE803248B7E333840847D00D5C687A277707EE85D5581AA434014B9B45114CD31B4D223ECA0C95488F8909976F8A648816A0C2149CD57C674DEA94486D855F1034EE700FC8CF0D1EDDB7FFDD130FD910C396FB4BF56AED0D26F2204CF54DEBA84B11329B2DB2E0EBF98E446EFB2E5FD0E79CD19053DAE88108836E957B1DC6E12B29CA757DA866EFB66D7C2463002356A22BB591A123ACDC1F61346B3DC01EEA2B5A7E073CABF057505483011B929479CA5396C11C441107F8E436A29AB6648BB526D62D55EF97227B04A2A936204780C1B79B7273B0D40C037D261FB5621369BC8297304CF75E1DC9EC995BA7155BE2D6CE1C4AAC16172AE3236E5F0B3DA3F68A880874AAA5DEF0BB670EC820F65169691092430D75BDB7F955E02AB4438010E71004EB7F5642F6AAA6B90256FF54FF85CA39F409868E3CFA043AF5F957D31E01B0559A5F79BE66C08C838015D0FC25F7D8B20A963ED5F0A3807DD709EF4F65E6B8152FC961FB82F47927E5B6FA32E07DC341062FAB2608D516253BCE9FEE630C69E62E0636B8A2344DDF5A44D99BD1057900F4E7942EAB1B883175DF31A0A28FEB2BCCFD97646EB26F683A8E86BB5646A8EB7A33D36C942D5CA1A1E27835C232992D50FB5D90B8232A5A450BC23E302E0A49FA45A44CC6E3A50B6C47EE41201827E0DAF1B1D2060ACAF3506DE2ED9EE2884D85E7F18B0566B59E1A64E0AFAD7448A7CB735030CDF21CB829B4ECCB0B94EFC27D087E6D559C6B6865EED466FA795327C096A26932A83A8C409EDB6EE7D43F6F34C19EE596016B1998807617BEFAF0FA80FD5530104166A29D267583EC80C57D8905EF0F7F3D400ABDA47B054385F4D6C9D1030C68DE50707990C29EDE940F5B045E634278FC1FB20BCF4790FFA0109F90468719D9EECDDD340A6C85C8B47549B8EE3C30BFE5185F2B52EEFB30EB172BF6ADED53AF7A7A1104B15D2594DF3CD81EF9D4A06139DC45F7244AC0C3AE6B7D21897804DD7C4ADB716B2A8F0C888580B08D564D5C44E43D0E4509AD590E2C9825132B5424B8CB90798EF940DB34D842F0F88C663554EAA1E94DBF103EC275A732122A86D126360531870A7406F281635321810E07A661A89B00121C7F82DB532772E71A460A07C91E7492E45174CDAEA39BA3B34F90F5138DE37C0A1B49DE68439DF0C41DB02ECF2C252DAF1D08932DF91F497CA644FFD4385784D600E159CEC416996EC72DD90A8A7D71544C98583FB29837C0D2C1D58663B7F2E0F6C4F5912B8C4DF4B5A15E731DCF011A8AA625BBF7E5A49AAC09D16CF507925D507F824C4318C27556659D057C66587B91E92DA1AC6F7E5B15CDE4D8926F4E236DD5769BC545C6EEEB0C6F897E7C79CA4979F70C77C34F0D7093E0534A39E729BCB9A1B517820AF8A10CABD4B3040F946C7CDDF82F18AA2CACF6E07E881695671A50ADFF6C2CB3779A69909AEB1A6411E62B1E4977C61859ABBFE8739CF1D2B403D527B03240FE112AA62B878D36D8CD396FCA0E965752FB909F5B4A5C1EC71050173576078661E7F8AF843716494D970C43B9B2139F672C85B13390B988C317444B848DFCD660E1D4C0FCD5FB405593184F80B5D7395C67A41FD42CB6C48C19326BAF731D73AC18F10073F1DD75CDE4BAEF5AE9CE6FEE25ACE96A6E5B4D460659EBB5A6E6E80C40383CC8206BADB55B0B1176465B9A61A8BDBC47C4503253349566A08C3F086DCABBBE61FB6C1142631C4B15A49BC00F1A0E6551D33215BBCD0EE726E856F69C4CDFFEE1EF81C8A1F27166B853E149E35CB88EF40A8EBD6999C18DA1864B26FBE8D9699D48378FA04DADC1C052EE36AB11DED49569BF021EDD9DF9B836B63227528C5F39B99B5F28ACA8437A7E5A7394C36F2E75CB30EEEEF2DDA280F1084F428E92923BD8331685D418DAF9C542A8A9CCE374CA249381AAA385452FC1B8A705A80CDEBAD7767463E7A3A4799EE00165E68111F8B3FB038B4212F59A2E71E9B1D251DC9CDFEB25814D794699BCA343D13FC01824057DD21F09EF8DE4A09BBC1A97A9FBD5C52BFB193F59D08FF439E5E987CAC7A6BB185FA3116522A44994ADA5A79CA9E669AA4D12A59BAD1687C1A33B52F98DF24176BF56E76346086E214286EBFF057257AF292C0052DE6F3E16D18B031B9450D0D2C7E488BD080ADF089831EF728FCA77C3E751A1396B9CDAADC525A9B07E20C50F33CAFB98ED07CAE5446E374E8A1C0DF4FEBA0CD04E3F7AE4330F5E291B05B896211FA81D4A0D5795535B2F62C18C3EBCA8AE2907D8AFF6A84551640F606E4FDA3AFF396FA8351AB65263686D69FB7B6F9E4A3742B6C3FD5E7B885F302223D49586CD251A7B85C886CDF094CD9C7BA50E27ACD5654FAC9ECE52C0A50D75AC671AA5C08844417F2E5201678EA92A696D776EA23480D6F7E4A3D68F90C5A05D9C2B84038AD98B4063AC1748E2B475A710DF4D8C295610E2ACF617BF11E2247F984C88E5A4BC0B902FBDF9795461EBEBBB639BC637A2E228E70D45175D6EC0BEFFA4E9537BE9D4AC406F817109DA33F3159EB4B381C90B3D0F4EF0B92476059E702BBC3C693070079F5B079A8384E294F42D7B1F5B8920F534BD4D220BADC922555B7E0B172A454CED3EED487998BB81CA47FE9E4FB01B6B2B4A17D789395CCAC5A53DE1FAF96EB5C1B6E11014E22CC84A6C2D8E3E40299B98616A743FC227AA7990A709A9E97BCF4E5B966B7E439BFEF10EE19364D5D3451380BD7F0D974795824E45ABD1818F6C5A634B840851E8A7B5618C7B97790C1DF20952CE56994D6B2BC7CB9C308681159E5D1B999FE868D174BC79C1EEDD7223B90345D4C8B8430E7606E839FC32192D1B433510F9E861C892EF76639A5154B929B0E44089A03AE7F1C8F05C9992F2600B7778AFB6D2877B21AEA6C6CF9DDE784154D23F9E1102C567C9FB94CC7B0B750C3E9FD2E3F25E214FD8E876F9978A196A027DFEF1C419FC884934AB7567AA22A5B3D4EA4340A8179F3331EB68D2298AC63AB2E9A103B613DFF3A9E6464A8AC706D1D38389426F2EBC2CD3FF1C8593CC8D6671C0A61198C2A80FD08B8C64B45028EC395BF712E29E56B8ACD940C43A4FD8DD817C2C1A46781291B17713BEAA6AE298E2F5DE75E6B9731C16E1B8F9C7B3AE337D4125B31B4C132DE54FF92813C0147646A4B9F7DE2B3A7FBDDD095A641288A62C2C99F4E61230A920E2C1730015B8420EE853348DE8A743EE9E754F7764BCFAFAA4BA1B5D2BE099718E67E17F4621F7A18E5692E32F703F897B40FE5C2989054800454757137C95B26747348F709D5E980C56C03E442A55E97468D27FFF15A6E966BAD82B16FF243CE993D31297DD8C7EB019B42660F17D87D9D26C8F37DAD12BD255878E566363BDA3ADB8F867CE02D79436C73DFE333536F1A8C0BF66726FCC9A3724A016F0B7F4EF60BB6941AFCEC1B25CDE19733D3D39F8FC62C100E396841F0221DFF553167524FAE95C3E429B76C5B6667200283F3B91ECC76DE3228D99D80FCD9A57885823E01D452042D6B293279342DD0A4D432DA0C14DF6CE12B37F8B45B0A25C0CFDC09304739E49862134363F6D56BB212F3CF27DF65223AB8F09C62A298C9ACCF0E68F777EBFCA9292A445068FF0B263158FBB6CCE064F2C9124565BDC5F315F1F46DB76F7C822F95D20B0AA9C4F8243FBEE4E734A07E3CC46966D888D582928DB285C6C76A45E2AC39734F4118261603AAE4C67F83106DB23BCEAF48D09138596C2ED2867625A6ABF3F417B89E91EA6B26BB6A82804DD821630D2438065E28803B6AE1ED73791953F78985C1DD8501824E57565D720441A620414B88EF251EE2AB97A6D0616337CF2E7A14297E476CD30764CB6EF45FAE08A53077882AC7B503CB25E6E6E40EBA07AC136A6A0CEC8A3044A41A83F031DA3DF65D24E2374C81DA186D80431CA5B93D0404A90E2B41689542362B84BDEF132A1EA2371E32BA7F43F5FB8B1749606A5838E9A6729DD17612FC58634618BBCFD460F2984DB41794D42B9CFC3F7F4CBDB232CD78B2C2EFE7EAB682B48C99C6B9AE6827426BE47D64F9AEBF53B85E096B5661062A03A27726659B03CDB0470238A683CE348804B5E2AF11B527852CF78577417B188C9F94259305190AD0D4C21578213C9E53DBB6853B9718DE0C2B9B3959BA36CE1720568648FDBE6215091B6A929DA02B30CF10C41649ACFAC4930286C4D18BA0B1CC9C815D75B89F8F645FEBAA06AC2F8509E06587EDAB06CF8C6A4CED6991778AF27DDB9A20413D6CD56BC9B5A90B1D42B39320879F7A97BB9E5DACF5AE78A60DD675E611C04D19615138820343742C1F17F8E892B85883BD6AC170C2796DA2D5339E89F51C62E4FDB612070A1C8BEAD63A7C64FC34AC63462A0B366F5903DC0644E72130C1A41D118E18B9FFF42BE25752A1A42DA5E6F27F2CA51C21B6611108FDCA8D3F0A24738E3FE5B1DFE54719AED3AA18A3A05C7C644EFAEA0EE8965727540CDA8056EFDA17AE85BCA61347E2CA6971A124EFCF054846B93C6AE054537D487EE8A8F068F665692062BAF2E2399AC349E0227D2BEE044D28703445B9E14CAC47C7A01BC17F3AF8FA2F4FD824335630C3DFDF4C54EECAC0392B8A9FCE3E347C549C91D8B8448FF2BEA290962AF817FDED82890FD5AC86E5821E661190EDCD786A76CC47495FA57B9E83B7A99E20CFC1099D78D30EACA913BF2E2CFF05D689E6572C9492AB15FA4DDB977B6359A097E770AA7017223B86E4E755D3B0B2339403BDCAA3667F0CF4C6EDF5FBBB0C22B27E207CE6328198038811D50B99F48AC283C3FB34ECAFB82CC0668084947522788DC5590F1BA6805FB366174ABB10A6087F9B931175454EFE2C0F809BBB296D40364D75E2508A3258AF6F76321277020E19606E6D8AB486DE857BB781F34D9F6ECD19CFD6B4248EF8CCB1885970A9E6439CFD7C3C5B5EF559A1AF3D7993551EF311A31E41919C6D8BF4B2048656AA4DD7250368DB4763909A3A055E1C2862D767D37BE18E2E276A851064F7EF15F0BDE1F966DC8A2115C823D3C2251AA42EDDCCEB6686104FB5DF27E5BEABEA73F68A01A47C220F9C3B75ECCD67E6C7234E93351C43D774E74329CBDA7E7E461EB286B1EE2CD2A1AFC8FC1C14455308428BBCCA9A92826D9309BFD8C38B48801E19E4B9D0B0291507F3CAE332400D5B740C7CC39B7225F882CF3453A6A868FF65827C8686C601009E70D821C4EFB308B885047BD849A21B223B1D8FF63EEE4C4671D412867F8CB168ED02DBC6467B94005479F0C3895D73647F221B9B5A749246F64D571D6E2652A23D615DBACCC9CE11020C7BACB997F3F65B16AF6ADC93837644F40605E676EDD1FF1FF8425EADC03E8414CFA213C5048440C7730BD3BF1F315710D4A78C231BD4A09CC5E0A0871F822B9789AFF120EEDEA20F106B0C2907036AF8AF747BF02875BD226B03C54D2E558F6FFBDDCDB43CAE0CBC1435ED98CCAE3F8AE7BBE80CF1A18723535378293364EAB271B8F44F0285278507765E1A8F094A9E092B9C2076B54937E01E488E8192D41E14F7CBF9310F2269FE87DE8D51065A47F237D61B2893A1408CB5F3D749ADFA7AE88A82BE9B65CCC860C6FEAD928A2AF4EBAD7278AC2430DB74C0EB3D277AD36B926D08B43BD299F3B9018EDD20E7AAD040676AFDCA22B4DAFDF9989F20E3D34AB2C33AE9C34CA016292E6E7D084F120DC63D266AC33842E467B39193CCE6E58E28EE308730B64A38B72C407002E69D6B6D51226633F22D6352E75E52EB2A7695F7AB101A239B0E7F399577C63969789CFA3ABE725159BCAC650889131F575514F74B74A27D474AF400757BA8B6F07DA3E6E5B2588CDF65DD798ABD494D433085D1A27B077C5A3FAFEBB7B9E430D5EED99AAC3B27E82B65E1B6509A7ACF24F90E47A02F0C0A19D58FDE67FFFB873C3E687EE394F16225365D41D6DE71B3E23067D6F6E4E2520A4B874134A7B8B6C77567DC56C5EB6FA636BE2739784288FC9F8FA664B45D39A2648A0E27BADEB050E7424F04A5A892CBBDCD73F77BB325629582298E21D7DBCAC59A487C5500914C6F641B3460F211E01E59A6A598F27E87A759B7DE42FE911DD2CE6C84E0AE605803667F2748DF3AA245A50E8DDFCA477A99057779709EFB6E9BD9EE90492EE4AB935CC29BA1B62CB5ED6026E244CE0A349F85D62F657DE4D1508CA4602FCA8BD062B5A8526DA2D998ED9637BBD447ED89BC911CCC9322337B9A8E99FECCECE5268B954E08C273DE0AAB32D90F3817075A4E3417CBEAAB15369B6362824A61FB562BBF62CD03D07701B81A422B98772ADC2CB73196898B4DF0AE15DD1505C91B140A9629F95560F8C7611062DCACDE6DFE88DCB93E396B7FE0913D5EA52AE84A6CD2E8448FC1F0C6C915A4595B0AFF5186516C673DD7531A33E15F516A375AFCDA4F70270808FE3E816BA206E00A4298E85380E1B544BBD8C18CFB23A440B9CE09F21B6637F9B39AAF661EF4AD55DC070F696A010B3C71B7885AC3ACDB206475B75EBF35E03F0EB9AC5E8BA897BE5E233DAA6905C641D6A33390B1E39D23B476E9B48EEC28D6C3D1A2C20EF56F0B20115951C8EC2501DA002D401E472D990ECFD15B5FF67A61FE728E1ECE529B946EC5710E4CAE831A838341D24007ED85B3D6C16B6CE027E51900A7430BC7F2B1A210D36C67C36EE4EFE73AE410322C55626D361A266FEFE7C26B8A8E8CD3D44FB9630161C91F07C5CA6326B1E8EEFD1FCFACF08EF9506BC1B049CEE6D7B464A30838A5A7C96D2D781A0804F7634467CAFB1A35CC26026BEB5BCCF761930A2721CE3365D3F26875ADA776A89D9E4F6B4CC5A34E2351D6BF90B8E4DAB2480262A33368885A68830E769974971ED57ED4CC4E6D7E2098C19091327F96390295F7ADF2BDFA9A19026BEC8B4B570DDC260D3CE917CBD7BD5BC04E0014D39FCC2BB3C0051CD86CE9CA879AA1B9E2779D66642A3D469A94C1B576C80E4CB1166F56893600EB5F22879033F0E19518D697764E50A8A3464E7F33CAA0D29867D5F5EFD9A2C246E467BDA0829CC06640FB3474B56A49E2266920BB19B37A436C9420DB452DC9AD49C729643827069FD367837AD64160E3580349F174E1FA100E8382992E43804202237986AB29AEE20D852A0EC9917590CCBEE32CD6E1A21F7FF6FE54CC3AEDD921669A01007F936297A80B9F034CBAA6CE1AD1893FE99D82CE0FE81B1059D186866A222CC32A4AA4FD14ABB2F3E19509DD253E9E105C9EEFB1C83952D01941D1755FF2B84CE18BA616535265BBCA3A3A3D8D531C144C29BCB6FC2C3C2F34C1D3F1C3801538AF4C654F8FCD7AC362D3195DFA40E170F7AFC2762F894C2D5CBF6FD1CE81703615CB4E20A965149495674A07753C494C89576FCA08C85BDE9C9EE32F0DF8CFFA5EE72945262E3358C68B7A3E2920E9645069AA6307F06E7358AB615DD516914E34D75038680C30BE8D27E5663F835747E7A342EF6AA2E6EB2822A2CD7A465ED370EF95602C5A6429F74C5CF4969C1075518B04D65C33EB7BCB9F58FBA89165F5DF85E66FC72C2D694B9EF2D965D452DAC19F694BC7A2BF7BD09D2FDBD43BBAC58FCC4AFA0CA1785A3BF6C4716A90C4153F8639B637371198CD93D7F265E4B5A4E3D43D0C630C6B7C8434621D3359AF81D4644B4C8C5A73A1AE8CDD938CB392A92D00FD6BA688B6D97FC8F7F4241288DA8AB6B6FC2C7CA6BF7ABEA1FEE6B9E4C87223C170A802569B57E95ED2ECC857759AE15ECE93D81AA43A08CF9A3D8FB81C022C84A2BEAA85E1E98094FB9635DD725A036EC6784AA65CF0B62428308F610BB56B6C4DFE7F8C9E67CDCF26977850A24DDBCDA4316EA1ABF3072606E42366ACB3F60B0BBAF56134AF3F4FA53DD27936F11FDF56A4ED80ECB2DB9C6A8F3417A7F1E4109A5FA40D0FBB0320D767793DAAD7793C12D9606A8B4D658E8A00C2668D45AE9939D12521557BDDEB9FE8E077221B612CC9757FB1E9BB17792A50BFB281E660BDFB388D888B009CB49ACB3F1F4A3CACB84106EBE3F124E8AA40EA901CDAC4EB6D6F3B8B6B91EC142519084B4F18A0EC5339FACE3917805BE06F7EE32536AE658E38B87982ED44E51CBF1365E87B1AC2505CB98D76A7ACCA5B9A3899D52CB73567D0092D94DB781FB8E0541F68BEA364AB912A36632B72FC64F92B892C59BEB8EC518566513E5654F12DBC8C2DEF74A25E73404B38EAAAC0894BA5A4264F6675589399446D99BC4B103F2C59A2EEF22242FC4155735B4E98094C5322784EDB65B9EE686A6C6FA4AC65EE821A4B1C2A80C60A78365E0B8DF055B09669A45E27B6D484ADDF597A95D5DE4FFC5A552FF52CB081C2CA3F3C72304B39E507E6ED0EA15CCC66DE3695D480348B57969FDCE78CD712BD22E20A8F751DEB38138633A021E490C415DA0B8CB8D0E3CC127CF85DC5834B95764730BF9044889AD174E155ECE3562938E95E4D085851AA92F8876839232012C6035B8D5D2570838E3BD33CCA48C42FC914835CE5689E7B2534820F30FA999DB317BC579144B04FD8164C6FE3BB35CD733438FAC717321A3865DE6C55C0ECC37201657B2667AAF2D9A2E7A3442E3361BEB22F0ADC8A8E56C44CEB1557D599B97AF5B1743508B58C68580A4ADC32956168F99BFEB16570937633EEF8AEB0F0DC20BB5F1F5DE6567A4D7C40A13DC60E8800EE3473D4F59644538B9F6D238002AF6B409ECBEC14919F29AF6DCBAAA2CF29E08D3419D2EBD3EE859AB5533E31B9FD30CC8982E711220887AA49C1C061E0718B5F601407BF42919605EFDEB71633C040FF3A94BBD87294D462DB8D2042F4575D12B5354A03318ACD50884C1F50333619E9521F7E1DD772492BCB42DA8292A8997E58EFA53121306E62DD6E32A51629BB88070CB14EEAB0CCEC4D77FF5C702AD7E7BE0A71E611EF8ABAC93E66E25E7DC1A5B37D30A4628F21BE2B025982B15100AAF6FBBAD8D56F43B6517B7D114BD877A25BFE369C5990D71B8CB15F89ED007243BD9A8B53847AE9443606B2F1F86D63E5FB03CC3ECDEA4E9EF66E59185A0E15471FC35BE7680399F061AB2DC29415E69D0724AC2BA26271C8E1612CE750429767E3261CB56C99877B53603036A458854A2D58C48D016BD71F12AAD9E9AD54AC454A8AF76AF1A769834A298648E8EC2EE31CA9DB40C04B5AD7191AC299EDD6266AAAE12CF93997A0C3C288E1893EE7472EB5E11350A6920E64E00CCC3AC124C72C38A9C76C13F812DBF45B2DFAF44211BBAB5283D015AB612EC7AEFEB2FA9881F14DAD6414838E214F5B630E424C481D20733E2A5E44C2B1AA86D9757B94FE7EF92BB4C297C9775CA3707FA390D67995611C6F45D02AD0C6B740824A66BB1F0B3F71E789CD62B2C6510D11883D002A44349BB42C6DA876836CC1E81698746581E4F1EF79A8B8205B2BD031E78C95A3191DF3850A08021D44DF735A2E5CA80DD06724280F63C236B9DE21F0CA2A4AEAD3D94B7CDE34592A78E04B63BC4A34517322C1A88B3EA135E18AEC0BA73491E3C6270299F4B86BCFB98DC679FFB7707B59A53BF8090C3FBB9B4E98919851805BE4B60C8882B9EC6DB8395ED21C9B33502FED9ED85FF8D67FC055CA2F00D086E7549BC4FD4A8DF9DFBDD1402C387AF547525559CAE496D00D09A98E60262B3484BC5F79465603E194061D39981C3DFA15D7D41BE75A8C859CA11C0CF1ABAF0FA5FF664DD7367D5D335D7725A7B3E7B6295687A7B4D5607B665332AC1D482991117A5751A3CD3ACEAF997D35CDED2E8385239B47477977C2FD189211F58442016F2628E519DFE1AD9105B2A0A7A61393CCD631EA2C1568A0BEE910A455D2E2C93F8BACFE79039037A4EF831578C1CA17624056E5A5872CA1EEB41E774807AE6BE349195FE786FC572D17DB543F78FEAA27F9AA6417F30D0403E75A38582D0381851ACF14CEE87A2AAA0831D6DA94F334934D5A7B562AC4475DB15C7FC72A20D8EBD8C372DBB5CC8A3E52A50C3AF6CDFB074A0D32F1CBB594AD31476AA768E0AF4D2EB10B04468FCB2B759DA9A82CE06FC642C423F2CFBF2B041FCBC2186C0EF271303A5984241EA904F6A52F27E7A0A4114317A43963C4A4572595D69A26B76C8786AE5D0C0ADAEA3A6EC762FEDCF48D54DE21FE417980F42AD859384465A3257E29A99F07F6612EFF17428F429DB9AC5CC8000A2E6629652FF57B24271333A8C55783F58A4923EC6375600FF66426CAF5CEE4566261EC769D3B86D9024C3697F1629354B5E2D25CFAEC03DAEBC86A2F079B7D81DEF1372C722A7BB99DAFB87E2DF10D4B282335FA3E0FF4B2966CE5F1A86631F6146B609CBD9CBE2BADB48AB1B3BE6B10AED85C0EA8D9CD81001C828547C0404F6C69C9B92045CC31F41A75E791C93D78803C79A9D1E66EE8B22AD78489592F5F9495F7354BEB9F21963EB52D73C7CD63B777FC358197CD1BECFF1B83A90584F2A092199B05109FE6D3B7507031F94293F276A0EBE6AB3656F00EBAFDE1E61ACA8ED6A22C21FCE72415D002460133B75C851AA4506906EA86A40E943A573D2381F26C7DE11C38B93B93E34A94E06A7928B81CD832B7501E1CF248C56D9FB22955AA401204B608B07101D1439C4C7EC8FABB528E74BA66FDD5518FB6D07383F7ACECF66EE7F798E4AE8DC341D011CB7F619465ED8909AD327BC4BE2CFD8B0168F146EF4A1F7002CBA22C3C72874EEA04FEF191B8DB802196D0E0BB08A1879955C5BD2EF9084CAE7F98CB7CAFF27FA3F8C94F64601FDAB37260B9743930919E50EDCB377B7CA32B6320DA194535FB9F269B72BBDE2CB028968DD5FE601EB238E5CB9C9ABAAF1DED912E69D16EE2E863761E1006B59561794CEDF57B1AD611AF4D12410E10473011ED9E1D683FA01A165ACBA9A56705C02A221ADA06F30A2783DCA265AD4350D901DED18195556A566B81760CFD8C430AE6F9CF367EC0A9CD93966F9A7688A5321540460B27895858D43242729244E67AE8C5C7A2345EB75818EBCA1E6B1B15F599D153EDA2E0BFBA3807F2012EDF8D6057BD532AD8AB012C29E93BF24B4D2192B7378245B26EA20118E700ACA1335E567B3A920E108E10D5423DD581A412D0CCC6C97C66FB44271573CEC815217BAE15FE7250664EEB1B93CF2ECEADB9D62ED162DEAD8B1DEBFEC66345D6F38AEF40EDEFAB376C3AEEB57B76D88B1790C204990503B6EB32C0DF6EDDA5AF6918FCE310FDB177E9C3642849D4A325A2F83754A8F24BD250D24C9D78FF29582654DD29B618BAF17A7035E22AED4A363EDEB24C246A576E1DD4E5EA547565AD71106A349E461457DA2DFD497AFFF213DE51157C48CE1BE3CCBF0395BD0F86F8FA7FB21C1FD8085DA63DB9C14A18AF094F48559C35283CB241E4A8CF41A280B5D888330605A03284EA74DEF6B907F235926F085FC0EFF8CE3D34C1C9E67F001883F63EA215F0514AA893AD8667BEC4B3BB6A46D3EC85EE0832CC29EB1E4F429BF20E79F2A982DC83B34251CD685F995FE1FEE57C1497C6C570E35C859C1A7AB2CEE71AB3A96B86ED25FF34202FBD731E41E1B644601FEB84E992124AFC70A8EA1CD3A76E800D19E4F8E1E1D5F02384905EB0FFA0B1C062B754EDB5F1E84CADB538FB115A84F9294A76313FBC3F96579783735F4966A1C207B9938E30B4304757D7ADB4B339FDC387DB88B18C6700CF31ABF62A942AACCEB6585BB4ED5A439339F4FBEC74A0B72C40202BA0083EFE2A1F338D310B6450375A0D650E9943580082742A353D7B0A8D4989A4549EDB76355D28373403668759FB0D692780997D2A6CDC9596B8E7BAD6765951427F72D217F5171FD378F74E06F70A5BA31DF2964F47E4CE4622590052E4399F2F455B00E8E4FD91C9EF270AA3ED2D9A68BD70017D5E9C7B771CEC259900DC531A76BA18CB7B6BF976F369C9BDE51AEC7DE1D114B89CBA10AD57CB868036C600DBC1B3CD3CD22B8D86BC32E5362F7A0200B9338836FEEE893685D5E03A4EC412F3ACBBBE0A0D8746C1FAB02B04056C74F11A807EBFD92894FE80497A630FD3CD48C8FD51FFFF274E55C43E72BE69B29B39FCA7B9BB708F7242EEF2C8F637FF2270583806E355274FF2E49D12AF950DDA9588D2E58F689313935F1690E252617E37113E918A0F696E7DDD2A985383375A13A6767B5160E5DAA7637D02DB1C4EB990F59B6344FFFDD7D281E04D3E1B5E0F93B2B3CF128920B9D277934184D09B8361309691ABA7611D08321F59BC2DC47848680EA901EC9C36F1DB63AF2EF14126D45A380B6AFDC456DB491171E8A1EE5D0B4847E67374237878EACE0570CDCD777C8D8A6D74B966AB66AD4ECDF78F9128BCFD6FF35A480170215942DBE76280B0BA7AB97C2E438CC622717CA1D13DEDC974B211E1B05356E35B222EEA8C1F2B3A9444B88A1F66CDD4F2AC2F2BDBF9BC33F531997637B9BBB52B15E20A3EB9976A194583D70175A4CD4B0AA275BB37CF914795914606B0C700F17441427935B989E5E9B03742A213C46A9BD62E0346CAAA8209EBC5FDCD2B533B408C36447028518AA2EE6885AF3D2A08D777030C377B494A34CBD40B69C93313EBF54E3AE1FFD3D1A3212B4EBBF16A4A79A5558C9A15A3A545929B77DC6801FD96A6B720488CCBC37B65DDF8433D47D18E543C2FEC2DB6945475DBB348857195F981BFA4E81F6A6DAEA9D073564A5153A67D3525A5F5384C8C2DE53203E262BDA9E69B258FE80355339629FB7A39DFC87EF8A5074EEE6BD9DF9E89E861AE3ADD9577F3CD4B9D25C5B7D68833560A176F8A5AB80F54B3CB3F526BEB616D907F28968164DEE0F19887AF7439F2C677462FEEDB601A172B8FF4F5E0C9D6B2AA71DD03DD396123DF660AB8285449B4562D8A36BBE9CFACEEE19FE33905CDB96F57554649A53F2691384DC785F00CD4FE22E49DEAED729BA96965BB93709F4BAED184A72597DBC78C2D1476CA6D0E36FEC2F32D1DE7D2C9C6E78D0CDCEB70F8AD1D88B0CC040B613BDD3686C55C37D8892F28CC1016543E2600F3D69C9027E168EFBE7A4D61BD87BA89738A3844435226056F9BA05F59A320975EE877CAEF3F35A0188BA627AC3C6AA33C40886AFFE256D33CA2E5A30EAAAADA2D2A20770202A21E85B5F85BF126C776ABE2D9987BFE547868F6078A7916768A385B63BDED43627941563DC5F47E0B1C8FFCC35421C81BC4D977CDD861B7390ABAF337D0FD1B3FBF433277DE67F412941D4E68C2B71E6134C52B33F1566F7FE4B11544CB5B0CDC55C7D0FF62BEC9FF0EA2A1944B18B29205481905734545A9ECAF0B988C8F98A1F1F2D2A2938E81E7105E2559D46717C9A13ED56ED7FFE1D89853B3EC320A75980ABE56A3F553E10E40594CA351B386993A40612BA97A6AE392682070AC0D3A814613C24054B3F3CB6CBCAC8EB4C108E12344458F384B3FFD48C24F3A9536CC50A45B8389542A43725AEEE2CDEEDECC82BF70581887C63A42AFD101C231FE0556C2C3081DB4E5F3B97C457E5161EE909D9ACFD8A209FB1118B890892B5535867425F5D3C6945D0D739A09B08D74B4ACE6E56105B4B73D268CAA8C21C1F4F6A54F033F106D0FF4C9C90CD8C7C3ACFE78193047B2B080F2D7B665A2F6A09EC85518572649CA13EB82010587144D075C2E0C1BA8CCF318BB1A5F7BAE0A89A6F482AA8FBF8F88BA577A684F51379BBB0415B08F5773CBBE0029748B8E724590CC5DC11EF3E16593E2A8CA42362EC381A0FE2FA4C07677443F6C825F0E6793DE8F26922A2E4B32D129F2C376C4BE5EA12844F059E2FCB3F08D138AB46F1BF0151D6840A662FB7AEA0F6587ADBDF0AAAFF730C947F2C101353B7D74FDE2334697E4F42E6F89B84A7E7BECA2FB41B28F36EB4BB81DD7C8A4BC5BFEAC8C7A01F511C3DFBEEE8513FBCEC1EE296CF671B96E0C61DF1AB180328998E3187830E3105F60A50192369665CA7A685AB787EB62C37AE89B59E30299AF12D874A1B242B21C3E988C8B32CD9836F651B521C7B5E95CF87B5E03B914D1D801FFD770321C61493CE5FA19A948CBC0610192FDBE9F8F8')
+    const file = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+    const url = URL.createObjectURL(file);
+    const link = document.createElement('a');
+    link.href = url;
+    let na=setName(props.pageType)
+    link.setAttribute('download', props.moduleName+na+'.xlsx'); // 设置下载文件名
+    document.body.appendChild(link);
+    link.click();
+  })
+}
+// 查询
+const handleQuery=()=>{
+  pageNo.value=1
+  pageSize.value=10
+  getList()
+
+}
+/** 重置按钮操作 */
+const resetQuery=()=> {
+  selectItem.value={
+    name:'',
+    id:''
+  }
+  selectName.value=''
+  handleQuery();
+}
+
+// 保存
+let saveFun = (rowData) => {
+  console.log(rowData,'...')
+  deleteitem(rowData.projectDefinition).then(res=>{
+    handleQuery()
+  },error=>{
+    handleQuery()
+  })
+  
+  
+  
+  // // 前期资料移交-线路工程/变电工程/输变电工程时候需要重组数据（保存时候要重新弄成对象）
+  // if(rowData.paramName.includes('前期资料移交')){
+  //   let arr = (rowData.paramSetValueCopy).split(',')
+  //   // 根据数组长度判断是否是数组对象
+  //   if(arr.length>3){
+  //     // 是数组
+  //     var result = [];
+  //     for(var i=0;i<arr.length;i+=3){
+  //       result.push(arr.slice(i,i+3));
+  //     }
+  //     let newArr = result.map(ele=>{
+  //       return {
+  //         sj: ele[0],
+  //         jh: ele[1],
+  //         zjmc: ele[2]
+  //       }
+  //     })
+  //     rowData.paramSetValue = JSON.stringify(newArr)
+  //   }else{
+  //     // 否则就一个对象
+  //     let obj = {
+  //       zjmc: arr[0]?arr[0]:'',
+  //       jh: arr[1]?arr[1]:'',
+  //       sj: arr[2]?arr[2]:'',
+  //     }
+  //     rowData.paramSetValue = JSON.stringify(obj)
+  //   }
+  //
+  // }else{
+  //   // 正常数据
+  //   rowData.paramSetValue = rowData.paramSetValueCopy
+  // }
+  // rowData.isOpen = rowData.isOpenCopy == true?1:0
+  // rowData.isEdit = true
+
+}
+//reset
+const reset=()=>{
+  console.log('重置')
+  getList()
+}
+// 获取列表数据
+let getList = () => {
+  loading.value = true
+  recordList({
+    pageSize:pageSize.value,
+    pageNum:pageNo.value,
+  },{
+    projectName: selectName.value,
+  }).then(res=>{
+    console.log(res)
+    loading.value = false
+    tableData.value = res.rows
+    total.value = res.total
+    // pageNo.value = res.data.current
+  })
+}
+import {ElMessage} from "element-plus";
+let prjOptions=ref([])
+const getPrjListFun=()=>{
+  getPrjList().then(res=>{
+    prjOptions.value = res.data
+  })
+}
+const getCmListFun=()=>{
+  console.log(selectItem.value,'条件')
+  // if(selectItem.value.name==''||!selectItem.value.name){
+  //   return
+  // }
+  getCmList({pageSize:pageSize.value,pageNum:pageNo.value,prjName:selectItem.value.name,prjId:selectItem.value.id}).then(res=>{
+    tableData.value =res.rows.map(item=>({...item,isEdit:true}))
+    total.value=res.total
+  })
+}
+let selectOptions=ref([])
+const cmNameListFun=()=>{
+  cmNameList({prjId:selectItem.value.id??""}).then(res=>{
+    console.log(res,'下拉')
+    selectOptions.value=res.data
+  })
+}
+let selectItem=ref({
+  id:'',
+  name:''
+})
+let selectItemUpload=ref({})
+const setSelectItem=(item)=>{
+  console.log(item)
+  selectItem.value=JSON.parse(JSON.stringify(item))
+  selectName.value=item.value
+}
+const setSelectItemUpload=(item)=>{
+  console.log(item)
+  selectItemUpload.value=JSON.parse(JSON.stringify(item))
+  upLoadname.value=item.value
+}
+const upload = ref(null);
+const file = ref(null);
+
+const handleFileChange = (fileObj) => {
+  console.log(fileObj)
+  file.value = fileObj.raw;
+};
+
+const beforeUpload = (fileObj) => {
+  if (!fileObj.type.includes('application/vnd.ms-excel') && !fileObj.type.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')) {
+    alert('只能上传 .xls 或 .xlsx 文件!');
+    return false;
+  }
+  return true;
+};
+
+const submitUpload = () => {
+  if (!file.value) {
+    alert('请选择一个文件');
+    return;
+  }
+  if(!selectItemUpload.value.code){
+    ElMessage.error('请选择一个工程')
+    return;
+  }
+  
+  const formData = new FormData();
+  formData.append('file', file.value);
+  formData.append('projectDefinition', selectItemUpload.value.code);
+  // 使用 fetch 发送请求
+  importCm(formData).then(response => response)
+      .then(data => {
+        selectItemUpload.value={
+          code:'',
+          value:''
+        }
+        upLoadname.value=''
+        console.log('Success:', data);
+        // 清空文件输入框
+        upload.value.clearFiles();
+        ElMessage.success('上传成功')
+        file.value=null
+        selectItem.value.id=''
+        selectItem.value.name=''
+        selectName.value=''
+        handleQuery()
+      })
+};
+onMounted(()=>{
+  getPrjListFun()
+  // handleQuery()
+  // getList()
+  // tableData.value=[]
+  getList()
+})
+
+
+
+</script>
+<style scoped lang="less">
+.tableWrap{
+  padding: 20px;
+}
+.queryRef{
+  display: flex;
+  align-items: center;
+}
+.labelItem {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%; /* 设置高度为父容器的高度 */
+}
+.el-upload {
+  display: inline-block;
+}
+
+.el-button {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/pages/screenPage.vue b/src/views/pages/screenPage.vue
index eb84de7..ac146d2 100644
--- a/src/views/pages/screenPage.vue
+++ b/src/views/pages/screenPage.vue
@@ -244,7 +244,7 @@
           <div class="jsyl noClick" :class="isCurrent=='jsyl'?'isClick':''" @click="setBType('jsyl')">技术引领</div>
           <!--          <div class="wzzysc noClick" :class="isCurrent=='wzbase'?'isClick':''"  @click="setBType('wzbase')">物资基建侧</div>-->
           <!--                   <div class="wzzyqkj noClick" :class="isCurrent=='wzAll'?'isClick':''" @click="setBType('wzAll')">物资全口径</div>-->
-          <div class="wzzyqkj noClick" :class="isCurrent=='hbzy'||isCurrent=='hbzhzx'?'isClick':''" @click="setBType('hbzy')">环保咨询</div>
+          <div class="wzzyqkj noClick" :class="isCurrent=='hbzy'||isCurrent=='hbzhzx'?'isClick':''" @click="setBType('hbzy')">环保监督</div>
           <div class="wzzyqkj noClick" :class="isCurrent=='zjfx'?'isClick':''" @click="setBType('zjfx')">造价分析</div>
           <div class="wzzyqkj noClick" :class="isCurrent=='dwjs'?'isClick':''" @click="setBType('dwjs')">队伍建设</div>
         </div>