WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] binaji

Browse Source
This commit is contained in:
zhaomeijing
2022-05-27 16:06:29 +08:00
parent 02f9ddd4e3
commit 5a74bad2de
4 changed files with 164 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+32 -25
View File
@@ -226,7 +226,6 @@
}, },
// 历史版本 // 历史版本
historicalVersion(historicalRow) { historicalVersion(historicalRow) {
console.log(historicalRow)
this.historicalVisible = true this.historicalVisible = true
this.historicalRow = historicalRow this.historicalRow = historicalRow
}, },
@@ -271,33 +270,40 @@
handleAdd() { handleAdd() {
this.areaVisible = true this.areaVisible = true
}, },
// 变更扩展
handleModule() { handleModule() {
let _this = this let _this = this
axios({ if(this.selectedRowKeys.length == 0){
url: `/jero-boot/params/manifest/changeExtension?id=${this.selectedRowKeys[0]}`, this.$message.warning(_this.$t('pleaseSelectData'))
method: 'get', }else if(this.selectedRowKeys.length > 2){
transformRequest: [function(data) { this.$message.warning(_this.$t('OnlyOneSelected'))
let ret = '' } else {
for (let it in data) { axios({
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' url: `/jero-boot/params/manifest/changeExtension?id=${this.selectedRowKeys[0]}`,
} method: 'get',
return ret transformRequest: [function(data) {
}], let ret = ''
headers: { for (let it in data) {
'Content-Type': 'application/x-www-form-urlencoded', ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
'X-Access-Token': _this.token }
} return ret
}) }],
.then((res) => { headers: {
if (res.data.success) { 'Content-Type': 'application/x-www-form-urlencoded',
_this.$message.success(res.data.message) 'X-Access-Token': _this.token
} else {
_this.$message.warning(res.data.message)
} }
}) })
.catch((error) => { .then((res) => {
console.log(error) if (res.data.success) {
}) _this.$message.success(res.data.message)
} else {
_this.$message.warning(res.data.message)
}
})
.catch((error) => {
console.log(error)
})
}
}, },
handleDel() { handleDel() {
let param = { let param = {
@@ -323,7 +329,8 @@
} }
}, },
handleCody() { handleCody() {
this.areaVisibleCody = true console.log('复制')
// this.areaVisibleCody = true
}, },
getPersonnelList() { getPersonnelList() {
jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+38 -7
View File
@@ -11,9 +11,11 @@
> >
<a-row :gutter='24'> <a-row :gutter='24'>
<a-col :span='9'> <a-col :span='9'>
<span class="Required">*</span>
<a-form-model-item :label="$t('title')" prop='templatetitle' :rules='rules'> <a-form-model-item :label="$t('title')" prop='templatetitle' :rules='rules'>
<a-input style='width: 420px' <a-input style='width: 420px'
v-model='templatetitle' /> :placeholder="$t('PleaseEnter')+$t('title')"
v-model='form.templatetitle' />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span='9'> <a-col :span='9'>
@@ -37,6 +39,7 @@
<a-col :span='9'> <a-col :span='9'>
<a-form-model-item ref='paramsTemplateName' :label="$t('parameterTemplate')" prop='paramsTemplateName'> <a-form-model-item ref='paramsTemplateName' :label="$t('parameterTemplate')" prop='paramsTemplateName'>
<a-input <a-input
:placeholder="$t('PleaseEnter')+$t('parameterTemplate')"
v-model='form.paramsTemplateName' /> v-model='form.paramsTemplateName' />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
@@ -62,6 +65,17 @@
v-has="'area:delete'">{{ $t('delete') }}</a> v-has="'area:delete'">{{ $t('delete') }}</a>
</span> </span>
</a-table> </a-table>
<div class="page" style='display: flex;justify-content: flex-end;'>
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
@change="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
<div class='drawer-bootom-button'> <div class='drawer-bootom-button'>
<a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button> <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
<a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button> <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
@@ -108,16 +122,18 @@ export default {
}, },
form: {}, form: {},
rules: { rules: {
// templatetitle: [ templatetitle: [
// { required: true, message: this.$t('enterTitle'), trigger: 'blur' } { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
// ] ]
}, },
areaTable: [], areaTable: [],
flag: false, //表单提交标识 flag: false, //表单提交标识
spinLoading: false, spinLoading: false,
confirmLoading: false, confirmLoading: false,
templatetitle: '', templatetitle: '',
selectedRowKeys: [] selectedRowKeys: [],
pageNo: 1,
pageSize: 10
} }
}, },
props: { props: {
@@ -151,14 +167,25 @@ export default {
this.loadData() this.loadData()
}, },
methods: { methods: {
pageOnChange(page, pageSize) {
this.pageNo = page
this.loadData()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.loadData()
},
loadData() { loadData() {
this.loading = true this.loading = true
let params = { let params = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.form ...this.form
} }
getAction(`params/manifest/getParamsTemplateList`, params).then(res => { getAction(`params/manifest/getParamsTemplatePage`, params).then(res => {
if (res.success) { if (res.success) {
this.areaTable = [...res.result] this.areaTable = [...res.result.records]
this.total = res.result.total this.total = res.result.total
} }
}).finally(() => { }).finally(() => {
@@ -331,6 +358,10 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.Required {
color: red;
margin-left: 20px;
}
</style> </style>
<style lang='less'> <style lang='less'>
.area-module { .area-module {
jero-web/src/views/projectManagement/dialog/ParameterTemplateCody.vue
+72 -71
View File
@@ -154,18 +154,19 @@ export default {
}, },
methods: { methods: {
loadData() { loadData() {
this.loading = true console.log('复制')
let params = { // this.loading = true
...this.form // let params = {
} // ...this.form
getAction(`params/manifest/getParamsTemplateList`, params).then(res => { // }
if (res.success) { // getAction(`params/manifest/getParamsTemplateList`, params).then(res => {
this.areaTable = [...res.result] // if (res.success) {
this.total = res.result.total // this.areaTable = [...res.result]
} // this.total = res.result.total
}).finally(() => { // }
this.loading = false // }).finally(() => {
}) // this.loading = false
// })
}, },
searchQuery() { searchQuery() {
this.loadData() this.loadData()
@@ -188,66 +189,66 @@ export default {
this.newVisible = true this.newVisible = true
this.form = {} this.form = {}
}, },
//新增 // 复制 - 确定
handleSubmit() { handleSubmit() {
if (this.selectedRowKeys.length == 0) { // if (this.selectedRowKeys.length == 0) {
this.$message.warning(this.$t('pleaseSelectData')) // this.$message.warning(this.$t('pleaseSelectData'))
} else if (this.selectedRowKeys.length > 1) { // } else if (this.selectedRowKeys.length > 1) {
this.$message.warning(this.$t('OnlyOneSelected')) // this.$message.warning(this.$t('OnlyOneSelected'))
} else { // } else {
this.$refs.ruleForm.validate(valid => { // this.$refs.ruleForm.validate(valid => {
if (valid) { // if (valid) {
this.flag = true // this.flag = true
this.spinLoading = true // this.spinLoading = true
// 新增編輯之前 判断 标题唯一 // // 新增編輯之前 判断 标题唯一
getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id} // getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}
&title=${this.templatetitle}`, {}) // &title=${this.templatetitle}`, {})
.then(res => { // .then(res => {
if (res.success) { // if (res.success) {
let postDate = { // let postDate = {
// sourceManifestId: // // sourceManifestId:
paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id, // paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id,
paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version, // paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version,
projectId: this.projectId // projectId: this.projectId
} // }
let _this = this // let _this = this
axios({ // axios({
url: `/jero-boot/params/manifest/copy`, // url: `/jero-boot/params/manifest/copy`,
method: 'post', // method: 'post',
data: postDate, // data: postDate,
transformRequest: [function (data) { // transformRequest: [function (data) {
let ret = '' // let ret = ''
for (let it in data) { // for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' // ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
} // }
return ret // return ret
}], // }],
headers: { // headers: {
'Content-Type': 'application/x-www-form-urlencoded', // 'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token':_this.token // 'X-Access-Token':_this.token
} // }
}) // })
.then( (res) =>{ // .then( (res) =>{
if (res.data.success) { // if (res.data.success) {
_this.$message.success(res.data.result) // _this.$message.success(res.data.result)
}else{ // }else{
_this.$message.warning(res.data.result) // _this.$message.warning(res.data.result)
} // }
}) // })
.catch( (error) =>{ // .catch( (error) =>{
console.log(error); // console.log(error);
}); // });
} else { // } else {
this.$message.warning(res.message) // this.$message.warning(res.message)
} // }
}).finally(() => { // }).finally(() => {
this.loading = false // this.loading = false
}) // })
} else { // } else {
return false // return false
} // }
}) // })
} // }
}, },
cancelModel() { cancelModel() {
this.newVisible = false this.newVisible = false
jero-web/src/views/projectManagement/dialog/historicalVersion.vue
+22 -20
View File
@@ -12,7 +12,7 @@
:scroll='{x: 600}'> :scroll='{x: 600}'>
<a slot='name' slot-scope='text'>{{ text }}</a> <a slot='name' slot-scope='text'>{{ text }}</a>
<span slot='action' slot-scope='text, record'> <span slot='action' slot-scope='text, record'>
<a class='action-edit' @click='editArea(record.id)' v-has="'area:edit'">{{ $t('edit') }}</a> <a class='action-edit' @click='editArea(record.id)' v-has="'area:edit'">{{ $t('See') }}</a>
</span> </span>
</a-table> </a-table>
</div> </div>
@@ -38,8 +38,7 @@ export default {
columns: [ columns: [
{ {
title: this.$t('VersionNumber'), title: this.$t('VersionNumber'),
dataIndex: 'region_dictText', dataIndex: 'version',
key: 'showArea',
align: 'center', align: 'center',
ellipsis: true ellipsis: true
}, },
@@ -47,7 +46,8 @@ export default {
title: this.$t('operation'), title: this.$t('operation'),
align: 'center', align: 'center',
dataIndex: 'paramsTemplateName', dataIndex: 'paramsTemplateName',
ellipsis: true ellipsis: true,
scopedSlots: { customRender: 'action' }
} }
], ],
newVisible: false, newVisible: false,
@@ -71,9 +71,10 @@ export default {
}, },
methods: { methods: {
loadData() { loadData() {
console.log(this.historicalRow,'this.historicalRow')
let _this = this let _this = this
axios({ axios({
url: `/jero-boot/params/collectManifestHistory/getConfigById?id=${this.historicalRow.id}`, url: `/jero-boot/params/manifest/history?title=${this.historicalRow.title}`,
method: 'get', method: 'get',
transformRequest: [function (data) { transformRequest: [function (data) {
let ret = '' let ret = ''
@@ -88,9 +89,8 @@ export default {
} }
}) })
.then( (res) =>{ .then( (res) =>{
console.log(res)
if (res.data.success) { if (res.data.success) {
console.log(res,'lll') this.areaTable = res.data.result
}else{ }else{
_this.$message.warning(res.data.result) _this.$message.warning(res.data.result)
} }
@@ -99,21 +99,23 @@ export default {
console.log(error); console.log(error);
}); });
}, },
//编辑按钮 // 查看
editArea(val) { editArea(val) {
this.title = this.$t('edit') console.log('查看')
this.newVisible = true
let params = {
id: val
}
getAction(`tag/onlCgformArea/queryById`, params).then((res) => {
if (res.success) {
this.form = { ...res.result }
// this.$emit('updateOk',res.result)
}
})
} }
// this.title = this.$t('edit')
// this.newVisible = true
// let params = {
// id: val
// }
// getAction(`tag/onlCgformArea/queryById`, params).then((res) => {
// if (res.success) {
// this.form = { ...res.result }
// // this.$emit('updateOk',res.result)
//
// }
// })
// }
}, },
} }
</script> </script>