Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

2022-07-02 15:33:05 +08:00
parent ab0081166e 0dda7f354b
commit 58b2c9ac31
35 changed files with 2398 additions and 362 deletions
@@ -1,6 +1,7 @@
 <template>
  <a-card :bordered="false">
    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
      <a-row :gutter="24">
        <a-col :md="6" :sm="8">
          <div class="box-title-text">
@@ -29,6 +30,7 @@
               </a-col>
      </span>
      </a-row>
+      </a-form>
    </div>
    <div class="table-operator">
      <div @click="handleAdd" class="operator-text" v-has="'params:template:add'">
@@ -1,32 +1,34 @@
 <template>
  <a-card :bordered="false">
    <div class="table-page-search-wrapper">
-      <a-row :gutter="24">
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" :title="$t('entryName')">
-              <span>{{$t('entryName')}}</span>
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('entryName')">
+                <span>{{$t('entryName')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                       v-model="queryParam.projectName"></a-input>
            </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
-                     v-model="queryParam.projectName"></a-input>
-          </div>
-        </a-col>
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" :title="$t('ListTitle')">
-              <span>{{$t('ListTitle')}}</span>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('ListTitle')">
+                <span>{{$t('ListTitle')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ListTitle')"
+                       v-model="queryParam.title"></a-input>
            </div>
-            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ListTitle')"
-                     v-model="queryParam.title"></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-row>
+      </a-form>
    </div>
    <div>
      <a-table
@@ -70,290 +72,294 @@
 </template>

 <script>
-import ExportHistory from '@/components/exporthistory/index'
-import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
-import axios from 'axios'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
-import eventBUs from '../../../common/event'
-import Vue from 'vue'
-export default {
-  name: 'index',
-  components: {
-    ExportHistory
-  },
-  data() {
-    return {
-      token:Vue.ls.get(ACCESS_TOKEN),
-      loading: false,
-      toggleSearchStatus: false,
-      selectedRowKeys: [],
-      selectedRowKeysArray: '',
-      formInline: {},
-      rules: {
-        paramsTemplateName:[
-          { required: true, message: this.$t('PleaseEnter')+this.$t('templateName'), trigger: 'change' },
-        ],
-      },
-      visible: false,
-      dataSource: [],
-      confirmLoading: false,
-      url: {
-        list: 'params/report/page',
-      },
-      total: 0,
-      pageSize: 10,
-      pageNo: 1,
-      title: '新增',
-      columns: [
-        {
-          title: this.$t('entryName'),
-          align: 'center',
-          width: '10%',
-          dataIndex: 'projectName',
-        },
-        {
-          title: this.$t('ListTitle'),
-          align: 'center',
-          dataIndex: 'title',
-        },
-        {
-          title: this.$t('Version'),
-          align: 'center',
-          dataIndex: 'version',
-        },
-        {
-          title: this.$t('operation'),
-          align: 'center',
-          fixed: 'right',
-          width: 200,
-          scopedSlots: { customRender: 'operation' }
-        }
-      ],
-      queryParam: {},
-      areaVisible:false,
-      paramsTemplateName: '',
-      drawerVisible: false,
-      titleTag: '导出历史'
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    handleCancel() {
-      this.areaVisible=false
-    },
-    handleSubmit() {
-      if( this.formInline.paramsTemplateName !== undefined) {
-        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
-      }
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {
-            if (res.success) {
-              this.areaVisible = false
-              this.$message.success(res.message)
-              this.selectedRowKeys = []
-              this.getList()
-            } else {
-              this.$message.warning(res.message)
-            }
-          })
-        }
-      })
-    },
-    handleToggleSearch() {
-      this.toggleSearchStatus = !this.toggleSearchStatus
-    },
-    onSelectChange(value) {
-      this.selectedRowKeys = value
-      this.selectedRowKeysArray = this.selectedRowKeys.join(',')
-    },
-    // 复制
-    handlecody(){
-      this.drawerVisible=true
-    },
-    hideModal(){
-      this.visible = false;
-    },
-    //编辑
-    edit(item) {
-      this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
-    },
-    //删除
-    deleteLib(val) {
-      let newUrl = this.$router.resolve({
-        path: '/managementdetails',
-        query: val
-      })
-      window.open(newUrl.href, '_blank')
-    },
-    //虚拟清单名称事件
-    entryNameClick(item) {
-      this.$router.push({
-        path: '/ParameterTemplateList',
-        query: item
-      })
-    },
-    searchQuery() {
-      this.pageNo = 1
-      this.getList()
-    },
-    searchReset() {
-      this.pageNo = 1
-      this.queryParam = {}
-      this.getList()
-    },
-    pageOnChange(page, pageSize) {
-      this.pageNo = page
-      this.getList()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.getList()
-    },
-    addModelList() {
-      this.pageNo = 1
-      this.getList()
-    },
-    PersonnelSelectionChange(value, id) {
-      this.queryParam[value] = id
-      this.queryParam = { ...this.queryParam }
-    },
-    getList() {
-      let query = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        ...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) {
-            this.pageNo = res.result.current - 1
-            this.getList()
-            return
-          }
-          this.dataSource = res.result.records || []
+  import ExportHistory from '@/components/exporthistory/index'
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import axios from 'axios'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import eventBUs from '../../../common/event'
+  import Vue from 'vue'

-          this.total = res.result.total
-          this.loading = false
-        } else {
-          this.loading = false
+  export default {
+    name: 'index',
+    components: {
+      ExportHistory
+    },
+    data() {
+      return {
+        token: Vue.ls.get(ACCESS_TOKEN),
+        loading: false,
+        toggleSearchStatus: false,
+        selectedRowKeys: [],
+        selectedRowKeysArray: '',
+        formInline: {},
+        rules: {
+          paramsTemplateName: [
+            { required: true, message: this.$t('PleaseEnter') + this.$t('templateName'), trigger: 'change' }
+          ]
+        },
+        visible: false,
+        dataSource: [],
+        confirmLoading: false,
+        url: {
+          list: 'params/report/page'
+        },
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        title: '新增',
+        columns: [
+          {
+            title: this.$t('entryName'),
+            align: 'center',
+            width: '10%',
+            dataIndex: 'projectName'
+          },
+          {
+            title: this.$t('ListTitle'),
+            align: 'center',
+            dataIndex: 'title'
+          },
+          {
+            title: this.$t('Version'),
+            align: 'center',
+            dataIndex: 'version'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 200,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        queryParam: {},
+        areaVisible: false,
+        paramsTemplateName: '',
+        drawerVisible: false,
+        titleTag: '导出历史'
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      handleCancel() {
+        this.areaVisible = false
+      },
+      handleSubmit() {
+        if (this.formInline.paramsTemplateName !== undefined) {
+          this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
        }
-      })
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {
+              if (res.success) {
+                this.areaVisible = false
+                this.$message.success(res.message)
+                this.selectedRowKeys = []
+                this.getList()
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        this.selectedRowKeysArray = this.selectedRowKeys.join(',')
+      },
+      // 复制
+      handlecody() {
+        this.drawerVisible = true
+      },
+      hideModal() {
+        this.visible = false
+      },
+      //编辑
+      edit(item) {
+        this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
+      },
+      //删除
+      deleteLib(val) {
+        let newUrl = this.$router.resolve({
+          path: '/managementdetails',
+          query: val
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //虚拟清单名称事件
+      entryNameClick(item) {
+        this.$router.push({
+          path: '/ParameterTemplateList',
+          query: item
+        })
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getList()
+      },
+      pageOnChange(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      addModelList() {
+        this.pageNo = 1
+        this.getList()
+      },
+      PersonnelSelectionChange(value, id) {
+        this.queryParam[value] = id
+        this.queryParam = { ...this.queryParam }
+      },
+      getList() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...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) {
+              this.pageNo = res.result.current - 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
    }
  }
-}
 </script>

 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';

-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }

-.title-text {
-  width: 20%;
-  min-width: 110px;
-  color: #000F16;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  margin-top: 3px;
-  text-align: right;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }

-.box-input {
-  display: inline-block;
-  width: 70%;
-  height: 38px;
-  margin-top: 2px;
-}
-.add-input{
-  width: 82%;
-}
-.box-button {
-  height: 38px;
-  /*margin-top: 2px;*/
-}
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }

-.text-operation {
-  margin-right: 8px;
-}
+  .add-input {
+    width: 82%;
+  }

-.page {
-  text-align: right;
-  margin-top: 20px;
-}
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }

-.box-title-text-add {
-  line-height: 1.4;
-  display: flex;
-}
+  .text-operation {
+    margin-right: 8px;
+  }

-.title-text-add {
-  width: 114px;
-  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;
-  margin-top: 3px;
-}
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }

-.box-input-add {
-  display: inline-block;
-  height: 38px;
-  width: 100%;
-}
+  .box-title-text-add {
+    line-height: 1.4;
+    display: flex;
+  }

-.itemModel {
-  width: calc(100% - 130px);
-  display: inline-block;
-  margin-top: 2px;
-}
+  .title-text-add {
+    width: 114px;
+    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;
+    margin-top: 3px;
+  }

-.Required {
-  color: red;
-  margin-right: 4px;
-}
+  .box-input-add {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }

-.title-text-text {
-  margin-top: 9px;
-}
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }

-.formAdd {
-  margin-bottom: 40px;
-}
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }

-.drawer-bootom-button {
-  position: absolute;
-  bottom: 0;
-  z-index:100;
-  width: 100%;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 2px 2px;
-}
-.add-text-text{
-  margin-top: -14px;
-}
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .add-text-text {
+    margin-top: -14px;
+  }
 </style>
@@ -1,6 +1,7 @@
 <template>
  <a-card :bordered="false">
    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
      <a-row :gutter="24">
        <a-col :md="6" :sm="8">
          <div class="box-title-text">
@@ -18,6 +19,7 @@
               </a-col>
      </span>
      </a-row>
+      </a-form>
    </div>
    <div class="table-operator">
      <div @click="handleAdd" class="operator-text" v-has="'params:template:add'">
@@ -1,6 +1,7 @@
 <template>
  <a-card :bordered="false">
    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
      <a-row :gutter="24">
        <a-col :md="6" :sm="8">
          <div class="box-title-text">
@@ -38,6 +39,7 @@
               </a-col>
      </span>
      </a-row>
+      </a-form>
    </div>
    <div class="table-operator">
      <div @click="handleAdd" class="operator-text" v-has="'params:paramsInfo:add'">
@@ -130,6 +130,11 @@
              <a-icon type="plus"/>
              {{$t('referenceparameter')}}
            </div>
+            <!--            保存-->
+            <div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre"'>
+              <a-icon type="check-circle"/>
+              {{$t('preservation')}}
+            </div>
            <!--      提交-->
            <div @click="handleSubmit" class="operator-text" v-if='currentPersonRole == "dre"'>
              <a-icon type="check-circle"/>
@@ -157,7 +162,9 @@
          <div style="width: 100%">
            <!-- 表格-10控件-->
            <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                              :formInline='formInline' :currentPersonRole='currentPersonRole' @value='value'
+                              :formInline='formInline' :currentPersonRole='currentPersonRole'
+                              @getDataSource="getDataSource"
+                              @value='value'
                              @listReset='listReset' @LoginUserType='LoginUserType'/>
          </div>
        </a-card>
@@ -363,6 +370,7 @@
  import axios from 'axios'
  import { ACCESS_TOKEN } from '@/store/mutation-types'
  import Vue from 'vue'
+  import { mapGetters } from 'vuex'

  export default {
    name: 'ParameterItemCollectionList',
@@ -502,18 +510,47 @@
    },
    mounted() {
      this.GetgetLoginUserType()
+      this.time = setInterval(() => {
+        if (this.currentPersonRole == "dre"){
+          this.handlePreservation()
+        }
+      }, 10000)
      this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
      document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
    },
+    beforeDestroy() {
+      clearInterval(this.time)
+    },
    methods: {
+      ...mapGetters(['userInfo']),
      handleCancelRoleSwitching() {
        this.visibleRoleSwitching = false
      },
      handleOkRoleSwitching() {
-        this.visibleRoleSwitching = false
-        this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
-        localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
-        this.selectedRowKeysValue = []
+        this.$refs.ruleFormRoleSwitching.validate(valid => {
+          if (valid) {
+            let query = {
+              userType: this.formInlineRoleSwitching.roleSwitchingCode,
+              paramsManifestId: this.$route.query.id,
+              projectId: this.$route.query.projectId,
+              userId: this.userInfo().id
+            }
+            this.confirmLoadingRoleSwitching = true
+            postAction('/params/userTypeLog/edit', query).then((res) => {
+              if (res.success) {
+                this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visibleRoleSwitching = false
+                this.confirmLoadingRoleSwitching = false
+                localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
+                this.selectedRowKeysValue = []
+              } else {
+                this.confirmLoadingRoleSwitching = false
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            })
+          }
+        })
      },
      roleSwitchingClick() {
        this.visibleRoleSwitching = true
@@ -792,13 +829,13 @@
        }
        return flag
      },
-      LoginUserType(val, currentPersonRole) {
+      LoginUserType(val, currentPersonRole, userType) {
        this.RoleType = []
        if (this.currentPersonRole == '') {
-          this.currentPersonRole = val.length >= 1 ? val[0].value : ''
+          this.currentPersonRole = currentPersonRole || userType || val[0].value
        }
        this.RoleType = val
-        this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || val[0].value
+        this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
        this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
      },
      // 表格所选中得行内容
@@ -979,6 +1016,60 @@
          this.NoEngineer = 1
        }
      },
+      getDataSource(data) {
+        this.dataSource = data
+      },
+      handlePreservation(num) {
+        let _this = this
+        let postDate = []
+        let data = JSON.parse(JSON.stringify(this.dataSource))
+        let selectedRowKeysValue = []
+        data.forEach(res => {
+          if (res.state == 'Wait Fill' || res.state == '待填写') {
+            selectedRowKeysValue.push(res)
+          }
+        })
+        for (let i = 0; i < selectedRowKeysValue.length; i++) {
+          let postDateobj = {}
+          let itemIn = Object.keys(selectedRowKeysValue[i])
+          for (let j = 0; j < itemIn.length; j++) {
+            if (itemIn[j] !== 'sdt') {
+              if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
+                postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
+                for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
+                  if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
+                    selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
+                  }
+                  if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
+                    selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
+                  }
+                }
+              }
+            }
+          }
+          postDateobj.id = selectedRowKeysValue[i].id
+          postDate.push(postDateobj)
+        }
+        let configDataList = { configDataList: postDate }
+        if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
+          if (num && num == 1) {
+            this.textLoading = true
+          }
+          postAction('/params/collectManifest/save', configDataList).then((res) => {
+            if (res.success) {
+              if (num && num == 1) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                this.textLoading = false
+              }
+            } else {
+              if (num && num == 1) {
+                _this.$message.warning(_this.$t('operationFailed'))
+                this.textLoading = false
+              }
+            }
+          })
+        }
+      },
      // 提交数据
      ishandleSubmit() {
        let _this = this
@@ -65,7 +65,8 @@
        <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="configure(record)" v-has="'params:config:list'">{{$t('configure')}}</a>
            <a class="text-operation" @click="edit(record)" v-has="'params:manifest:edit'">{{$t('edit')}}</a>
-            <a class="text-operation" @click="deleteLib(record)" v-has="'params:manifest:delete'">{{$t('deleteLib')}}</a>
+            <a class="text-operation" @click="deleteLib(record)"
+               v-has="'params:manifest:delete'">{{$t('deleteLib')}}</a>
            <a class="text-operation" @click="historicalVersion(record)" v-has="'params:manifest:history'">{{$t('historicalVersion')}}</a>
        </span>
      </a-table>
@@ -114,6 +115,7 @@
  import Vue from 'vue'
  import { ACCESS_TOKEN } from '@/store/mutation-types'
  import eventBUs from '@/common/event'
+  import store from '@/store/'

  export default {
    name: 'TaskParameterCollection',
@@ -199,7 +201,7 @@
          conList: 'params/config/list',
          changeExtension: 'params/manifest/changeExtension',
          verifyConfig: 'params/manifest/verifyConfig',
-          configurelist:'params/manifest/getConfigFlag',
+          configurelist: 'params/manifest/getConfigFlag'
        },
        loading: false,
        dataSource: [],
@@ -215,7 +217,7 @@
        version: 0,
        itemId: '', // 配置id
        itemRow: {}, // 配置一行数据
-        configFlag:'',
+        configFlag: '',
        historicalVisible: false,
        historicalRow: {}, // 历史版本得数据
        drawerVisible: false,
@@ -224,6 +226,22 @@
        selectedRowKeysvalArray: []
      }
    },
+    created() {
+      if (store.getters.userInfo) {
+        this.$socketPublicOne.dispatch('webSocketInit')//初始化ws
+      }
+    },
+    watch: {
+      '$socketPublicOne.state.msg': {
+        //处理接收到的消息
+        handler: function(res) {
+          let that = this
+          if (res.data == '1'){
+          this.getlist()
+          }
+        }
+      }
+    },
    mounted() {
      this.getlist()
    },
@@ -275,9 +293,8 @@
      // 配置
      configure(item) {
        this.itemId = item.id
-
        this.itemRow = item
-        this.$refs.configureRef.addModel(item.id)
+        this.$refs.configureRef.addModel(item.id, item)
      },
      handleCancel(val) {
        this.areaVisible = val
@@ -95,7 +95,7 @@
                  <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)" v-has="'params:config:add'">{{$t('addConfiguration')}}
+                  <a-button style="margin-right: .8rem" @click="addConfiguration(index)" :loading="loading" v-has="'params:config:add'">{{$t('addConfiguration')}}
                  </a-button>
                  <a-button @click="deleteConfiguration(item.id,index)" v-has="'params:config:delete'" type="primary" :loading="confirmLoading">
                    {{$t('deleteConfiguration')}}
@@ -146,6 +146,7 @@
        formInline: {},
        confirmLoading: false,
        visible: false,
+        loading:false,
        rules: {
          // nioNumber:[
          //   { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'change' },
@@ -155,7 +156,7 @@
        projectNameList: [],
        title: '',
        stateOne: '',
-        configFlag:'',
+        conFlag:'',
        contentList: [],
        paramsConfigEOList: [
          {
@@ -187,19 +188,13 @@
          }
        })
      },
-      addModel(id) {
+      addModel(id,item) {
        this.paramsConfigEOList = []
        this.visible = true
        this.title = this.$t('MaintainConfigureInfo')
        this.formInline = {}
        this.getconList(id)
-        getAction(this.url.configurelist, { paramsManifestId: this.itemRow.id }).then((res) => {
-          if (res.success) {
-            this.configFlag = res.result
-          } else {
-            this.$message.warning(res.message)
-          }
-        })
+
      },
      getconList(id) {
        getAction(`${this.url.conList}?paramsManifestId=${id}`, {}).then((res) => {
@@ -226,19 +221,29 @@
        })
      },
      addConfiguration(item) {
-        console.log(this.configFlag)
-        if (this.configFlag == true) {
-          this.paramsConfigEOList.splice(item.displaySeq + 1, 0, {
-            id: '',
-            configName: '', // 配置名称
-            version: '', // 版本
-            carType: '', // 车型
-            battery: '', // 电池
-            motor: '' // 电机
-          })
-        } else {
-          this.$message.warning(this.$t('Theselectedconfiguration'))
-        }
+        this.loading = true
+        getAction(this.url.configurelist, { paramsManifestId: this.itemRow.id }).then((res) => {
+          if (res.success) {
+            this.conFlag = res.result
+            if (this.conFlag == true) {
+              this.paramsConfigEOList.splice(item.displaySeq + 1, 0, {
+                id: '',
+                configName: '', // 配置名称
+                version: '', // 版本
+                carType: '', // 车型
+                battery: '', // 电池
+                motor: '' // 电机
+              })
+              this.loading = false
+            } else {
+              this.loading = false
+              this.$message.warning(this.$t('Theselectedconfiguration'))
+            }
+          } else {
+            this.$message.warning(res.message)
+          }
+        })
+
      },
      deleteConfiguration(displaySeq, index) {
        if (this.paramsConfigEOList.length === 1) {
@@ -262,6 +267,8 @@
      },
      handleCancel() {
        this.visible = false
+        this.$refs.ruleForm.clearValidate()
+        this.conFlag = ''
      },
      handleSubmit() {
        let flag = 1