-
+
+
+
+
+
+
+
+
+
{{ $t('selectAll') }}
+
+
+ {{ item.db_field_txt }}
+
+
+
+
+
+
+
+ {{ $t('customize') }}
+
+
+
+
+
{{ $t('applyforrematch') }}
+
+
+
+
+
+
+
+
+
+
+
{{ $t('selectAll') }}
+
+
+ {{ item.db_field_txt }}
+
+
+
+
+
+
+
+ {{ $t('customize') }}
+
+
-
-
- {{ $t('See') }}
-
+
+
+ {{$t('historicalrecord')}}
+
+
+
+ {{text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -178,11 +304,21 @@ import { mapGetters } from 'vuex'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import ImportFile from '@/components/ImportFileData/index'
import moment from 'moment'
+import batSetting from './batSetting'
+import applyforrematch from './applyforrematch'
+import rejectReason from './rejectReason'
+import historyTable from './historyTable.vue'
+import remark from './remark.vue'
export default {
name: 'index',
components: {
- ImportFile
+ ImportFile,
+ batSetting,
+ applyforrematch,
+ rejectReason,
+ historyTable,
+ remark,
},
mixins: [ResizeHeader, ResizeColumnProvide],
data() {
@@ -199,13 +335,19 @@ export default {
visible: false,
loading: false,
toggleSearchStatus: false,
+ customizevisible: false,
dataSource: [],
selectedRowKeys: [],
selectedRowKeysRecord: [],
+ // checkedList: ['nio_number', 'params_name', 'operation'],
+ checkedList: [],
+ customizeList:[],
serialNumber: '',
total: 0,
pageSize: 10,
pageNo: 1,
+ pageNohistory: 1,
+ pageSizehistory: 10,
CategoryTreeList: [],
softwareversionList: [],
softwareplatform: [],
@@ -213,6 +355,24 @@ export default {
marketList: [],
queryParam: {},
formInline: {},
+ dataSourcehistory: [],
+ columnshistory: [
+ {
+ title: this.$t('OperationDetails'),
+ dataIndex: 'logContent',
+ align: 'left',
+ width: 320,
+ ellipsis: true,
+ scopedSlots: { customRender: 'content' }
+ },
+ {
+ title: this.$t('OperationTime'),
+ dataIndex: 'createTime',
+ align: 'left',
+ ellipsis: true,
+ width: 180
+ }
+ ],
rules: {
whetherTobring: [
{
@@ -398,7 +558,15 @@ export default {
align: 'left',
width: 170,
ellipsis: true,
- dataIndex: 'remarks'
+ dataIndex: 'remarks',
+ scopedSlots: { customRender: 'remarks' }
+ },
+ {
+ title: this.$t('operation'),
+ align: 'left',
+ width: 170,
+ ellipsis: true,
+ scopedSlots: { customRender: 'operation' }
},
],
userInfoQuery: {},
@@ -507,15 +675,88 @@ export default {
},
// 下发通知
issuenotice(){
-
+ let _this = this
+ this.$confirm({
+ content: _this.$t('notificationsent'),
+ onOk() {
+ // let query = {
+ // configDataList: configDataList,
+ // paramsManifestId: _this.paramsManifest.id
+ // }
+ // postAction(_this.url.add, query).then((res) => {
+ // if (res.success) {
+ // _this.$message.success(_this.$t('OperationSuccessful'))
+ // _this.GetgetTableList()
+ // } else {
+ // _this.$message.warning(_this.$t('operationFailed'))
+ // }
+ // })
+ }
+ })
},
// 批量设置
BatchSetting(){
-
+ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+ let content = []
+ this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+ } else {
+ this.$message.warning(this.$t('selectLeastOne'))
+ }
},
// 申请重新匹配
applyforrematch(){
-
+ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+ let content = []
+ this.$refs.applyforrematchRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+ } else {
+ this.$message.warning(this.$t('selectLeastOne'))
+ }
+ },
+ // 历史记录
+ UpdateLog(val) {
+ this.visible = true
+ this.paramsReportDetailId = val.id
+ this.bussLogList(val)
+ },
+ onChangehistory(page, pageSize) {
+ this.pageNohistory = page
+ this.bussLogList()
+ },
+ SizeChangehistory(page, pageSize) {
+ this.pageNohistory = 1
+ this.pageSizehistory = pageSize
+ this.bussLogList()
+ },
+ bussLogList(val) {
+ let query = {
+ pageNo: this.pageNohistory,
+ pageSize: this.pageSizehistory,
+ paramsManifestId: this.$route.query.id,
+ paramsCollectManifestId: this.paramsReportDetailId
+ }
+ this.loading = true
+ getAction('paramsCollectManifestLog/paramsCollectManifestLogEO/page', query).then((res) => {
+ if (res.success) {
+ this.dataSourcehistory = res.result.records
+ if (this.dataSourcehistory && this.dataSourcehistory.length > 0) {
+ this.dataSourcehistory.forEach(val => {
+ val.logContent = val.logContent.replace(/\"/g, '
"')
+ })
+ }
+ this.total = res.result.total
+ this.loading = false
+ } else {
+ this.loading = false
+ }
+ })
+ },
+ handleOk() {
+ this.pageNohistory = 1
+ this.visible = false
+ },
+ handleCancel() {
+ this.pageNohistory = 1
+ this.visible = false
},
// 保存
preservation(){
@@ -523,15 +764,155 @@ export default {
},
// 提交
submit(){
-
+ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+ // this.$refs.rejectReasonRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+ } else {
+ this.$message.warning(this.$t('selectLeastOne'))
+ }
},
// 确认
confirm(){
-
+ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+ // this.$refs.rejectReasonRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+ } else {
+ this.$message.warning(this.$t('selectLeastOne'))
+ }
},
// 退回
sendBack(){
+ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+ this.$refs.rejectReasonRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+ } else {
+ this.$message.warning(this.$t('selectLeastOne'))
+ }
+ },
+ // 备注编辑
+ getremark(item){
+ this.$refs.remarkRef.edit(JSON.parse(JSON.stringify(item)))
+ },
+ remarkForm(data,val){
+ console.log(data)
+ // 根据id匹配
+ this.dataSource.forEach(item => {
+ if(item.id == val){
+ item.remark = data
+ }
+ })
+ },
+ getcustomize() {
+ this.customizevisible = true
+ },
+ cancel() {
+ this.customizevisible = false
+ },
+ getcustomizeList(item){
+ let params = {
+ paramsManifestId: this.$route.query.id,
+ flag: '8'
+ }
+ getAction('report/detail/getHeader', params).then((res) => {
+ if (res.success) {
+ let List = []
+ let sList = []
+ res.result.forEach((item,index) => {
+ if(!item.type){
+ if(item.headFieldCn == '操作'){
+ item.field = 'operation'
+ item.disabled = true
+ }else if(item.headFieldCn == 'NIO编号' || item.headFieldCn == '参数名称'){
+ item.disabled = true
+ }
+ List.push(item)
+ }
+ if(item.type) {
+ sList.push(item)
+ }
+ })
+ this.customizeList = List
+ this.statuList = sList
+ }
+ })
+ if(item){
+ console.log(item)
+ this.checkedList = item
+ }
+ },
+ Change() {
+ this.selectedValue = this.checkedList
+ },
+ onCheckAllChange(e) {
+ let selectedValue = ['nio_number', 'params_name', 'operation']
+ this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue
+ this.selectedValue = this.checkedList
+ this.indeterminate = false
+ },
+ handleSubmitcustomize() {
+ let list = []
+ let uniqueArray = this.selectedValue.filter((item, index, array) => {
+ return array.indexOf(item) === index
+ })
+ uniqueArray.forEach(item => {
+ this.customizeList.forEach((val, index) => {
+ if (item == val.field) {
+ // val.sort = index + 1
+ val.dbFieldName = val.db_field_name
+ val.dbFieldTxt = val.db_field_txt
+ list.push(val)
+ }
+ })
+ })
+ this.confirmLoading = true
+ let headCustomEOList = JSON.parse(JSON.stringify(list)).concat(this.statuList)
+ let query = {
+ headCustomEOList: headCustomEOList
+ }
+ postAction('head/headCustomEO/add', query).then((res) => {
+ if (res.success) {
+ this.confirmLoading = false
+ this.$message.success(this.$t('OperationSuccessful'))
+ this.customizevisible = false
+ this.getHeader()
+ } else {
+ this.$message.warning(this.$t('operationFailed'))
+ this.confirmLoading = false
+ this.customizevisible = false
+ }
+ })
+ },
+ getHeader() {
+ getAction('head/headCustomEO/list', {
+ moduleFlag: 'ota'
+ }).then((res) => {
+ if (res.success) {
+ if(res.result && res.result.length > 0){
+ this.columnsAll = res.result
+ }else{
+ this.columnsAll = this.columns
+ }
+ for (let j = 0; j < this.columnsAll.length; j++) {
+ for (let i = 0; i < this.column.length; i++) {
+ if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) {
+ this.columnsAll[j] = this.column[i]
+ }
+ }
+ }
+ if(this.vehicleType != 'all'){
+ this.columnsAll.push({
+ title: this.$t('operation'),
+ align: 'left',
+ fixed: 'right',
+ width: 120,
+ scopedSlots: { customRender: 'operation' }
+ })
+ }
+ this.loading = false
+ this.JLoading = false
+ } else {
+ this.JLoading = false
+ this.loading = false
+ }
+ })
},
onChange(value, dateString) {
if (this.queryParams.softwarereleasetime && this.queryParams.softwarereleasetime.length > 0) {
@@ -621,4 +1002,10 @@ export default {
::v-deep .ant-table-placeholder {
margin-top: 8px !important;
}
+::v-deep .popconfirmClassName .ant-popover-buttons{
+ display: none !important;
+}
+::v-deep .popconfirmClassName .anticon-exclamation-circle {
+ display: none !important;
+}
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue
new file mode 100644
index 000000000..4c6a80a74
--- /dev/null
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{text && text.length > 10?text.slice(0,9)+'...':text}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
new file mode 100644
index 000000000..c28ae29c5
--- /dev/null
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+ *
+
+ {{$t('rejectReason')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue
new file mode 100644
index 000000000..afb9d6452
--- /dev/null
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue
@@ -0,0 +1,222 @@
+
+
+
+
+
+
+
+
+
+
+ {{$t('remarks')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file