修改认证参数列表

jero-web/src/common/lang/en-us.js

@@ -786,6 +786,7 @@ module.exports = {
   parameter: 'Parameter',
   changeExtension: 'Change Extension',
   addDetailList: 'Add',
+  editDetailList:'Edit DetailList',
   detailedList: 'DetailedList',
   copyParamDetailList: 'Copy Parameter List',
   collectionCompletionTime: 'Collection Completed',
@@ -1321,9 +1322,10 @@ module.exports = {
   secondaryDirectory:'Secondary directory',
   OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
   projectVersion:'Project Version',
-  softwareVersion:'Software version',
+  softwareVersion:'Authentication Software version',
   versionStatistics:'Version statistics',
   addSubproject:'Add Subproject',
   Topping:'Topping',
   cancelTopping:'Cancel Topping',
+  relatedProjectVersion:'Related project version',
 }

jero-web/src/common/lang/zh-cn.js

@@ -802,6 +802,7 @@ module.exports = {
   parameter: '参数',
   changeExtension: '变更扩展',
   addDetailList: '添加清单',
+  editDetailList:'编辑清单',
   detailedList: '清单',
   copyParamDetailList: '复制参数清单',
   collectionCompletionTime: '收集完成时间',
@@ -1422,9 +1423,10 @@ module.exports = {
   secondaryDirectory:'二级目录',
   OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员',
   projectVersion:'项目版本',
-  softwareVersion:'软件版本',
+  softwareVersion:'认证软件版本',
   versionStatistics:'版本统计',
   addSubproject:'添加子项目',
   Topping:'置顶',
   cancelTopping:'取消置顶',
+  relatedProjectVersion:'相关项目版本',
 }

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -84,13 +84,21 @@
       />
     </div>
     <!--    参数模板-->
-    <a-modal v-model="areaVisible" :maskClosable="false" :title="$t('parameterTemplate')" width='750px' :footer="null">
+    <a-drawer
+      :visible="areaVisible"
+      :maskClosable="false"
+      @close="handleCancel"
+      :title="areaTitle"
+      width='850px'
+      style="height: 100%;overflow: auto;padding-bottom: 53px;"
+      placement="right"
+      :footer="null">
       <parameter-template-add :url='url' ref='templateRef' v-if='areaVisible' @areaVisible='handleCancel'
                               :version='version'
                               :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
 
       </parameter-template-add>
-    </a-modal>
+    </a-drawer>
     <!--    配置-->
     <configure ref="configureRef" :url='url' :itemId='itemId' :itemRow='itemRow'/>
     <!--    历史版本-->
@@ -98,14 +106,23 @@
       <historical-version v-if='historicalVisible' :historicalRow='historicalRow'></historical-version>
     </a-modal>
     <!--     复制参数模板-->
-    <a-modal class="show-drawer" :title="$t('Copyparameterlist')" width="700px" v-model="drawerVisible" :footer="null">
+    <a-drawer
+      class="show-drawer"
+      :maskClosable="false"
+      :visible="drawerVisible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;"
+      placement="right"
+      @close="drawerhandleCancel"
+      :title="$t('Copyparameterlist')"
+      width="850px"
+      :footer="null">
       <project-collection-parameters v-if='drawerVisible' @areaVisible='drawerhandleCancel'
                                      :templateTitle='templatetitle' @copysubmit='copysubmit'
                                      :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
                                      :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
 
       </project-collection-parameters>
-    </a-modal>
+    </a-drawer>
   </a-card>
 </template>
 
@@ -155,6 +172,13 @@
             ellipsis: true,
             dataIndex: 'paramsTemplateName'
           },
+          {
+            title: this.$t('relatedProjectVersion'),
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+            dataIndex: 'projectVersion'
+          },
           {
             title: this.$t('collectionCompletionTime'),
             align: 'center',
@@ -218,6 +242,7 @@
         selectedRowKeysArray: '',
         templatetitle: '',
         templatetitleId: '',
+        areaTitle:'',
         rowId: '',
         version: 0,
         itemId: '', // 配置id
@@ -303,12 +328,12 @@
         this.$refs.configureRef.addModel(item.id, item)
       },
       handleCancel(val) {
-        this.areaVisible = val
+        this.areaVisible = false
         this.getlist()
       },
       // 项目收集参数
       drawerhandleCancel(val) {
-        this.drawerVisible = val
+        this.drawerVisible = false
       },
       copysubmit() {
         this.drawerVisible = false
@@ -330,11 +355,13 @@
       },
       edit(edit) {
         this.areaVisible = true
+        this.areaTitle = this.$t('editDetailList')
         setTimeout(() => {
           this.$refs.templateRef.editData(edit)
         }, 50)
       },
       handleAdd() {
+        this.areaTitle = this.$t('addDetailList')
         this.areaVisible = true
       },
       // 变更扩展

jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue

@@ -10,21 +10,78 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='9'>
+          <a-col :span='11'>
-            <a-form-model-item class="itemAddAdmin" :label="$t('title')" prop='title'>
+            <div class="box-title-text">
-              <a-input style='width: 420px'
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='title'>
+                <!--                <a-input class="box-input"-->
+                <!--                         :disabled="disabled"-->
+                <!--                         v-model="formInline[item.db_field_name]"-->
+                <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
+                <!--                <a-input-->
+                <!--                  :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"-->
+                <!--                  v-model='form.paramsTemplateName'/>-->
+                <a-input class="box-input"
                          :placeholder="$t('PleaseEnter')+$t('title')"
                          v-model='formData.title'/>
               </a-form-model-item>
+            </div>
+            <!--            <a-form-model-item class="itemAddAdmin" :label="$t('title')" prop='title'>-->
+            <!--              <a-input style='width: 420px'-->
+            <!--                       :placeholder="$t('PleaseEnter')+$t('title')"-->
+            <!--                       v-model='formData.title'/>-->
+            <!--            </a-form-model-item>-->
+          </a-col>
+          <a-col :span='11'>
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('relatedProjectVersion')">{{$t('relatedProjectVersion')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" style="height: 40px">
+                <a-select mode="multiple"
+                          class="box-input"
+                          style="width: 100%"
+                          v-model='formData.projectVersion'
+                          :placeholder="$t('PleaseSelect')+$t('relatedProjectVersion')">
+                  <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
+                  <a-select-option v-for="(item, key) in projectVersionList"
+                                   :key="key"
+                                   :label="item"
+                                   :value="item">
+                        <span class="itemOption" :title=" item ">
+                             {{ item }}
+                        </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
           </a-col>
           <!--          <a-col :span='9'>-->
           <!--          </a-col>-->
           <!--          <a-col :span='6'>-->
           <!--          </a-col>-->
         </a-row>
+        <a-row :gutter="24" style="border-bottom: 1px #f5f5f5 solid;margin-bottom: 10px">
+          <a-col :span="22">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea
+                  :placeholder="$t('PleaseEnter')+$t('explain')"
+                  v-model.trim="formData.explanation" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <a-row :gutter='24'>
           <a-col :span='9'>
-            <div class="box-title-text" style="margin-left: -58px;">
+            <div class="box-title-text">
               <div class="title-text">
                 <!--                <span class="Required">*</span>-->
                 <span class="title-text-text" :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
@@ -65,6 +122,7 @@
                 <!--                         v-model="formInline[item.db_field_name]"-->
                 <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
                 <a-input
+                  class='box-input'
                   :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"
                   :title="$t('PleaseSelect')+$t('parameterTemplate')"
                   v-model='form.paramsTemplateName'/>
@@ -92,11 +150,11 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll='{x: 600}'
+      :scroll='{x: 600,y:400}'
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
     </a-table>
-    <div class="page" style='display: flex;justify-content: flex-end; margin-bottom: 15px'>
+    <div class="page" style='display: flex;justify-content: flex-end; margin-bottom: 42px'>
       <a-pagination
         :show-total="total => $t('total')+` ${total} `+$t('strip')"
         show-quick-jumper
@@ -143,6 +201,7 @@
             ellipsis: true
           }
         ],
