Compare commits

...

26 Commits

Author SHA1 Message Date
liaozetao
7d915d59f3 修复渠道展示问题 2023-11-21 14:57:34 +08:00
liaozetao
8c9af40427 修复跳转类型 2023-11-21 12:02:35 +08:00
liaozetao
d3082e3390 修复开屏跳转类型 2023-11-21 11:57:49 +08:00
liaozetao
35d01b2afd 开屏设置默认开启 2023-11-21 11:54:43 +08:00
liaozetao
5360a54da1 修复闪屏逻辑 2023-11-20 18:44:09 +08:00
liaozetao
f600e089a2 修复上传按钮 2023-11-20 18:34:13 +08:00
liaozetao
365263162b 手机授权页面增加字段 2023-11-20 18:25:55 +08:00
liaozetao
2b326dbaba 上传文件增加遮罩层 2023-11-20 16:20:36 +08:00
liaozetao
f50ba76de7 修改file文件上传判断 2023-11-20 16:11:10 +08:00
liaozetao
2a32c0dbb9 补充 2023-11-20 16:05:25 +08:00
liaozetao
7b7f38d5cb 修复展示类型 2023-11-20 15:38:58 +08:00
liaozetao
1c5f7e927c 判断不允许重复发请求 2023-11-20 14:51:52 +08:00
liaozetao
20ea616755 删除日志 2023-11-20 12:35:56 +08:00
liaozetao
0e3591c1f0 修复按钮展示问题 2023-11-20 12:19:17 +08:00
liaozetao
96e96d09ae 修复上传问题 2023-11-20 12:08:25 +08:00
liaozetao
3e66a6c467 补充 2023-11-20 12:00:51 +08:00
liaozetao
395e3917f8 修改上传逻辑 2023-11-20 11:58:36 +08:00
liaozetao
518842aca2 修復時間格式化 2023-11-20 11:34:20 +08:00
liaozetao
1fea5ed803 修復圖片上傳 2023-11-20 11:19:50 +08:00
liaozetao
091adb4093 修复下拉框字段 2023-11-20 11:14:23 +08:00
liaozetao
99cd6320b6 修复按钮判断 2023-11-20 10:59:07 +08:00
liaozetao
87de178799 修复时间格式化问题 2023-11-20 10:52:30 +08:00
liaozetao
1568ebb36c 新增开屏设置 2023-11-17 17:52:47 +08:00
liaozetao
96871a60ff 新增资源位管理 2023-11-16 14:35:46 +08:00
liaozetao
7383842e7f 去除unmounted 2023-11-14 17:59:51 +08:00
liaozetao
baa2cfcb8c 修复table组件问题 2023-11-14 17:57:20 +08:00
322 changed files with 1136 additions and 957 deletions

23
src/api/common/upload.js Normal file
View File

@@ -0,0 +1,23 @@
import '@/utils/ajaxfileupload';
export const uploadFile = id => {
return new Promise((resolve, reject) => {
$.ajaxFileUpload({
fileElementId: id,
url: '/admin/upload/img',
type: 'post',
dataType: 'json',
secureuri: false,
async: true,
submitType: 'ajax',
success: function (res) {
resolve(res);
},
error: function (res, status, e) {
console.error(res);
console.error(status);
reject(e);
}
});
});
};

View File

@@ -0,0 +1,34 @@
import request from '@/utils/request';
export const getResourcePage = query => {
return request({
url: '/admin/resource/page',
method: 'get',
params: query
});
};
export const delResource = query => {
return request({
url: '/admin/resource/del',
method: 'get',
params: query
});
};
export const effective = query => {
return request({
url: '/admin/resource/effective',
method: 'get',
params: query
});
};
export const saveResource = data => {
return request({
url: '/admin/resource/save',
headers:{"Content-Type": 'application/x-www-form-urlencoded'},
method: 'post',
data: data
});
}

View File

@@ -0,0 +1,9 @@
import request from '@/utils/request';
export const getResourceRuleList = query => {
return request({
url: '/admin/resource/rule/list',
method: 'get',
params: query
});
};

View File

