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

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-07-02 16:46:59 +08:00
parent 9d20350ef5
commit ddd925097c
1 changed files with 279 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/ReferenceParameter/index.vue
+279 -267
View File
@@ -28,20 +28,20 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
<!-- <a-form-model-item style='line-height: 31.9999px;' prop='sourceConfigId' class='aform'>--> <!-- <a-form-model-item style='line-height: 31.9999px;' prop='sourceConfigId' class='aform'>-->
<!-- <div style='display: flex; justify-content: center'>--> <!-- <div style='display: flex; justify-content: center'>-->
<!-- <span class="Requireditem">*</span>--> <!-- <span class="Requireditem">*</span>-->
<!-- <div style='width: 107px;line-height: 29px;'>{{ $t('from') }}&nbsp;&nbsp;&nbsp;</div>--> <!-- <div style='width: 107px;line-height: 29px;'>{{ $t('from') }}&nbsp;&nbsp;&nbsp;</div>-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.sourceConfigId" allowClear style='width: 140%'>--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.sourceConfigId" allowClear style='width: 140%'>-->
<!-- <a-select-option v-for="(item, key) in fromDate" :key="key" :value="item.value" style='width: 140%'>--> <!-- <a-select-option v-for="(item, key) in fromDate" :key="key" :value="item.value" style='width: 140%'>-->
<!-- <span style="display: inline-block;width: 140%" :title=" item.label ">--> <!-- <span style="display: inline-block;width: 140%" :title=" item.label ">-->
<!-- {{ item.label }}--> <!-- {{ item.label }}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- <div style='width: 90px;line-height: 29px;'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</div>--> <!-- <div style='width: 90px;line-height: 29px;'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</div>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
</a-col> </a-col>
<a-col :span='24'> <a-col :span='24'>
<div class="box-title-text"> <div class="box-title-text">
@@ -52,30 +52,31 @@
<a-form-model-item class="itemModel" prop="targetConfigIds"> <a-form-model-item class="itemModel" prop="targetConfigIds">
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')"
style="width: calc(100% - 90px)" style="width: calc(100% - 90px)"
v-model="formInline.targetConfigIds" allowClear mode="multiple"> v-model="formInline.targetConfigIds" allowClear mode="multiple">
<a-select-option v-for="(item, key) in fromDateTo" :key="key" :value="item.value"> <a-select-option v-for="(item, key) in fromDateTo" :key="key" :value="item.value">
<span class="itemOption" :title=" item.label "> <span class="itemOption" :title=" item.label ">
{{ item.label }} {{ item.label }}
</span> </span>
</a-select-option> </a-select-option>
</a-select> </a-select>
<span style='width: 90px;line-height: 29px;float: right'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</span> <span
style='width: 90px;line-height: 29px;float: right'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</span>
</a-form-model-item> </a-form-model-item>
</div> </div>
<!-- <a-form-model-item style='line-height: 31.9999px;' prop='targetConfigIds' class='aform'>--> <!-- <a-form-model-item style='line-height: 31.9999px;' prop='targetConfigIds' class='aform'>-->
<!-- <span class="Requireditem">*</span>--> <!-- <span class="Requireditem">*</span>-->
<!-- <span style='line-height: 29px;width: 107px;display: inline-block'>{{ $t('ReferenceTo') }}&nbsp;&nbsp;&nbsp;</span>--> <!-- <span style='line-height: 29px;width: 107px;display: inline-block'>{{ $t('ReferenceTo') }}&nbsp;&nbsp;&nbsp;</span>-->
<!-- <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')"--> <!-- <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')"-->
<!-- style="width: calc(100%);display: inline-block"--> <!-- style="width: calc(100%);display: inline-block"-->
<!-- v-model="formInline.targetConfigIds" allowClear mode="multiple">--> <!-- v-model="formInline.targetConfigIds" allowClear mode="multiple">-->
<!-- <a-select-option v-for="(item, key) in fromDateTo" :key="key" :value="item.value">--> <!-- <a-select-option v-for="(item, key) in fromDateTo" :key="key" :value="item.value">-->
<!-- <span class="itemOption" :title=" item.label ">--> <!-- <span class="itemOption" :title=" item.label ">-->
<!-- {{ item.label }}--> <!-- {{ item.label }}-->
<!-- </span>--> <!-- </span>-->
<!-- </a-select-option>--> <!-- </a-select-option>-->
<!-- </a-select>--> <!-- </a-select>-->
<!-- <span style='width: 90px;line-height: 29px;display: inline-block'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</span>--> <!-- <span style='width: 90px;line-height: 29px;display: inline-block'>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('configure') }}</span>-->
<!-- </a-form-model-item>--> <!-- </a-form-model-item>-->
</a-col> </a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
@@ -88,162 +89,165 @@
</template> </template>
<script> <script>
import { putAction, postAction, getAction, deleteAction } from '@/api/manage' import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import axios from 'axios' import axios from 'axios'
import Vue from 'vue' import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
export default {
name: 'diolagArea', export default {
components: {}, name: 'diolagArea',
data() { components: {},
return { data() {
token:Vue.ls.get(ACCESS_TOKEN), return {
selectedRowKeysDate: {}, token: Vue.ls.get(ACCESS_TOKEN),
loading: false, selectedRowKeysDate: {},
editId: '', loading: false,
newVisible: false, editId: '',
labelCol: { newVisible: false,
xs: { span: 24 }, labelCol: {
sm: { span: 7 } xs: { span: 24 },
}, sm: { span: 7 }
wrapperCol: { },
xs: { span: 24 }, wrapperCol: {
sm: { span: 14 } xs: { span: 24 },
}, sm: { span: 14 }
formInline: {}, },
rules: { formInline: {},
sourceConfigId: [ rules: {
{ required: true, message: this.$t('pleaseSelect')+this.$t('controlVerification'), trigger: 'change' }, sourceConfigId: [
], { required: true, message: this.$t('pleaseSelect') + this.$t('controlVerification'), trigger: 'change' }
targetConfigIds: [ ],
{ required: true, message: this.$t('pleaseSelect')+this.$t('controlVerification'), trigger: 'change' }, targetConfigIds: [
], { required: true, message: this.$t('pleaseSelect') + this.$t('controlVerification'), trigger: 'change' }
}, ]
areaTable: [], },
flag: false, //表单提交标识 areaTable: [],
spinLoading: false, flag: false, //表单提交标识
confirmLoading: false, spinLoading: false,
selectedRowKeys: [], confirmLoading: false,
fromDate: [], selectedRowKeys: [],
fromDateTo: [], fromDate: [],
} fromDateTo: []
}, }
props: {
paramsManifest: {
type: Object,
default: {},
require: true
}, },
selectedRowKeysArray: { props: {
type: String, paramsManifest: {
default: '', type: Object,
require: true default: {},
} require: true
}, },
mounted() { selectedRowKeysArray: {
this.loadData(), type: String,
this.loadDataTo() default: '',
}, require: true
methods: { }
loadData() { },
let _this = this mounted() {
let param = {paramsManifestId: this.paramsManifest.id,configFlag: 1} this.loadData(),
axios({ this.loadDataTo()
url: '/jero-boot/params/collectManifest/getConfigLableListR', },
method: 'post', methods: {
data: param, loadData() {
transformRequest: [function (data) { let _this = this
let ret = '' let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 }
for (let it in data) { axios({
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' url: '/jero-boot/params/collectManifest/getConfigLableListR',
} method: 'post',
return ret data: param,
}], transformRequest: [function(data) {
headers: { let ret = ''
'Content-Type': 'application/x-www-form-urlencoded', for (let it in data) {
'X-Access-Token':_this.token ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
} }
}) return ret
.then( (res) =>{ }],
console.log(res) headers: {
if (res.data.success) { 'Content-Type': 'application/x-www-form-urlencoded',
this.fromDate = res.data.result 'X-Access-Token': _this.token
}else{
_this.$message.warning(res.data.message)
} }
}) })
.catch( (error) =>{ .then((res) => {
console.log(error); console.log(res)
}); if (res.data.success) {
}, this.fromDate = res.data.result
loadDataTo() {
let _this = this
let param = {paramsManifestId: this.paramsManifest.id,configFlag: 2}
axios({
url: '/jero-boot/params/collectManifest/getConfigLableListR',
method: 'post',
data: param,
transformRequest: [function (data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token':_this.token
}
})
.then( (res) =>{
console.log(res)
if (res.data.success) {
this.fromDateTo = res.data.result
}else{
_this.$message.warning(res.data.result)
}
})
.catch( (error) =>{
console.log(error);
});
},
searchQuery() {
this.loadData()
},
searchReset() {
this.form = {}
this.loadData()
},
handleCancel() {
this.$emit('areaVisibleAssignedbyflag', false)
},
onSelectChange(selectedRowKeys, selectedRowKeysDate) {
this.selectedRowKeysDate = selectedRowKeysDate
this.selectedRowKeys = selectedRowKeys
},
handleTableChange(val) {
},
// 引用参数确定
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
if(this.formInline.targetConfigIds instanceof Array){
this.formInline.targetConfigIds = this.formInline.targetConfigIds.join(',')
}
let param = {ids: this.selectedRowKeysArray, ...this.formInline }
this.confirmLoading = true
postAction('params/collectManifest/referParams', param).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$emit('areaVisibleAssignedbyflag', false)
this.$emit('GetgetTableList')
this.confirmLoading = false
} else { } else {
this.$message.warning(this.$t('operationFailed')) _this.$message.warning(res.data.message)
this.confirmLoading = false
} }
}) })
}}) .catch((error) => {
console.log(error)
})
},
loadDataTo() {
let _this = this
let param = { paramsManifestId: this.paramsManifest.id, configFlag: 2 }
axios({
url: '/jero-boot/params/collectManifest/getConfigLableListR',
method: 'post',
data: param,
transformRequest: [function(data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token': _this.token
}
})
.then((res) => {
console.log(res)
if (res.data.success) {
this.fromDateTo = res.data.result
} else {
_this.$message.warning(res.data.result)
}
})
.catch((error) => {
console.log(error)
})
},
searchQuery() {
this.loadData()
},
searchReset() {
this.form = {}
this.loadData()
},
handleCancel() {
this.$emit('areaVisibleAssignedbyflag', false)
},
onSelectChange(selectedRowKeys, selectedRowKeysDate) {
this.selectedRowKeysDate = selectedRowKeysDate
this.selectedRowKeys = selectedRowKeys
},
handleTableChange(val) {
},
// 引用参数确定
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let formInline = JSON.parse(JSON.stringify(this.formInline))
if (formInline.targetConfigIds instanceof Array) {
formInline.targetConfigIds = formInline.targetConfigIds.join(',')
}
let param = { ids: this.selectedRowKeysArray, ...formInline }
this.confirmLoading = true
postAction('params/collectManifest/referParams', param).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$emit('areaVisibleAssignedbyflag', false)
this.$emit('GetgetTableList')
this.confirmLoading = false
} else {
this.$message.warning(res.message)
this.confirmLoading = false
}
})
}
})
// axios({ // axios({
// url: '/jero-boot/params/collectManifest/referParams', // url: '/jero-boot/params/collectManifest/referParams',
// method: 'post', // method: 'post',
@@ -272,113 +276,121 @@ export default {
// .catch( (error) =>{ // .catch( (error) =>{
// console.log(error); // console.log(error);
// }); // });
}
} }
} }
}
</script> </script>
<style lang='less' scoped> <style lang='less' scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
/deep/.ant-form-explain{
padding-left: 62px;
}
.diolag-area {
.table-area {
margin: 20px 0;
.action-edit { /deep/ .ant-form-explain {
margin-right: 10px; padding-left: 62px;
}
.diolag-area {
.table-area {
margin: 20px 0;
.action-edit {
margin-right: 10px;
}
}
.table-del {
color: red;
} }
} }
.table-del { .drawer-bootom-button {
color: red; display: flex;
justify-content: center;
}
.aform {
display: flex;
justify-content: center;
}
.itemOption {
display: inline-block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
} }
}
.drawer-bootom-button{
display: flex;
justify-content: center;
}
.aform{
display: flex;
justify-content: center;
}
.itemOption {
display: inline-block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
</style> </style>
<style lang='less'> <style lang='less'>
.area-module { .area-module {
.ant-modal-wrap { .ant-modal-wrap {
.ant-modal { .ant-modal {
.ant-modal-content { .ant-modal-content {
.ant-modal-footer { .ant-modal-footer {
text-align: center; text-align: center;
}
} }
} }
} }
} }
}
.page{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
}
.Requireditem{
color: red;
line-height: 24px;
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text { .page {
width: 114px; display: flex;
text-align: right; justify-content: flex-end;
display: inline-block; margin-bottom: 20px;
font-weight: 500; }
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
}
.box-input { .Requireditem {
display: inline-block; color: red;
height: 38px; line-height: 24px;
width: 100%; }
}
.itemModel { .box-title-text {
width: calc(100% - 130px); line-height: 1.4;
display: inline-block; display: flex;
margin-top: 2px; /*align-items: center;*/
height: 40px; }
margin-bottom: 24px;
}
.itemModel-text { .title-text {
width: calc(100% - 130px); width: 114px;
display: inline-block; text-align: right;
margin-top: 2px; 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;
}
.Required { .box-input {
color: red; display: inline-block;
margin-right: 4px; height: 38px;
} width: 100%;
}
.title-text-text { .itemModel {
margin-top: 9px; width: calc(100% - 130px);
} display: inline-block;
margin-top: 2px;
height: 40px;
margin-bottom: 24px;
}
.itemModel-text {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
</style> </style>