Commit ac963858 by liyuhang19990520

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 22a21621 f5fe9b5d
...@@ -18,7 +18,6 @@ export default { ...@@ -18,7 +18,6 @@ export default {
return content return content
} }
let result = this.lastZzjg(content, defult) let result = this.lastZzjg(content, defult)
// PrintLog('last(content, defult)', result, _TAG)
return result return result
}, },
lastZzjg(content, defult = '...') { lastZzjg(content, defult = '...') {
...@@ -27,19 +26,16 @@ export default { ...@@ -27,19 +26,16 @@ export default {
if (arrs && arrs.length > 0) { if (arrs && arrs.length > 0) {
result = defult + arrs[arrs.length - 1] result = defult + arrs[arrs.length - 1]
} }
// PrintLog('lastZzjg(content, defult)', result, _TAG)
return result return result
}, },
parseAll(keyArr, content) { parseAll(keyArr, content) {
let result = parseStr(keyArr, content) let result = parseStr(keyArr, content)
// PrintLog('parseAll(keyArr, content)', result, _TAG)
return result return result
}, },
parseZzjg(content) { parseZzjg(content) {
let result = parseStr(_DEFAULT_KEYS, content) let result = parseStr(_DEFAULT_KEYS, content)
// PrintLog('parseZzjg(content)', result, _TAG)
return result return result
}, },
} }
......
let TYPE = { let TYPE = {
INFO: 'info', INFO: 'info',
LOG: 'log', LOG: 'log',
ERROR: 'error' ERROR: 'error',
WARN: 'warn',
ASSERT: 'assert',
} }
export default TYPE export default TYPE
...@@ -13,6 +13,12 @@ export default { ...@@ -13,6 +13,12 @@ export default {
info(tag, val) { info(tag, val) {
BaseLogger.prettyLog(LoggerType.INFO, tag, val) BaseLogger.prettyLog(LoggerType.INFO, tag, val)
}, },
warn(tag, val) {
BaseLogger.prettyLog(LoggerType.WARN, tag, val)
},
assert(tag, val) {
BaseLogger.prettyLog(LoggerType.ASSERT, tag, val)
},
error(tag, val) { error(tag, val) {
BaseLogger.prettyLog(LoggerType.ERROR, tag, val) BaseLogger.prettyLog(LoggerType.ERROR, tag, val)
}, },
...@@ -21,7 +27,7 @@ export default { ...@@ -21,7 +27,7 @@ export default {
}, },
logo() { logo() {
let index = Math.floor((Math.random() * LOGOS.length)) let index = Math.floor((Math.random() * LOGOS.length))
BaseLogger.common(LoggerType.LOG, LOGOS[index]) BaseLogger.common(LoggerType.WARN, LOGOS[index])
}, },
} }
......
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
break break
} }
} }
// PrintLog('操作选项初始化', _that.curOpt) // logger.info('操作选项初始化', _that.curOpt)
}, },
/** /**
...@@ -309,7 +309,6 @@ export default { ...@@ -309,7 +309,6 @@ export default {
} }
}, },
goNextAction(type, desc) { goNextAction(type, desc) {
// PrintLog('goNextAction-type', type)
let _that = this let _that = this
switch (type.name) { switch (type.name) {
case _that.CHEXSH.name: case _that.CHEXSH.name:
...@@ -352,8 +351,6 @@ export default { ...@@ -352,8 +351,6 @@ export default {
ruleForm.des = desc ruleForm.des = desc
ruleForm.level = _that.getLevel() ruleForm.level = _that.getLevel()
// PrintLog(TITLE + '请求参数', ruleForm)
NetUtil.bzxxsh NetUtil.bzxxsh
.sh(ruleForm) .sh(ruleForm)
.then(res => { .then(res => {
...@@ -362,20 +359,6 @@ export default { ...@@ -362,20 +359,6 @@ export default {
_that.initShItem() _that.initShItem()
} }
}) })
// bzxxSh(_that, ruleForm).then(res => {
// PrintLog(TITLE + '返回结果', res, _that.TAG)
// if (res.data.code === 0) {
// _that.$emit('refresh', _that.shInfo)
// _that.initShItem()
// } else {
//
// }
// }).catch(err => {
// PrintLog(TITLE + '异常', err, _that.TAG)
// _that.$message.error('异常' + err)
// })
}, },
doZg(zgzt, desc = '') { doZg(zgzt, desc = '') {
...@@ -388,32 +371,14 @@ export default { ...@@ -388,32 +371,14 @@ export default {
ruleForm.des = desc ruleForm.des = desc
ruleForm.level = _that.getLevel() ruleForm.level = _that.getLevel()
// PrintLog(TITLE + '请求参数', ruleForm)
// PrintLog(TITLE + '接口', 'updateJrzg')
NetUtil.bzxxsh NetUtil.bzxxsh
.updateJrzg(ruleForm) .updateJrzg(ruleForm)
.then(res => { .then(res => {
// PrintLog(TITLE + '返回结果', res, _that.TAG)
if (res.code === 0) { if (res.code === 0) {
_that.$emit('refresh', _that.shInfo) _that.$emit('refresh', _that.shInfo)
_that.initShItem() _that.initShItem()
} }
}) })
// bzxxZg(_that, ruleForm).then(res => {
// PrintLog(TITLE + '返回结果', res, _that.TAG)
// if (res.data.code === 0) {
// _that.$emit('refresh', _that.shInfo)
// _that.initShItem()
// } else {
//
// }
// }).catch(err => {
// PrintLog(TITLE + '异常', err, _that.TAG)
// })
}, },
doPlSb() { doPlSb() {
...@@ -427,31 +392,14 @@ export default { ...@@ -427,31 +392,14 @@ export default {
ruleForm.status = '3' ruleForm.status = '3'
ruleForm.level = _that.getLevel() ruleForm.level = _that.getLevel()
// PrintLog(TITLE + '请求参数', ruleForm, _that.TAG)
// PrintLog(TITLE + '接口', '/api/hit/insertBeach', _that.TAG)
NetUtil.bzxxsh NetUtil.bzxxsh
.bzxxPlSb(ruleForm) .bzxxPlSb(ruleForm)
.then(res => { .then(res => {
// PrintLog(TITLE + '返回结果', res, _that.TAG)
if (res.code === 0) { if (res.code === 0) {
_that.$emit('refresh', _that.shInfo) _that.$emit('refresh', _that.shInfo)
_that.initShItem() _that.initShItem()
} }
}) })
// bzxxPlSb(_that, ruleForm)
// .then(res => {
// PrintLog(TITLE + '返回结果', res, _that.TAG)
// if (res.data.code === 0) {
// _that.$emit('refresh', _that.shInfo)
// _that.initShItem()
// }
// })
// .catch(err => {
// PrintLog(TITLE + '异常', err.toString(), _that.TAG)
// this.$message.error('失败原因:' + err.toString())
// })
}, },
}, },
} }
......
...@@ -692,9 +692,6 @@ export default { ...@@ -692,9 +692,6 @@ export default {
_that.ruleForm.level = _that.getLevel() _that.ruleForm.level = _that.getLevel()
// PrintLog('查询审核列表' + '请求参数', JSON.stringify(_that.ruleForm), _that.TAG)
// PrintLog('查询审核列表' + '接口', '/api/hit/queryAllSh', _that.TAG)
NetUtil.bzxxsh.shList(_that.ruleForm) NetUtil.bzxxsh.shList(_that.ruleForm)
.then(res => { .then(res => {
if (res.code === 0) { if (res.code === 0) {
...@@ -704,26 +701,6 @@ export default { ...@@ -704,26 +701,6 @@ export default {
_that.refreshItemsData() _that.refreshItemsData()
} }
}) })
// queryShList(_that, _that.ruleForm)
// .then(res => {
// PrintLog('查询审核列表' + '返回结果', res, _that.TAG)
// if (res.code === 0) {
// // logger.json(res.data)
// _that.tableDate = res.data.ret.rows
// _that.total = res.data.ret.total
// _that.totalPage = Math.ceil(_that.total / _that.pageSize)
// } else {
// _that.tableDate = []
// _that.total = 0
// _that.totalPage = 0
// }
// _that.refreshItemsData()
// })
// .catch(err => {
// PrintLog('查询审核列表' + '异常', err, _that.TAG)
// this.$message.error('失败原因:' + err.toString())
// })
}, },
onSbxxListener() { onSbxxListener() {
...@@ -779,29 +756,13 @@ export default { ...@@ -779,29 +756,13 @@ export default {
// ruleForm.username = username // ruleForm.username = username
ruleForm.level = _that.getLevel() ruleForm.level = _that.getLevel()
// PrintLog(TITLE + '请求参数', ruleForm, _that.TAG)
// PrintLog(TITLE + '接口', '/api/hit/insertBeach', _that.TAG)
NetUtil.bzxxsh NetUtil.bzxxsh
.plsb(ruleForm) .plsb(ruleForm)
.then(res => { .then(res => {
// PrintLog(TITLE + '返回结果', res, _that.TAG)
if (res.code === 0) { if (res.code === 0) {
_that.getData() _that.getData()
} }
}) })
// bzxxPlSb(_that, ruleForm)
// .then(res => {
// PrintLog(TITLE + '返回结果', res, _that.TAG)
// if (res.data.code === 0) {
// _that.getData()
// }
// })
// .catch(err => {
// PrintLog(TITLE + '异常', err.toString(), _that.TAG)
// this.$message.error('失败原因:' + err.toString())
// })
}, },
onFztmSuccess(e) { onFztmSuccess(e) {
...@@ -828,7 +789,6 @@ export default { ...@@ -828,7 +789,6 @@ export default {
}) })
_that.fztm_ytmh = _that.fztm_ytmh.join(',') _that.fztm_ytmh = _that.fztm_ytmh.join(',')
} }
// PrintLog('fztm_ytmh', _that.fztm_ytmh)
} }
}, },
watch: { watch: {
......
...@@ -289,7 +289,6 @@ export default { ...@@ -289,7 +289,6 @@ export default {
async created() { async created() {
console.log(this.$route) console.log(this.$route)
this.id = this.$route.params.id this.id = this.$route.params.id
// PrintLog('query', this.$route.query)
if (this.$route.query.isFromSh) { if (this.$route.query.isFromSh) {
this.isFromSh = this.$route.query.isFromSh this.isFromSh = this.$route.query.isFromSh
} }
......
...@@ -272,7 +272,6 @@ export default { ...@@ -272,7 +272,6 @@ export default {
created() { created() {
console.log(this.$route) console.log(this.$route)
this.id = this.$route.params.id this.id = this.$route.params.id
// PrintLog('query', this.$route.query)
if (this.$route.query.isFromSh) { if (this.$route.query.isFromSh) {
this.isFromSh = this.$route.query.isFromSh this.isFromSh = this.$route.query.isFromSh
} }
......
...@@ -299,7 +299,6 @@ export default { ...@@ -299,7 +299,6 @@ export default {
created () { created () {
console.log(this.$route) console.log(this.$route)
this.id = this.$route.params.id this.id = this.$route.params.id
// PrintLog('query', this.$route.query)
if (this.$route.query.isFromSh) { if (this.$route.query.isFromSh) {
this.isFromSh = this.$route.query.isFromSh this.isFromSh = this.$route.query.isFromSh
} }
......
...@@ -915,7 +915,7 @@ export default { ...@@ -915,7 +915,7 @@ export default {
console.log(this.$route) console.log(this.$route)
this.id = this.$route.params.id this.id = this.$route.params.id
// PrintLog('query', this.$route.query)
if (this.$route.query.isFromSh) { if (this.$route.query.isFromSh) {
this.isFromSh = this.$route.query.isFromSh this.isFromSh = this.$route.query.isFromSh
} }
......
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