From 398febf154f571064469d5e00b0fb96f10e7838b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 18 Jul 2022 09:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulationsKanban/components/addModel.vue |  6 ++--
 .../src/views/regulationsKanban/index.vue     | 30 +++++++++----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index 6039934a4..3bf72e72d 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -235,12 +235,10 @@ export default {
     loadData() {
       let _this = this
       let params = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        paramsManifestId:this.paramsManifestId,
+        id:this.paramsManifestId,
         ...this.formData
       }
-      getAction('params/report/exportHistoryPage', params).then((res) => {
+      getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => {
         if (res.success) {
           this.areaTable = res.result.records
           this.total = res.result.total
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index bbbf53682..5c49ea3e2 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -18,7 +18,7 @@
                 <span>{{$t('title')}}</span>
               </div>
               <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model="queryParam.projectName"></j-input>
+                       v-model="queryParam.title"></j-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -26,7 +26,7 @@
               <div class="title-text" :title="$t('status')">
                 <span>{{ $t('status') }}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+              <j-dict-select-tag class="box-input" v-model="queryParam.state"
                                  :placeholder="$t('PleaseSelect')+$t('status')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -37,7 +37,7 @@
               <div class="title-text" :title="$t('technicalField')">
                 <span>{{ $t('technicalField') }}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"
                                  :placeholder="$t('PleaseSelect')+$t('technicalField')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -130,7 +130,7 @@ export default {
       fieldList: [
         {
           type: 'string',
-          value: 'standard',
+          value: 'serialNumber',
           text: this.$t('standard')
         },
         {
@@ -140,18 +140,18 @@ export default {
         },
         {
           type: '',
-          value: 'status',
+          value: ' state',
           text: this.$t('status'),
           dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
         },
-        {
-          type: 'string',
-          value: 'category',
-          text: this.$t('category')
-        },
+        // {
+        //   type: 'string',
+        //   value: 'technologyTerritory',
+        //   text: this.$t('category')
+        // },
         {
           type: '',
-          value: 'technicalField',
+          value: 'technologyTerritory',
           text: this.$t('technicalField'),
           dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
         },
@@ -160,7 +160,7 @@ export default {
       dataSource: [],
       confirmLoading: false,
       url: {
-        list: 'params/report/page'
+        list: 'project/lawsComplianceBoard/page'
       },
       total: 0,
       pageSize: 10,
@@ -170,7 +170,7 @@ export default {
         {
           title: this.$t('standard'),
           align: 'center',
-          dataIndex: 'standard'
+          dataIndex: 'serialNumber'
         },
         {
           title: this.$t('title'),
@@ -180,7 +180,7 @@ export default {
         {
           title: this.$t('status'),
           align: 'center',
-          dataIndex: 'status'
+          dataIndex: 'state'
         },
         // {
         //   title: this.$t('category'),
@@ -190,7 +190,7 @@ export default {
         {
           title: this.$t('technicalField'),
           align: 'center',
-          dataIndex: 'technicalField'
+          dataIndex: 'technologyTerritory'
         },
         {
           title: this.$t('RegulatoryProcessEvaluationResults'),