diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index df36fcf..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/src/utils/http.js b/src/utils/http.js index 5641223..6da8171 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -1,6 +1,4 @@ import axios from 'axios'; -import QS from 'qs'; -// import store from '../store/index' import { Message } from 'element-ui' import router from '../router/index' import store from '@/store' @@ -18,7 +16,7 @@ if(isKd){ host = 'http://124.71.12.62:9000'; // 巢湖版 } else if (dev) { host = 'http://121.37.12.51'; - host = 'http://192.168.31.217:9000'; + host = 'http://192.168.31.51:9000'; } } @@ -33,6 +31,7 @@ service.defaults.timeout = 1000000000; // post请求头 service.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'; +let logouted = 0; // 请求拦截器 service.interceptors.request.use(config => { // 存在将token写入 request header @@ -70,9 +69,12 @@ service.interceptors.request.use(config => { // 未登录则跳转登录页面,并携带当前页面的路径 // 在登录成功后返回当前页面,这一步需要在登录页操作。 case 401: - Message.error("登录过期,请重新登录"); + if (!logouted) { + Message.error("登录过期,请重新登录"); setTimeout(logouts,1500) - break; + logouted = 1 + } + break; case 500: Message.error("网络错误"); break; @@ -104,17 +106,12 @@ service.interceptors.request.use(config => { function logouts(){ let referrer = store.state.referrer store.replaceState({}) - sessionStorage.removeItem('kd_client_username') if (referrer) { location.href = referrer } else { window.history.back() } } -let tokenStatus = { - 0: '用户未登录,请登录后操作!', - 1: 'token错误,请重新登录!' -} function get(url, params) { return new Promise((resolve, reject) => { diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue index 71051a6..7fb198d 100644 --- a/src/views/Transaction.vue +++ b/src/views/Transaction.vue @@ -122,7 +122,6 @@ @@ -553,7 +552,6 @@ export default { tableData: [], // 规则表格数据 tableDataCopy: [], // 规则表格数据备份 isAddRule: false, // 是否禁用新增规则按钮 - itemkey: '', judgePoints: false,//判断是否点了编辑 configVisible: false, SelectedObj: [], @@ -671,9 +669,6 @@ export default { this.businessList = lcRecords }).catch(res => { }) } - // this.$post(`${this.api[this.isSt ? 'getAllBusinessSt' : 'getAllBusiness']}?systemId=${this.systemId}`).then(({ stRecords, lcRecords }) => { - // this.businessList = this.isSt ? stRecords : lcRecords - // }).catch(res => { }) }, handleSelectionChange (val) { this.multipleSelection = val @@ -921,15 +916,6 @@ export default { } }, getTreeData () { // 获取树结构数据 - // if(this.treeDataStore.length) { - // const tmp = deepCopy(this.treeDataStore) - // this.treeData = this.toTreeId(tmp); - // if (this.$route.query.lcId) { - // this.lcId = this.$route.query.lcId; - // this.getInfoData(this.$route.query.lcId); - // } - // this.loading = false - // }else { this.$post(`${this.api[this.isSt ? 'getProcessSt' : 'getProcess']}?systemId=${this.systemId}`).then(({ process, status, message }) => { if (status == 200) { if (process.length) { @@ -947,7 +933,6 @@ export default { }).catch(err => { this.loading = false }); - // } }, toTreeId (data, parentId) { // id重新串连成(父+子+孙),已便达到树节点需要的key唯一性,且后面提交数据,需要传这个id串到后台 const name = this.isSt ? 'recordChildren' : 'children' @@ -1257,19 +1242,10 @@ export default { type: "warning", center: true }).then(() => { - if (index + 1 == this.tableData.length) { - this.tableData.splice(index - 1, 2) - } else { - this.tableData.splice(index, 2); - } - this.itemkey = Math.random() + this.tableData.splice(index + 1 == this.tableData.length ? index - 1 : index, 2) + let i = 0 this.tableData.forEach(async (item, index) => { - // 勾选树节点 - if (item.operationIds) { - this.$nextTick(() => { - // this.$refs[`tree-${index}`].setCheckedKeys([item.operationIds]); - }); - } + if (item.isSubject) item.index = i++ // 根据题目id,获取题目信息 if (item.isSubject && item.type && item.type != 4 && item.emptyOne) { await this.getSubjectData(item.emptyOne, index); @@ -1297,9 +1273,9 @@ export default { this.tableData.splice(index === this.tableData.length - 1 ? index - 1 : index, 2) } }) - this.setIndex() - this.itemkey = Math.random() + let i = 0 this.tableData.forEach(async (item, index) => { + if (item.isSubject) item.index = i++ // 根据题目id,获取题目信息 if (item.isSubject && item.type && item.type != 4 && item.emptyOne) { await this.getSubjectData(item.emptyOne, index);