Commit de2fb213 authored by xxx's avatar xxx

修改大屏配置页面序号覆盖问题

parent 06438f84
......@@ -177,8 +177,10 @@ export default {
let rightTemporaryData = [];
this.$nextTick(()=>{
HttpReq.truckDispatching.screenTitleMenuQuery({size:9999,status:1,pid:0,sort:'dsort'}).then((res) => {
if(res.code == 200){;
let array1 = res.data.content;
if(res.code == 200){
let array1 = res.data.content.sort(function(a,b){
return parseInt(a.dsort) - parseInt(b.dsort);
});
for(let i = 0 ; i<3 ; i++){
leftTemporaryData.push(array1[i]);
}
......@@ -203,7 +205,10 @@ export default {
let left1 = [];
let center1 = [];
let right1 = [];
res.data.content.forEach((item,index)=>{
let array1 = res.data.content.sort(function(a,b){
return parseInt(a.dsort) - parseInt(b.dsort);
});
array1.forEach((item,index)=>{
if(item.pos == 'left'){
left1.push(item);
}else if(item.pos == 'right'){
......@@ -240,7 +245,10 @@ export default {
let left1 = [];
let center1 = [];
let right1 = [];
res.data.content.forEach((item,index)=>{
let array1 = res.data.content.sort(function(a,b){
return parseInt(a.dsort) - parseInt(b.dsort);
});
array1.forEach((item,index)=>{
if(item.pos == 'left'){
left1.push(item);
}else if(item.pos == 'right'){
......@@ -277,7 +285,10 @@ export default {
let left1 = [];
let center1 = [];
let right1 = [];
res.data.content.forEach((item,index)=>{
let array1 = res.data.content.sort(function(a,b){
return parseInt(a.dsort) - parseInt(b.dsort);
});
array1.forEach((item,index)=>{
if(item.pos == 'left'){
left1.push(item);
}else if(item.pos == 'right'){
......@@ -314,7 +325,10 @@ export default {
let left1 = [];
let center1 = [];
let right1 = [];
res.data.content.forEach((item,index)=>{
let array1 = res.data.content.sort(function(a,b){
return parseInt(a.dsort) - parseInt(b.dsort);
});
array1.forEach((item,index)=>{
if(item.pos == 'left'){
left1.push(item);
}else if(item.pos == 'right'){
......
......@@ -44,7 +44,7 @@
</el-select>
</el-form-item>
<el-form-item label="排序" prop="dsort">
<el-input-number v-model="form.item.dsort"></el-input-number>
<el-input-number v-model="form.item.dsort" :min="1" :precision="0" :step="1"></el-input-number>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.item.status" placeholder="请选择状态" style="width:280px;">
......@@ -98,7 +98,10 @@ export default {
//获取对应子标题
HttpReq.truckDispatching.screenTitleMenuQuery({size:9999,pid:item.children,sort:'dsort'}).then((res2) => {
if(res2.code == 200){
sonData.children = res2.data.content;
let sortArr = res2.data.content.sort(function(a,b){
return parseInt(a.dsort) - parseInt(b.dsort);
});
sonData.children = sortArr;
alltableData.push(sonData);
this.tableData = alltableData;
}else{
......@@ -151,6 +154,15 @@ export default {
//修改菜单配置
reqUpdateItem(form, item){
let lastData = {...item};
let panduan1 = true;
HttpReq.truckDispatching.screenTitleMenuQuery({size:9999,pid:lastData.pid}).then((res1) => {
if(res1.code == 200){
res1.data.content.forEach((item1,index1)=>{
if(item1.dsort == lastData.dsort && item1.title != lastData.title){
panduan1 = false;
}
})
if(panduan1){
lastData.id = this.alarmTimeId;
if(lastData.children){
delete lastData.children;
......@@ -174,6 +186,16 @@ export default {
}).catch(function(error) {
form.status.cu = 0
});
}else{
this.$notify({
title: "排序序号与该模块中的序号重复,请重新选择排序!",
type: 'error',
duration: 2500
})
form.status.cu = 0;
}
}
})
},
//组件状态展示修改
statusChange(row){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment