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
@@ -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