修改禅道已知bug

jero-web/src/components/ParameterLibraryAdd/index.vue

@@ -2,6 +2,7 @@
   <div class='diolag-area'>
     <a-spin :spinning='spinLoading'>
       <a-form-model
+        @keyup.enter.native="searchQuery"
         class='tag-module'
         ref='ruleForm'
         :model='form'

jero-web/src/components/tableCollection/index.vue

@@ -395,7 +395,7 @@
                   dataIndex: res.db_field_name,
                   align: 'center',
                   ellipsis: true,
-                  sorter: res.sort
+                  sorter: res.sort,
                 })
                 this.columns[index].scopedSlots = {
                   customRender: 'titleName',

jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue

@@ -22,7 +22,7 @@
               <a-form-model-item class="itemModel" prop="paramsTemplateName">
                 <a-input class="box-input"
                          :disabled="disabled"
-                         v-model="formInline.paramsTemplateName"
+                         v-model.trim="formInline.paramsTemplateName"
                          :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"/>
               </a-form-model-item>
             </div>
@@ -87,7 +87,7 @@ export default {
       visible: false,
       rules: {
         paramsTemplateName:[
-          { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'change' },
+          { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'blur' },
           { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
         ],
         description:[

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -22,7 +22,7 @@
                 <a-form-model-item class="itemModel" prop="nioNumber">
                   <a-input class="box-input"
                            :disabled="disabled"
-                           v-model="formInline.nioNumber"
+                           v-model.trim="formInline.nioNumber"
                            :placeholder="$t('PleaseEnter')+$t('NNiONumber')"/>
                 </a-form-model-item>
               </div>
@@ -55,7 +55,7 @@
                 <a-form-model-item class="itemModel" prop="paramsName">
                   <a-input class="box-input"
                            :disabled="disabled"
-                           v-model="formInline.paramsName"
+                           v-model.trim="formInline.paramsName"
                            :placeholder="$t('PleaseEnter')+$t('NParameterName')"/>
                 </a-form-model-item>
               </div>
@@ -127,7 +127,7 @@
                            style='height: 95px; width: 100%'
                            type="textarea"
                            :disabled="disabled"
-                           v-model="formInline.description"
+                           v-model.trim="formInline.description"
                            :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
                 </a-form-model-item>
               </div>
@@ -204,7 +204,7 @@
                   <a-input class="box-input add-input"
                            :disabled="disabled"
                            type="textarea"
-                           v-model="formInline.controlValues"
+                           v-model.trim="formInline.controlValues"
                            :placeholder="$t('PleaseEnter')+$t('NcontrolAlternatives')"/>
                 </a-form-model-item>
               </div>
@@ -349,12 +349,12 @@ export default {
       visible: false,
       rules: {
         nioNumber:[
-          { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'change' },
+          { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' },
           { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' },
           {
             pattern: /^[0-9a-zA-Z-]{1,}$/,
             message: this.$t('onlyThree'),
-            trigger: 'change'
+            trigger: 'blur'
           }
         ],
         certCategory: [
@@ -364,7 +364,7 @@ export default {
           { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' },
         ],
         paramsName: [
-          { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'change' },
+          { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'blur' },
           { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' },
         ],
         technologyTerritory: [
@@ -386,7 +386,7 @@ export default {
           { required: true, message: this.$t('PleaseEnter')+this.$t('controlVerification'), trigger: 'change' },
         ],
         controlValues: [
-          { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'change' },
+          { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' },
           { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' },
         ],
       },

jero-web/src/views/projectManagement/ParameterItemCollection/index.vue

@@ -1,262 +0,0 @@
-<template>
-  <div class="doc-detail">
-    <!--    认证参数收集——清单信息-->
-    <div class="Virtual-detail-header" style="position: fixed;top: 0">
-      <div class="Virtual-detail-title">
-          <span style="line-height: 74px;display: inline-block;float: left">
-            <a-icon type="left-circle" theme="filled" style="margin-right: 6px;font-size: 30px;color: #21c9cc;"/>
-          </span>
-        <span>
-             {{this.title}}
-        </span>
-      </div>
-      <div class="Virtual-detail-text-right" v-if="textTitle === $t('listOfRegulations')">
-        <div class="operator-text" @click="commentClick">
-          <a-icon type="message"/>
-          {{$t('comment')}}
-        </div>
-        <div class="operator-text" @click="historicalVersionClick">
-          <a-icon type="clock-circle"/>
-          {{$t('historicalVersion')}}
-        </div>
-        <div class="operator-text" @click="UpdateLogClick">
-          <a-icon type="reload"/>
-          {{$t('UpdateLog')}}
-        </div>
-      </div>
-    </div>
-    <div style="padding: 67px 0 0 0;background: #ffffff;height:100%">
-      <div class="detail-content" style="height: 100%">
-        <div class="Virtual-detail-left">
-          <div class="Virtual-detail-left-text" :title="$t('projectDetails')"
-               @click="textClick(0,$t('projectDetails'))">
-            <a-icon type="container"/>
-            {{$t('projectDetails')}}
-          </div>
-          <div class="Virtual-detail-left-text" v-has="'projectLawsInventory:list'" :title="$t('listOfRegulations')"
-               @click="textClick(1,$t('listOfRegulations'))">
-            <a-icon type="container"/>
-            {{$t('listOfRegulations')}}
-          </div>
-          <div class="Virtual-detail-left-text" :title="$t('taskList')" @click="textClick(2,$t('taskList'))">
-            <a-icon type="container"/>
-            {{$t('taskList')}}
-          </div>
-          <div class="Virtual-detail-left-text" v-has="'ncrTrack:queryPageInfo'" :title="$t('nonConformance')"
-               @click="textClick(3,$t('nonConformance'))">
-            <a-icon type="container"/>
-            {{$t('nonConformance')}}
-          </div>
-          <div class="Virtual-detail-left-text" :title="$t('TaskParameterCollection')"
-               @click="textClick(4,$t('TaskParameterCollection'))">
-            <a-icon type="container"/>
-            {{$t('TaskParameterCollection')}}
-          </div>
-        </div>
-        <div class="Virtual-detail-right">
-          <ProjectDetailsName @TaskListChange="TaskListChange" v-if="textTitle === $t('projectDetails')"/>
-          <listOfRegulations v-else-if="textTitle === $t('listOfRegulations')"/>
-          <TaskList :isDisplayNum="isDisplayNum" :areaOfResponsibility="areaOfResponsibility"
-                    v-else-if="textTitle === $t('taskList')"/>
-          <ParameterItemCollectionList v-else-if="textTitle === $t('TaskParameterCollection')"
-                                       :paramsManifest='paramsManifest'/>
-          <nonConformance v-else-if="textTitle === $t('nonConformance')"/>
-        </div>
-      </div>
-    </div>
-    <updateLog :url="url" ref="updateLogRef"/>
-    <historicalVersionList ref="historicalVersionListRef"/>
-    <commentList ref="commentListRef"/>
-  </div>
-</template>
-
-<script>
-  import TaskList from '@views/projectManagement/components/TaskList'
-  import listOfRegulations from '@views/projectManagement/components/listOfRegulations'
-  import ProjectDetailsName from '@views/projectManagement/components/ProjectDetails'
-  import ParameterItemCollectionList from '../components/ParameterItemCollectionList'
-  import nonConformance from '@views/projectManagement/components/nonConformance'
-  import updateLog from '@comp/UpdateLog'
-  import historicalVersionList from '@views/projectManagement/components/historicalVersionList'
-  import commentList from '@views/projectManagement/components/commentList'
-  import { getAction, postAction, deleteAction, downloadFile } from '@api/manage'
-
-  export default {
-    name: 'ProjectDetails',
-    components: {
-      TaskList,
-      listOfRegulations,
-      ProjectDetailsName,
-      ParameterItemCollectionList,
-      nonConformance,
-      updateLog,
-      historicalVersionList,
-      commentList
-    },
-    data() {
-      return {
-        title: this.$t('projectDetails'),
-        textTitle: this.$t('TaskParameterCollection'),
-        isDisplayNum: '',
-        areaOfResponsibility: {},
-        url: {
-          logList: '/project/projectLawsInventoryLogEO/page',
-          historicalVersionUrl: '',
-          queryUserPremissionByProjectLibraryId: '/project/projectCertificationDirectoryEO/queryUserPremissionByProjectLibraryId'
-        },
-        paramsManifest: {}
-      }
-    },
-    mounted() {
-      this.textColor()
-      this.getTaskId()
-      // 清单信息
-      this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
-    },
-    created() {
-      document.title = this.$t('projectDetails') + '-' + this.$route.query.projectName
-    },
-    methods: {
-      textColor() {
-        let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
-        if (textColor && textColor.length > 0) {
-          textColor[0].classList.remove('Virtual-detail-left-text-color')
-        }
-        let text = document.getElementsByClassName('Virtual-detail-left-text')
-        if (text && text.length > 0) {
-          for (let i = 0; i < text.length; i++) {
-            if (text[i].title == this.$t('TaskParameterCollection')) {
-              text[i].classList.add('Virtual-detail-left-text-color')
-            }
-          }
-        }
-      },
-      textClick(num, name) {
-        this.textTitle = name
-        let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
-        if (textColor && textColor.length > 0) {
-          textColor[0].classList.remove('Virtual-detail-left-text-color')
-        }
-        let text = document.getElementsByClassName('Virtual-detail-left-text')
-        for (let i = 0; i < text.length; i++) {
-          if (text[i].title == name) {
-            text[i].classList.add('Virtual-detail-left-text-color')
-          } else if (text[i].title == name) {
-            text[i].classList.add('Virtual-detail-left-text-color')
-          } else if (text[i].title == name) {
-            text[i].classList.add('Virtual-detail-left-text-color')
-          } else if (text[i].title == name) {
-            text[i].classList.add('Virtual-detail-left-text-color')
-          } else if (text[i].title == name) {
-            text[i].classList.add('Virtual-detail-left-text-color')
-          }
-        }
-      },
-      UpdateLogClick() {
-        this.$refs.updateLogRef.getList({ projectLibraryId: this.$route.query.id })
-      },
-      historicalVersionClick() {
-        this.$refs.historicalVersionListRef.getList()
-      },
-      commentClick() {
-        this.$refs.commentListRef.getData()
-      },
-      getTaskId() {
-        let query = {
-          projectLibraryId: this.$route.query.id
-        }
-        getAction(this.url.queryUserPremissionByProjectLibraryId, query).then((res) => {
-          if (res.success) {
-            this.isDisplayNum = res.result
-          }
-        })
-      },
-      TaskListChange(item) {
-        this.areaOfResponsibility = item
-        this.textTitle = this.$t('taskList')
-        let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
-        if (textColor && textColor.length > 0) {
-          textColor[0].classList.remove('Virtual-detail-left-text-color')
-        }
-        let text = document.getElementsByClassName('Virtual-detail-left-text')
-        for (let i = 0; i < text.length; i++) {
-          if (text[i].title == this.$t('taskList')) {
-            text[i].classList.add('Virtual-detail-left-text-color')
-          }
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  @import '~@assets/less/common.less';
-
-  .doc-detail {
-    background: #fff;
-    height: 100%;
-
-    .Virtual-detail-header {
-      width: 100%;
-      height: 68px;
-      line-height: 68px;
-      padding: 0 32px 0 32px;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-      border-bottom: 2px #eff1f3 solid;
-      background: #fff;
-
-      .Virtual-detail-title {
-        display: inline-block;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        font-size: 20px;
-        font-weight: 400;
-        color: #040B29;
-        line-height: 68px;
-      }
-
-      .doc-detail-right {
-        width: 800px;
-        line-height: 68px;
-        display: flex;
-      }
-    }
-
-    .Virtual-detail-left {
-      width: 240px;
-      padding: 16px 24px;
-      box-sizing: border-box;
-      font-size: 16px;
-      line-height: 3;
-      float: left;
-
-      .Virtual-detail-left-text {
-        padding: 2px 12px;
-        cursor: pointer;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-
-    .Virtual-detail-right {
-      border-left: 2px #eff1f3 solid;
-      width: calc(100% - 240px);
-      height: 100%;
-      float: left;
-      overflow: auto;
-    }
-  }
-
-  .Virtual-detail-left-text-color {
-    background: #eff1f3;
-    border-radius: 4px;
-  }
-
-  .Virtual-detail-text-right {
-
-  }
-</style>

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

@@ -1,13 +1,16 @@
 <template>
-  <a-card :bordered="false">
+  <div class="doc-detail">
-    <div class="table-page-search-wrapper doc-detail">
+    <div class="Virtual-detail-header" style="position: fixed;top: 0">
-          <div class="Virtual-detail-header" style="top: 0">
       <div class="Virtual-detail-title">
         <span>
           {{$t('ParameteItemCollectionList')}}
         </span>
       </div>
     </div>
+    <div style="padding-top: 54px;background: #fff;height: 100%">
+      <div class="detail-content" style="height: 100%">
+        <a-card :bordered="false" class="card">
+          <div class="table-page-search-wrapper">
             <!--      认证参数收集-参数项收集清单-10控件-->
             <div class='Virtual-detail-content' style='margin-top: 15px'>
               <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -61,7 +64,8 @@
                                v-model="formInline.dre"></a-input>
                     </div>
                   </a-col>
-            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+                  <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>
@@ -132,12 +136,14 @@
               {{$t('submit')}}
             </div>
             <!--      退回-->
-      <div @click="returnDataJurisdiction" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "homo" || currentPersonRole == "dre"'>
+            <div @click="returnDataJurisdiction" class="operator-text"
+                 v-if='currentPersonRole == "sdt" || currentPersonRole == "homo" || currentPersonRole == "dre"'>
               <a-icon type="delete"/>
               {{$t('sendBack')}}
             </div>
             <!--      强制撤回-->
-      <div @click="compulsoryWithdrawaljurisdiction" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "sdt" ||currentPersonRole == "dre"'>
+            <div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "sdt" ||currentPersonRole == "dre"'>
               <a-icon type="delete"/>
               {{$t('CompulsoryWithdrawal')}}
             </div>
@@ -151,11 +157,16 @@
           <div style="width: 100%">
             <!-- 表格-10控件-->
             <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                        :formInline='formInline' :currentPersonRole='currentPersonRole' @value='value' @listReset='listReset' @LoginUserType='LoginUserType'/>
+                              :formInline='formInline' :currentPersonRole='currentPersonRole' @value='value'
+                              @listReset='listReset' @LoginUserType='LoginUserType'/>
+          </div>
+        </a-card>
+      </div>
     </div>
     <!--  添加--->
     <a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='750px' :footer="null">
-      <parameter-library-add v-if='areaVisible' :paramsManifest='paramsManifest' @areaVisible='areaVisible = false' @GetgetTableList='GetgetTableList'/>
+      <parameter-library-add v-if='areaVisible' :paramsManifest='paramsManifest' @areaVisible='areaVisible = false'
+                             @GetgetTableList='GetgetTableList'/>
     </a-modal>
     <!--  冻结配置--->
     <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='500px' :footer="null">
@@ -170,7 +181,8 @@
         <a-row :gutter='24'>
           <a-col :span='24'>
             <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
-              <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig" allowClear mode="multiple">
+              <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
+                        allowClear mode="multiple">
                 <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -195,7 +207,8 @@
     </a-modal>
     <!--  分配填写人--->
     <a-modal v-model="areaVisibleAssignedby" :title="$t('Assignedby')" width='950px' :footer="null">
-      <assigned-by v-if='areaVisibleAssignedby' :selectedRowKeysArray='selectedRowKeysArray' @GetgetTableList='GetgetTableList'
+      <assigned-by v-if='areaVisibleAssignedby' :selectedRowKeysArray='selectedRowKeysArray'
+                   @GetgetTableList='GetgetTableList'
                    @GetgetLoginUserType='GetgetLoginUserType'
                    @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
     </a-modal>
@@ -207,14 +220,17 @@
     </a-modal>
     <!--  引用参数--->
     <a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
-      <reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest' @GetgetTableList='GetgetTableList'
+      <reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest'
+                           @GetgetTableList='GetgetTableList'
                            @areaVisibleAssignedbyflag='areaVisiblereferenceparameter = false'
                            :selectedRowKeysArray='selectedRowKeysArray'/>
     </a-modal>
     <!--  同步上报库--->
     <a-modal v-model="areaVisibsynchronous" :title="$t('SynchronousReportLibrary')" width='650px' :footer="null">
-      <synchronous-submission-library v-if='areaVisibsynchronous' :paramsManifest='paramsManifest' @GetgetTableList='GetgetTableList'
+      <synchronous-submission-library v-if='areaVisibsynchronous' :paramsManifest='paramsManifest'
-                           :selectedRowKeysArray='selectedRowKeysArray' @areaVisibsynchronous='areaVisibsynchronous = false'/>
+                                      @GetgetTableList='GetgetTableList'
+                                      :selectedRowKeysArray='selectedRowKeysArray'
+                                      @areaVisibsynchronous='areaVisibsynchronous = false'/>
     </a-modal>
     <!--    切换角色-->
     <a-modal
@@ -264,19 +280,24 @@
           <span v-if='NoEngineer === 0'>
             {{$t('NiOnumberis')}}
           </span>
-          <span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in NotSelectedNoEngineerValue' v-if='NoEngineer === 0'>
+          <span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in NotSelectedNoEngineerValue'
+                v-if='NoEngineer === 0'>
             <span style='color: red'>{{ item.nioNumber }}、</span>
           </span>
           <span v-if='NoEngineer === 0'>
              {{$t('Filledperson')}}
           </span>
           <!--          状态不符合，导致不能操作按钮，没有权限-->
-          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center' class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue' v-if='NoEngineer === 1'>
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
-            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}<span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。</div>
+               class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue' v-if='NoEngineer === 1'>
+            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}<span
+              style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。
+            </div>
           </div>
           <!--          认证工程师-提示-->
           <div style='font-size: 16px;color: red;display: flex;justify-content: center' v-if='NoEngineer === 1'>
-           {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}}
+            {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
+            $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}}
             <!--            下发收集时-->
             <span v-if='jurisdiction === "HOMOZFSJ"'>
               '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}'
@@ -327,7 +348,7 @@
         </div>
       </div>
     </a-modal>
-  </a-card>
+  </div>
 </template>
 
 <script>
@@ -341,6 +362,7 @@ import AssignedBy from '@/components/AssignedBy/index'
   import axios from 'axios'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import Vue from 'vue'
+
   export default {
     name: 'ParameterItemCollectionList',
     components: {
@@ -370,32 +392,32 @@ export default {
           {
             title: this.$t('status'),
             align: 'center',
-          dataIndex: 'state',
+            dataIndex: 'state'
           },
           {
             title: this.$t('parameterTemplateName'),
             align: 'center',
-          dataIndex: 'paramsTemplateName',
+            dataIndex: 'paramsTemplateName'
           },
           {
             title: this.$t('collectionCompletionTime'),
             align: 'center',
-          dataIndex: 'finishTime',
+            dataIndex: 'finishTime'
           },
           {
             title: this.$t('Version'),
             align: 'center',
-          dataIndex: 'version',
+            dataIndex: 'version'
           },
           {
             title: this.$t('creator'),
             align: 'center',
-          dataIndex: 'createBy',
+            dataIndex: 'createBy'
           },
           {
             title: this.$t('createTime'),
             align: 'center',
-          dataIndex: 'createTime',
+            dataIndex: 'createTime'
           },
           {
             title: this.$t('operation'),
@@ -414,7 +436,7 @@ export default {
           getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
           getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
           updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
-        deleteBatch: 'params/collectManifest/deleteBatch',
+          deleteBatch: 'params/collectManifest/deleteBatch'
         },
         loading: false,
         dataSource: [],
@@ -824,7 +846,7 @@ export default {
             }
           })
           .catch((error) => {
-        });
+          })
       },
       // 冻结配置取消
       cancleImportsFreeze() {
@@ -857,7 +879,7 @@ export default {
             }
           })
           .catch((error) => {
-        });
+          })
       },
       // 下发收集的权限
       distributionAndCollectionJurisdiction() {
@@ -879,7 +901,11 @@ export default {
           _array.push(item.id)
         })
         let _this = this
-      let param = {paramsManifestId: this.$route.query.id,projectId:this.$route.query.projectId,  ids: _array.join(',')}
+        let param = {
+          paramsManifestId: this.$route.query.id,
+          projectId: this.$route.query.projectId,
+          ids: _array.join(',')
+        }
         axios({
           url: '/jero-boot/params/collectManifest/issueCollection',
           method: 'post',
@@ -906,7 +932,7 @@ export default {
             }
           })
           .catch((error) => {
-        });
+          })
       },
       // 同步上报库 权限
       handleSynchronousReportLibraryJurisdiction() {
@@ -942,6 +968,7 @@ export default {
       ishandleSubmit() {
         let _this = this
         let postDate = []
+        console.log(this.selectedRowKeysValue)
         this.selectedRowKeysValue.forEach((item, index) => {
           let postDateobj = {}
           Object.keys(item).forEach((itemIn, index) => {
@@ -1026,7 +1053,7 @@ export default {
             }
           })
           .catch((error) => {
-        });
+          })
       },
       // 强制撤回权限
       compulsoryWithdrawaljurisdiction() {
@@ -1071,7 +1098,7 @@ export default {
             }
           })
           .catch((error) => {
-        });
+          })
       },
       // 分配填写人
       assignedBy() {
@@ -1194,58 +1221,6 @@ export default {
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
 
-  .doc-detail {
-    background: #fff;
-    height: 100%;
-
-    .Virtual-detail-header {
-      width: 100%;
-      height: 68px;
-      line-height: 68px;
-      padding: 0 32px 0 32px;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-      border-bottom: 2px #eff1f3 solid;
-      background: #fff;
-      .Virtual-detail-title {
-        display: inline-block;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        font-size: 20px;
-        font-weight: 400;
-        color: #040B29;
-        line-height: 68px;
-      }
-
-      .doc-detail-right {
-        width: 800px;
-        line-height: 68px;
-        display: flex;
-      }
-    }
-
-    .Virtual-detail-content {
-      margin-top: 68px;
-      padding: 0 38px 0 38px;
-      box-sizing: border-box;
-      font-size: 16px;
-
-      .box-title-text-add {
-        line-height: 1.4;
-      }
-
-      .title-text-add {
-        display: inline-block;
-        font-weight: 500;
-        margin-right: 16px;
-        height: 42px;
-        line-height: 42px;
-      }
-    }
-  }
-
   .header-text {
     font-size: 16px;
     font-weight: 400;
@@ -1304,6 +1279,7 @@ export default {
     cursor: pointer;
     border-radius: 4px;
   }
+
   .operator-text-title {
     cursor: pointer;
     margin-right: 22px;
@@ -1312,10 +1288,12 @@ export default {
     color: #040B29;
     margin-bottom: 22px;
   }
+
   .box-title-text-index {
     line-height: 1.4;
     display: flex;
   }
+
   .title-text-Comment {
     width: 74px;
     text-align: right;
@@ -1329,16 +1307,122 @@ export default {
     height: 42px;
     line-height: 36px;
   }
+
   .box-input .ant-select-selection {
     height: 38px !important;
   }
+
   .itemitem {
     width: 250px;
   }
+
   .box-input .ant-select-selection__rendered {
     line-height: 38px;
   }
+
   .Required {
     color: red;
   }
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-content {
+      margin-top: 68px;
+      padding: 0 38px 0 38px;
+      box-sizing: border-box;
+      font-size: 16px;
+
+      .box-title-text-add {
+        line-height: 1.4;
+      }
+
+      .title-text-add {
+        display: inline-block;
+        font-weight: 500;
+        margin-right: 16px;
+        height: 42px;
+        line-height: 42px;
+      }
+    }
+
+    .Virtual-detail-header {
+      width: 100%;
+      height: 68px;
+      line-height: 68px;
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-bottom: 2px #eff1f3 solid;
+      background: #fff;
+      z-index: 1000;
+
+      .Virtual-detail-title {
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        font-size: 20px;
+        font-weight: 400;
+        color: #040B29;
+        line-height: 68px;
+      }
+
+      .doc-detail-right {
+        width: 800px;
+        line-height: 68px;
+        display: flex;
+      }
+    }
+
+    .Virtual-detail-content {
+      padding: 0 32px 0 32px;
+      box-sizing: border-box;
+      font-size: 16px;
+
+      .box-title-text-add {
+        line-height: 1.4;
+      }
+
+      .title-text-add {
+        display: inline-block;
+        width: 100%;
+        font-weight: 500;
+        margin-right: 16px;
+        height: 42px;
+        line-height: 42px;
+      }
+    }
+  }
 </style>

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

@@ -49,7 +49,7 @@
         :dataSource='dataSource'
         :pagination='false'
         :loading='loading'
-        :scroll='{x: 600}'
+        :scroll="{x: 600}"
         :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
         @change='handleTableChange'>
         <span slot="paramsManifestClick" slot-scope="text,record">
@@ -371,6 +371,7 @@
           pageNo: this.pageNo,
           ...this.queryParam
         }
+        this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {

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

@@ -95,8 +95,11 @@
                   <div class="title-text">
                     <!--                  <span class="title-text-text" :title="$t('Required')">{{$t('Required')}}</span>-->
                   </div>
-                  <a-button style="margin-right: .8rem" @click="addConfiguration(index)">{{$t('addConfiguration')}}</a-button>
+                  <a-button style="margin-right: .8rem" @click="addConfiguration(index)">{{$t('addConfiguration')}}
-                  <a-button @click="deleteConfiguration(item.id,index)" type="primary" :loading="confirmLoading">{{$t('deleteConfiguration')}}</a-button>
+                  </a-button>
+                  <a-button @click="deleteConfiguration(item.id,index)" type="primary" :loading="confirmLoading">
+                    {{$t('deleteConfiguration')}}
+                  </a-button>
                 </div>
               </a-col>
             </a-row>
@@ -115,6 +118,7 @@
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
   import axios from 'axios'
+
   export default {
     name: 'addModel',
     components: {
@@ -160,7 +164,7 @@ export default {
             version: '', // 版本
             carType: '', // 车型
             battery: '', // 电池
-          motor: '', // 电机
+            motor: '' // 电机
           }
         ],
         conIndex: 0,
@@ -200,7 +204,7 @@ export default {
                   version: '', // 版本
                   carType: '', // 车型
                   battery: '', // 电池
-                motor: '', // 电机
+                  motor: '' // 电机
                 }
               ]
             } else {
@@ -220,7 +224,7 @@ export default {
             version: '', // 版本
             carType: '', // 车型
             battery: '', // 电池
-          motor: '', // 电机
+            motor: '' // 电机
           })
         } else {
           this.$message.warning(this.$t('Theselectedconfiguration'))
@@ -235,7 +239,9 @@ export default {
         this.$confirm({
           content: _this.$t('ConfirmDelete'),
           onOk() {
+            if (displaySeq) {
               _this.deleteConfigIdsArray.push(displaySeq)
+            }
             _this.deleteConfigIds = _this.deleteConfigIdsArray.join(',')
             let _tt = _this.paramsConfigEOList.splice(index, 1)
             if (_tt.length === 1) {
@@ -327,7 +333,7 @@ export default {
             }
           })
         }
-    },
+      }
     }
   }
 </script>