Commit dbde2b56 authored by 黄奎's avatar 黄奎

页面修改

parent 9f562325
...@@ -91,9 +91,8 @@ ...@@ -91,9 +91,8 @@
methods: { methods: {
//获取数据 //获取数据
getList() { getList() {
getDutyFrequencyList({}).then(res => { getDutyFrequencyList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
console.log(res)
this.dataList = res.Data; this.dataList = res.Data;
} }
}) })
......
...@@ -180,7 +180,6 @@ ...@@ -180,7 +180,6 @@
if (res.Code == 1) { if (res.Code == 1) {
this.batchList = res.Data; this.batchList = res.Data;
} }
console.log("batchList", this.batchList);
}) })
}, },
//获取员工列表 //获取员工列表
......
...@@ -213,12 +213,10 @@ ...@@ -213,12 +213,10 @@
getLogList(){ getLogList(){
GetMsgLogList().then(res => { GetMsgLogList().then(res => {
if (res.Code == 1) { if (res.Code == 1) {
console.log(res,'mainLayout日志数据');
this.socektArr = res.Data; this.socektArr = res.Data;
} }
}) })
}, },
getMsg() { getMsg() {
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
var SendData = { var SendData = {
...@@ -231,10 +229,7 @@ ...@@ -231,10 +229,7 @@
console.log("socketData",e); console.log("socketData",e);
if (e.data) { if (e.data) {
var newData = JSON.parse(e.data) var newData = JSON.parse(e.data)
console.log(newData,'newData');
this.socektArr = this.socektArr.concat(newData) this.socektArr = this.socektArr.concat(newData)
console.log(this.socektArr,'this.socektArr');
this.showNotification(newData[0].Title, newData[0].Content, newData.CoverImg) this.showNotification(newData[0].Title, newData[0].Content, newData.CoverImg)
} }
}, },
...@@ -272,7 +267,7 @@ ...@@ -272,7 +267,7 @@
}; };
// 定义通知错误事件 // 定义通知错误事件
notify.onerror = function () { notify.onerror = function () {
// console.log("");
}; };
// 定义通知显示事件 可以设置多少秒之后关闭 也可以不设置关闭 // 定义通知显示事件 可以设置多少秒之后关闭 也可以不设置关闭
notify.onshow = function () { notify.onshow = function () {
......
...@@ -197,7 +197,6 @@ export default { ...@@ -197,7 +197,6 @@ export default {
this.OperationLoad = false; this.OperationLoad = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.datainfo = res.data.data; this.datainfo = res.data.data;
console.log(this.datainfo)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -963,7 +963,6 @@ ...@@ -963,7 +963,6 @@
this.saveMsg.splice(i, 1); this.saveMsg.splice(i, 1);
}, },
uploadFileBtn(file) { //上传 uploadFileBtn(file) { //上传
console.log(file)
if (file.file.size > 1024 * 1024 * 10) { if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t('tips.wjdxbncgsz')) this.$message.warning(this.$t('tips.wjdxbncgsz'))
return return
......
...@@ -776,16 +776,13 @@ ...@@ -776,16 +776,13 @@
}, },
bodyCellSpan({ row, column, rowIndex }) { bodyCellSpan({ row, column, rowIndex }) {
if (rowIndex === 1) { if (rowIndex === 1) {
// console.log(column)
if (column.field === "date") { if (column.field === "date") {
return { return {
rowspan: 1, rowspan: 1,
colspan: 2, colspan: 2,
}; };
} }
// does not need to be rendered
else if (column.field === "hobby") { else if (column.field === "hobby") {
return { return {
rowspan: 0, rowspan: 0,
......
...@@ -108,7 +108,6 @@ ...@@ -108,7 +108,6 @@
this.pageCount = res.Data.Count; this.pageCount = res.Data.Count;
} }
this.loading = false; this.loading = false;
console.log("res", res);
}) })
}, },
//分页改变 //分页改变
......
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