@@ -2203,8 +2203,10 @@
fixedScroll = data.fixedScroll;
data = data[this.options.dataField];
} else if (!$.isArray(data)) { // support fixedScroll
fixedScroll = data.fixedScroll;
data = data.data;
if (data) {
fixedScroll = data.fixedScroll;
data = data.data;
}
}
this.initData(data);
@@ -2528,13 +2530,25 @@
};
BootstrapTable.prototype.destroy = function () {
let bootstrapTable = $('div .bootstrap-table');
if (bootstrapTable) {
let $this = this;
let tables = bootstrapTable.filter(i => {
let $container = $(bootstrapTable[i]);
return ($container && $container.html().indexOf('"' +$this.$el[0].id + '"') != -1);
});
if (tables.length > 1) {
this.$container = $(tables[0]);
this.options.toolbar = $('div.fixed-table-toolbar > div.bars.pull-left').html();
}
}
this.$el.insertBefore(this.$container);
$(this.options.toolbar).insertBefore(this.$el);
this.$container.next().remove();
this.$container.remove();
this.$el.html(this.$el_.html())
.css('margin-top', '0')
.attr('class', this.$el_.attr('class') || ''); // reset the class
$(this.options.toolbar).insertBefore(this.$el);
this.$container.next().remove();
this.$container.remove();
this.$el.html(this.$el_.html())
.css('margin-top', '0')
.attr('class', this.$el_.attr('class') || ''); // reset the class
};
BootstrapTable.prototype.showLoading = function () {
@@ -2782,6 +2796,11 @@
throw new Error("Unknown method: " + option);
}
if (!data && option === 'destroy') {
new BootstrapTable(this, options).destroy();
return;
}
if (!data) {
return;
}

View File

@@ -389,9 +389,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -590,9 +590,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -757,9 +757,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -1147,9 +1147,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -617,9 +617,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -654,9 +654,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -166,9 +166,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -289,9 +289,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -133,9 +133,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -256,9 +256,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -249,9 +249,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -138,9 +138,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -409,9 +409,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -184,9 +184,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -136,9 +136,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};

View File

@@ -221,9 +221,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -242,9 +242,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -261,9 +261,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -279,9 +279,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -502,9 +502,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -212,9 +212,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -254,9 +254,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -1061,9 +1061,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -434,9 +434,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -264,9 +264,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -551,9 +551,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -151,9 +151,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -541,9 +541,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -405,9 +405,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -517,9 +517,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -570,9 +570,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -156,9 +156,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -290,9 +290,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -133,9 +133,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -267,9 +267,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -1035,9 +1035,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -114,9 +114,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -125,9 +125,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -489,9 +489,7 @@ export default {
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -272,9 +272,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -482,9 +482,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -257,9 +257,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -197,9 +197,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -471,9 +471,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -200,9 +200,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -548,9 +548,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
function clearForm(formId) {

View File

@@ -407,9 +407,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -815,9 +815,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -773,9 +773,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -201,9 +201,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -472,9 +472,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -143,9 +143,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -185,9 +185,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -228,9 +228,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -823,9 +823,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -147,9 +147,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -959,9 +959,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -977,9 +977,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -342,9 +342,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -571,9 +571,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -476,9 +476,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -575,9 +575,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -329,9 +329,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -186,9 +186,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -477,9 +477,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -382,9 +382,7 @@ export default {
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
// 初始化团队选择器

View File

@@ -454,9 +454,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};

View File

@@ -355,9 +355,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -793,9 +793,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -254,9 +254,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -306,9 +306,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -770,9 +770,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -333,9 +333,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -364,9 +364,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -785,9 +785,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
function cleanModal(obj) {

View File

@@ -193,9 +193,7 @@ export default {
}
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -970,9 +970,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -535,9 +535,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -100,9 +100,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -390,9 +390,7 @@ export default {
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -1207,9 +1207,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
function clearModal() {

View File

@@ -1304,9 +1304,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
function clearModal() {

View File

@@ -297,9 +297,7 @@ export default {
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
// 根据type获取路径名称

View File

@@ -218,9 +218,7 @@ export default {
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -579,9 +579,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -378,9 +378,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -543,9 +543,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};

View File

@@ -144,9 +144,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};

View File

@@ -402,9 +402,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};

View File

@@ -494,9 +494,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};

View File

@@ -712,9 +712,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -334,9 +334,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -177,9 +177,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -390,9 +390,7 @@ export default {
})
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -133,9 +133,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

View File

@@ -335,9 +335,7 @@ export default {
});
}
},
unmounted() {
$('#table').bootstrapTable('destroy');
}
};
</script>

Some files were not shown because too many files have changed in this diff Show More