From 166c23dbe5710b073924ecf996f9c81573f7301b Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 17 Jun 2022 11:45:29 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   3 +-
 jero-web/src/config/router.config.js          |   7 +-
 .../ParameterItemCollectionList.vue           | 127 ++++++++++--------
 4 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 40c09c25f..7b534e09c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -712,6 +712,7 @@ module.exports = {
   uploadTime: 'Upload Time',
   enclosure: 'Enclosure',
   // 认证
+  ParameteItemCollectionList: 'Parameter item collection list',
   Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
   Theselectedconfiguration: 'The selected item has incomplete data collection, unable to add configuration',
   theCurrent: 'The current status of this data is',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 7ab56bbee..c99f0daca 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -697,7 +697,7 @@ module.exports = {
   projectDetails: '项目详情',
   listOfRegulations: '法规清单',
   taskList: '任务清单',
-  TaskParameterCollection: '认证参数收集',
+  TaskParameterCollection: '认证参数列表',
   nonConformance: '未符合项',
   deadlineForConfirmationOfDesignCompliance: '设计符合性确认截止时间',
   prehomoConfirmationDeadline: 'Pre-Homo确认截止时间',
@@ -723,6 +723,7 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  ParameteItemCollectionList: '参数项收集清单',
   Areyousureparameteritems: '确认提交所选参数项嘛?',
   Theselectedconfiguration: '所选项目有未完成收集数据，不能添加配置',
   theCurrent: '此数据当前状态为',
diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js
index e1300427f..07c804f03 100644
--- a/jero-web/src/config/router.config.js
+++ b/jero-web/src/config/router.config.js
@@ -337,10 +337,15 @@ export const constantRouterMap = [
     name: 'ProjectDetails',
     component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index')
   },
+  // {
+  //   path: '/ParameterItemCollection',
+  //   name: 'ParameterItemCollection',
+  //   component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ParameterItemCollection/ProjectDetails/index')
+  // },
   {
     path: '/ParameterItemCollection',
     name: 'ParameterItemCollection',
-    component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ParameterItemCollection/ProjectDetails/index')
+    component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/components/ParameterItemCollectionList')
   },
   {
     path: '/taskListProcess',
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 9600e1ba0..83e7306b1 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -1,66 +1,75 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
+    <div class="table-page-search-wrapper doc-detail">
+          <div class="Virtual-detail-header" style="position: fixed;top: 0">
+            <div class="Virtual-detail-title">
+              <span>
+                {{ $t('ParameteItemCollectionList') }}
+              </span>
+            </div>
+          </div>
       <!--      认证参数收集-参数项收集清单-10控件-->
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24" style='margin-left: -90px;'>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('NiONumber')">
-                <span>{{$t('NiONumber')}}</span>
+      <div class='Virtual-detail-content'>
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24" style='margin-left: -90px;'>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('NiONumber')">
+                  <span>{{$t('NiONumber')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
+                         v-model="formInline.nioNumber"></a-input>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
-                       v-model="formInline.nioNumber"></a-input>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('ParameterName')">
-                <span>{{$t('ParameterName')}}</span>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('ParameterName')">
+                  <span>{{$t('ParameterName')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
+                         v-model="formInline.paramsName"></a-input>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
-                       v-model="formInline.paramsName"></a-input>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('certificationCategory')">
-                <span>{{$t('certificationCategory')}}</span>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('certificationCategory')">
+                  <span>{{$t('certificationCategory')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
+                                   :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'cert_category'"/>
               </div>
-              <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                 :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'cert_category'"/>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('areaOfResponsibility')">
-                <span>{{$t('areaOfResponsibility')}}</span>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('areaOfResponsibility')">
+                  <span>{{$t('areaOfResponsibility')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'duty_territory'"/>
               </div>
-              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('completedBy')">
-                <span>{{$t('completedBy')}}</span>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('completedBy')">
+                  <span>{{$t('completedBy')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
+                         v-model="formInline.dre"></a-input>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
-                       v-model="formInline.dre"></a-input>
-            </div>
-          </a-col>
-          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                </a-col>
             </span>
-        </a-row>
-      </a-form>
+          </a-row>
+        </a-form>
+      </div>
     </div>
     <div class="table-operator">
 <!--      // 认证工程师 homo-->
@@ -456,18 +465,20 @@ export default {
       RoleType: [ ],// 控件类型
       NotSelectedRowKeysValue: [],
       NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有
-      NotSelectedNoEngineerValue: []
+      NotSelectedNoEngineerValue: [],
+      paramsManifest: {}
     }
   },
   props: {
-    paramsManifest: {
-      type: Object,
-      default: {},
-      require: true
-    }
+    // paramsManifest: {
+    //   type: Object,
+    //   default: {},
+    //   require: true
+    // }
   },
   mounted() {
     this.GetgetLoginUserType()
+    this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
   },
   methods:{
     handleCancelRoleSwitching() {
@@ -1192,7 +1203,6 @@ export default {
       justify-content: space-between;
       border-bottom: 2px #eff1f3 solid;
       background: #fff;
-
       .Virtual-detail-title {
         display: inline-block;
         text-overflow: ellipsis;
@@ -1212,6 +1222,7 @@ export default {
     }
 
     .Virtual-detail-content {
+      margin-top: 68px;
       padding: 0 38px 0 38px;
       box-sizing: border-box;
       font-size: 16px;
@@ -1296,8 +1307,6 @@ export default {
     color: #040B29;
     margin-bottom: 22px;
   }
-</style>
-<style>
   .box-title-text-index {
     line-height: 1.4;
     display: flex;