+        projectVersionList: [],
         newVisible: false,
         labelCol: {
           xs: { span: 24 },
@@ -162,6 +221,13 @@
               message: this.$t('title') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
+          ],
+          explanation: [
+            {
+              max: 500,
+              message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
           ]
         },
         areaTable: [],
@@ -193,8 +259,21 @@
     },
     mounted() {
       this.loadData()
+      this.getProjectVersion()
     },
     methods: {
+      getProjectVersion() {
+        let query = {
+          id: this.projectId
+        }
+        getAction('/project/projectLibraryBase/getVersionsInfo', query).then((res) => {
+          if (res.success) {
+            this.projectVersionList = res.result || []
+          } else {
+            this.projectVersionList = []
+          }
+        })
+      },
       pageOnChange(page, pageSize) {
         this.pageNo = page
         this.loadData()
@@ -244,6 +323,11 @@
       },
       editData(edit) {
         // 编辑一行的数据
+        if (edit.projectVersion) {
+          edit.projectVersion = edit.projectVersion.split(',')
+        }else{
+          edit.projectVersion = []
+        }
         this.row = edit
         this.formData = { ...edit }
         this.selectedRowKeys = edit.paramsTemplateId.split(',')
@@ -265,10 +349,17 @@
               this.confirmLoading = true
               let postDate = {
                 title: this.formData.title,
+                projectVersion: this.formData.projectVersion,
+                explanation: this.formData.explanation,
                 paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0],
                 paramsTemplatePublishVersion: this.row.version || this.selectedRowKeysDate[0].version,
                 projectId: this.projectId
               }
+              Object.keys(postDate).forEach(res => {
+                if (postDate[res] && postDate[res] instanceof Array) {
+                  postDate[res] = postDate[res].join(',')
+                }
+              })
               if (this.formData.id) {
                 //编辑
                 postDate = {
@@ -375,14 +466,23 @@
   }
 
   .drawer-bootom-button {
-    display: flex;
+    position: absolute;
-    justify-content: center;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
   }
 
   .Required {
     color: red;
     margin-right: 4px;
   }
+
   .box-title-text {
     line-height: 1.4;
     display: flex;
@@ -390,7 +490,7 @@
   }
 
   .title-text {
-    width: 114px;
+    width: 84px;
     text-align: right;
     display: inline-block;
     font-weight: 500;
@@ -410,10 +510,10 @@
   }
 
   .itemModel {
-    width: calc(100% - 130px);
+    width: calc(100% - 100px);
     display: inline-block;
     margin-top: 2px;
-    height: 40px;
+    /*height: 40px;*/
     margin-bottom: 24px;
   }
 
@@ -466,6 +566,19 @@
     line-height: 6px;
     color: #fff;
   }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .itemOption {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
 </style>
 <style lang='less'>
   .area-module {

jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue

@@ -10,29 +10,80 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='8'>
+          <a-col :span='11'>
-            <a-form-model-item :label="$t('title')" prop='title'>
+            <div class="box-title-text">
-              <a-input style='width: 420px'
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='title'>
+                <a-input class="box-input"
                          :placeholder="$t('PleaseEnter')+$t('title')"
                          v-model='formData.title'/>
               </a-form-model-item>
+            </div>
           </a-col>
-          <a-col :span='9'>
+          <a-col :span='11'>
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('relatedProjectVersion')">{{$t('relatedProjectVersion')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" style="height: 40px">
+                <a-select mode="multiple"
+                          class="box-input"
+                          style="width: 100%"
+                          v-model='formData.projectVersion'
+                          :placeholder="$t('PleaseSelect')+$t('relatedProjectVersion')">
+                  <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
+                  <a-select-option v-for="(item, key) in projectVersionList"
+                                   :key="key"
+                                   :label="item"
+                                   :value="item">
+                        <span class="itemOption" :title=" item ">
+                             {{ item }}
+                        </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
           </a-col>
-          <a-col :span='7'>
+        </a-row>
+        <a-row :gutter="24" style="border-bottom: 1px #f5f5f5 solid;margin-bottom: 10px">
+          <a-col :span="22">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea
+                  :placeholder="$t('PleaseEnter')+$t('explain')"
+                  v-model.trim="formData.explanation" :rows="4"/>
+              </a-form-model-item>
+            </div>
           </a-col>
         </a-row>
         <a-row :gutter='24'>
-          <a-col :span='8'>
+          <a-col :span='11'>
-            <a-form-model-item :label="$t('entryName')" prop='projectName'>
+            <div class="box-title-text">
-              <a-input style='width: 420px'
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <a-input class="box-input"
                          :placeholder="$t('PleaseEnter')+$t('entryName')"
                          v-model='formData.projectName'/>
               </a-form-model-item>
+            </div>
           </a-col>
-          <a-col :span='9'>
+          <!--          <a-col :span='8'>-->
-          </a-col>
+          <!--            <a-form-model-item :label="$t('entryName')" prop='projectName'>-->
-          <a-col :span='7' style='margin-top: 4px;padding-left: 20px'>
+          <!--              <a-input style='width: 420px'-->
+          <!--                       :placeholder="$t('PleaseEnter')+$t('entryName')"-->
+          <!--                       v-model='formData.projectName'/>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <a-col :span='11' style="margin-top: 5px">
             <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>
@@ -48,7 +99,7 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll='{x: 600}'
+      :scroll='{x: 600,y:400}'
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
       <span slot='click' slot-scope='text, record'>
@@ -60,7 +111,7 @@
       </span>
 
     </a-table>
-    <div class="page" style='display: flex;justify-content: flex-end;'>
+    <div class="page" style='display: flex;justify-content: flex-end;margin-bottom: 43px'>
       <a-pagination
         :show-total="total => $t('total')+` ${total} `+$t('strip')"
         show-quick-jumper
@@ -78,7 +129,8 @@
     </div>
     <!--  清单弹框  -->
     <a-modal v-model="listVisible" :title="$t('parameterTemplate')" width='700px' :footer="null">
-      <parameter-template v-if='listVisible' @areaVisible='drawerhandleCancel' @listVisibleRow='listVisibleRow'></parameter-template>
+      <parameter-template v-if='listVisible' @areaVisible='drawerhandleCancel'
+                          @listVisibleRow='listVisibleRow'></parameter-template>
     </a-modal>
   </div>
 </template>
@@ -101,6 +153,7 @@ export default {
         title: this.$t('add'),
         total: 0,
         selectedRowKeysDate: {},
+        projectVersionList: [],
         loading: false,
         editId: '',
         columns: [
@@ -171,8 +224,21 @@ export default {
     },
     mounted() {
       this.loadData()
+      this.getProjectVersion()
     },
     methods: {
+      getProjectVersion() {
+        let query = {
+          id: this.projectId
+        }
+        getAction('/project/projectLibraryBase/getVersionsInfo', query).then((res) => {
+          if (res.success) {
+            this.projectVersionList = res.result || []
+          } else {
+            this.projectVersionList = []
+          }
+        })
+      },
       // 清单列表传出数据
       listVisibleRow(val) {
         // this.selectedRowKeys = []
@@ -204,10 +270,13 @@ export default {
       },
       loadData() {
         let _this = this
+        if (!this.formData.projectName){
+          this.formData.projectName = ''
+        }
         let params = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-        ...this.formData
+          projectName:this.formData.projectName
         }
         this.loading = true
         axios({
@@ -237,14 +306,15 @@ export default {
             }
           })
           .catch((error) => {
-          console.log(error);
+            console.log(error)
-        });
+          })
       },
       searchQuery() {
         this.loadData()
       },
       searchReset() {
-      this.formData = {}
+        this.formData.projectName = ''
+        this.formData = {...this.formData}
         this.loadData()
       },
       handleCancel() {
@@ -278,12 +348,20 @@ export default {
               this.flag = true
               this.spinLoading = true
               this.confirmLoading = true
+              let formData = JSON.parse(JSON.stringify(this.formData))
+              Object.keys(formData).forEach(res => {
+                if (formData[res] && formData[res] instanceof Array) {
+                  formData[res] = formData[res].join(',')
+                }
+              })
               let _tt = {
                 paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId,
                 projectId: this.projectId,
-              title: this.formData.title,
+                title: formData.title,
+                projectVersion: formData.projectVersion,
+                explanation: formData.explanation,
                 paramsTemplatePublishVersion: this.selectedRowKeysDate[0].paramsTemplatePublishVersion,
-              sourceManifestId: this.selectedRowKeysDate[0].id,
+                sourceManifestId: this.selectedRowKeysDate[0].id
               }
               postAction('params/manifest/copy', _tt).then((res) => {
                 if (res.success) {
@@ -337,7 +415,7 @@ export default {
             }
           })
         }
-    },
+      }
     },
     watch: {
       selectedRowKeyS(val) {
@@ -364,14 +442,81 @@ export default {
       color: red;
     }
   }
+
   .drawer-bootom-button {
-  display: flex;
+    position: absolute;
-  justify-content: center;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
   }
+
   .Required {
     color: red;
     margin-right: 4px;
   }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 100px);
+    display: inline-block;
+    margin-top: 2px;
+    /*height: 40px;*/
+    margin-bottom: 24px;
+  }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+  .box-button{
+    height: 38px;
+  }
 </style>
 <style lang='less'>
   .area-module {