提交代码

src/components/customComponent/ConfirmedModal.vue

@@ -92,12 +92,12 @@
 
     {
       title: '复核是否通过',
-      dataIndex: 'notyType',
-      key: 'notyType',
+      dataIndex: 'nodeType',
+      key: 'nodeType',
       customRender: ({ record }: any) => {
-        if (record.notyType == 1) {
+        if (record.nodeType == '1') {
           return '是';
-        } else if (record.tcwr == '2') return '否';
+        } else if (record.nodeType == '2') return '否';
       },
     },
     {

src/views/dashboard/workbench/components/DynamicInfo.vue

@@ -9,21 +9,21 @@
         <span class="title-hd title-move" @click="more">更多</span>
       </div>
     </template>
-    <VScroll :itemHeight="41" :items="dynamicInfoItems" :height="550">
-      <template #default="{ item }">
-        <a-row @click="toPage(item.wrdkid)" class="listBox">
-          <a-col :span="2" class="listItem">
-            <span class="listRadio"></span>
-          </a-col>
-          <a-col :span="9" class="listItem listBody" :title="item.wrdkmc">{{ item.wrdkmc }}</a-col>
-          <a-col :span="4" class="listItem" :title="item.scjdmc">{{ item.scjdmc }}</a-col>
-          <a-col :span="3" class="listItem" :title="item.tbjdmc">{{ item.tbjdmc }}</a-col>
-          <a-col :span="6" class="listItem listTime" :title="item.createTsamp">{{ item.createTsamp ? item.createTsamp :
-            '暂无时间'
-          }}</a-col>
-        </a-row>
-      </template>
-    </VScroll>
+      <VScroll :itemHeight="41" :items="dynamicInfoItems" :height="700">
+        <template #default="{ item }">
+          <a-row @click="toPage(item.wrdkid)" class="listBox">
+            <a-col :span="2" class="listItem">
+              <span class="listRadio"></span>
+            </a-col>
+            <a-col :span="9" class="listItem listBody" :title="item.wrdkmc">{{ item.wrdkmc }}</a-col>
+            <a-col :span="4" class="listItem" :title="item.scjdmc">{{ item.scjdmc }}</a-col>
+            <a-col :span="3" class="listItem" :title="item.tbjdmc">{{ item.tbjdmc }}</a-col>
+            <a-col :span="6" class="listItem listTime" :title="item.createTsamp">{{ item.createTsamp ? item.createTsamp :
+              '暂无时间'
+            }}</a-col>
+          </a-row>
+        </template>
+      </VScroll>
   </Card>
 </template>
 <script lang="ts" setup>

src/views/dashboard/workbench/index.vue

 <template>
-  <PageWrapper>
-    <div style="display: flex;height: calc(100vh - 100px);justify-content: center;align-items: center;">
-      <div class="lg:w-3/9 w-full !mr-4 enter-y">
+  <!-- <PageWrapper> -->
+    <div style="display: flex;justify-content: center;align-items: center;margin: 70px 20px 0 20px;">
+      <div class="lg:w-3/9 w-full !mr-4 enter-y" style="min-width: 450px;">
         <DynamicInfo :loading="loading" title="待办事项" :urls="'待办事项'" @moreClck="moreClck" class="enter-y" :dynamicInfoItems="dbData"/>
       </div>
-      <div class="lg:w-3/9 w-full !mr-4 enter-y">
+      <div class="lg:w-3/9 w-full !mr-4 enter-y" style="min-width: 450px;">
         <DynamicInfo :loading="loading" title="已办事项" :urls="'已办事项'" @moreClck="moreClck" class="enter-y" :dynamicInfoItems="ybData"/>
       </div>
-      <div class="lg:w-3/9 w-full enter-y">
+      <div class="lg:w-3/9 w-full enter-y" style="min-width: 450px;">
         <DynamicInfo :loading="loading" title="通知消息" :urls="'通知消息'" @moreClck="moreClck" class="enter-y" :dynamicInfoItems="tzData"/>
       </div>
     </div>
-  </PageWrapper>
-  <Modal @register="register"  :title="title" />
+  <!-- </PageWrapper> -->
+  <Modal @register="register"  :title="title" :canFullscreen="false"/>
 </template>
 <script lang="ts" setup>
   import { ref,reactive } from 'vue';

src/views/directory/ycmlqd/data.ts

@@ -162,6 +162,19 @@ export const searchFormSchema: FormSchema[] = [
     component: 'TreeSelect',
     slot: 'category',
   },
+  {
+    label: '地块名称或编码',
+    field: 'wrdkbm',
+    component: 'Input',
+  },
+  {
+    label: '是否超标',
+    field: 'pollueted',
+    component: 'JSearchSelect',
+    componentProps: {
+      dict: 'qd_sfcb',
+    },
+  },
   // {
   //   label: '阶段',
   //   field: 'mlbs',

src/views/dkgl/fxgk/DetailList.vue

@@ -259,7 +259,7 @@
         showFooter: true,
       });
     }else{
-      createMessage.info('请选择正确的信息');
+      createMessage.info('数据还未提交，请提交后再进行操作');
     }
   }
 </script>

src/views/dkgl/fxpg/Improved.vue

@@ -103,7 +103,7 @@
         showFooter: true,
       });
     }else{
-      createMessage.info('请选择正确的信息');
+      createMessage.info('数据还未提交，请提交后再进行操作');
     }
   }
   function handleSuccess() {

src/views/dkgl/gkpg/DetailList.vue

@@ -247,7 +247,7 @@
         showFooter: true,
       });
     } else {
-      createMessage.info('请选择正确的信息');
+      createMessage.info('数据还未提交，请提交后再进行操作');
     }
   }
 </script>

src/views/dkgl/gkxf/DetailList.vue

@@ -258,7 +258,7 @@
         showFooter: true,
       });
     }else{
-      createMessage.info('请选择正确的信息');
+      createMessage.info('数据还未提交，请提交后再进行操作');
     }
   }
 </script>

src/views/dkgl/gkxfpg/DetailList.vue

@@ -272,7 +272,7 @@
         showFooter: true,
       });
     }else{
-      createMessage.info('请选择正确的信息');
+      createMessage.info('数据还未提交，请提交后再进行操作');
     }
   }
 </script>

src/views/dkgl/investigate/Improved.vue

@@ -108,7 +108,7 @@
         showFooter: true,
       });
     }else{
-      createMessage.info('请选择正确的信息');
+      createMessage.info('数据还未提交，请提交后再进行操作');
     }
   }
   function handleSuccess() {

src/views/dkgl/repair/DetailList.vue

@@ -261,7 +261,7 @@
         showFooter: true,
       });
     }else{
-      createMessage.info('请选择正确的信息');
+      createMessage.info('数据还未提交，请提交后再进行操作');
     }
   }
 </script>

src/views/dkgl/xfpg/DetailList.vue

@@ -270,7 +270,7 @@
         showFooter: true,
       });
     }else{
-      createMessage.info('请选择正确的信息');
+      createMessage.info('数据还未提交，请提交后再进行操作');
     }
   }
 </script>