diff --git a/linkwe-ui/src/api/customer/dimission.js b/linkwe-ui/src/api/customer/dimission.js index 53c73932c635028572021be0cf874d93804241fb..c38dcc0d38e757587c955ecd916aed09a7cfe6cd 100644 --- a/linkwe-ui/src/api/customer/dimission.js +++ b/linkwe-ui/src/api/customer/dimission.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const service = config.services.wecom + '/user' +const service = window.CONFIG.services.wecom + '/user' /** * 获取离职已分配员工列表 @@ -15,7 +15,7 @@ userName: export function getList(params) { return request({ url: service + '/leaveUserAllocateList', - params + params, }) } @@ -33,7 +33,7 @@ userName: export function getListNo(params) { return request({ url: service + '/leaveUserNoAllocateList', - params + params, }) } @@ -49,7 +49,7 @@ export function allocate(data) { return request({ url: service + '/allocateLeaveUserAboutData', method: 'put', - data + data, }) } @@ -67,6 +67,6 @@ export function allocate(data) { export function getAllocateCustomers(params) { return request({ url: service + '/getAllocateCustomers', - params + params, }) } diff --git a/linkwe-ui/src/api/customer/group.js b/linkwe-ui/src/api/customer/group.js index 8384851fe040f8ee92cd71b5dcf50398e473bb4a..03e85c75cd0fedcf0d200b41640b983d1c01cf05 100644 --- a/linkwe-ui/src/api/customer/group.js +++ b/linkwe-ui/src/api/customer/group.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const service = config.services.wecom + '/group' +const service = window.CONFIG.services.wecom + '/group' /** * 客户群列表 @@ -15,7 +15,7 @@ export function getList(params) { return request({ url: service + '/chat/list', method: 'get', - params + params, }) } @@ -32,11 +32,10 @@ export function getList(params) { export function getMembers(params) { return request({ url: service + '/chat/members', - params + params, }) } - /** * 客户群同步接口 */ diff --git a/linkwe-ui/src/api/customer/index.js b/linkwe-ui/src/api/customer/index.js index 46d8405de1d37d974987bb9b8e2d554aa5ea374f..3d066c0e4263463af3bf90641b8800e66fe670bb 100644 --- a/linkwe-ui/src/api/customer/index.js +++ b/linkwe-ui/src/api/customer/index.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const service = config.services.wecom + '/customer' +const service = window.CONFIG.services.wecom + '/customer' /** * 客户列表 @@ -18,7 +18,7 @@ export function getList(params) { return request({ url: service + '/list', method: 'get', - params + params, }) } @@ -47,7 +47,7 @@ export function makeLabel(data) { return request({ url: service + '/makeLabel', method: 'post', - data + data, }) } @@ -67,7 +67,7 @@ export function removeLabel(data) { return request({ url: service + '/removeLabel', method: 'DELETE', - data + data, }) } @@ -83,7 +83,7 @@ export function updateBirthday(data) { return request({ url: service, method: 'PUT', - data + data, }) } @@ -92,6 +92,6 @@ export function exportCustomer(query) { return request({ url: service + '/export', method: 'get', - params: query + params: query, }) -} \ No newline at end of file +} diff --git a/linkwe-ui/src/api/customer/tag.js b/linkwe-ui/src/api/customer/tag.js index b41639ee52c6abc1e4d539a6bb71f0db470a29a8..ccc01087872d189b12e3f92c55b2b10bce08141c 100644 --- a/linkwe-ui/src/api/customer/tag.js +++ b/linkwe-ui/src/api/customer/tag.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const service = config.services.wecom + '/group' +const service = window.CONFIG.CONFIG.services.wecom + '/group' // 客户标签 @@ -14,7 +14,7 @@ const service = config.services.wecom + '/group' export function getList(params) { return request({ url: service + '/list', - params + params, }) } @@ -54,13 +54,13 @@ export function update(data) { return request({ url: service, method: 'put', - data + data, }) } /** * 标签批量删除接口 - * @param {*} ids + * @param {*} ids */ export function remove(ids) { return request({ diff --git a/linkwe-ui/src/api/drainageCode/staff.js b/linkwe-ui/src/api/drainageCode/staff.js index d64a936154d3c87f200fb27438422ae78a3b2712..7a173544bf140a50377d6eb03b8733de3ef893db 100644 --- a/linkwe-ui/src/api/drainageCode/staff.js +++ b/linkwe-ui/src/api/drainageCode/staff.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const service = config.services.wecom + '/user' +const service = window.CONFIG.services.wecom + '/user' /** * 获取离职未分配员工列表 @@ -13,7 +13,7 @@ beginTime:} export function getList(params) { return request({ url: service + '/leaveUserNoAllocateList', - params + params, }) } @@ -29,6 +29,6 @@ export function allocate(data) { return request({ url: service + '/allocateLeaveUserAboutData', method: 'put', - data + data, }) } diff --git a/linkwe-ui/src/api/drainageCode/welcome.js b/linkwe-ui/src/api/drainageCode/welcome.js index 4eb7bf0545aa875c72227365fb6517958a3f2f3a..67e8640cc5c06e7d79495513fc852134378be7b8 100644 --- a/linkwe-ui/src/api/drainageCode/welcome.js +++ b/linkwe-ui/src/api/drainageCode/welcome.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const service = config.services.wecom + '/tlp' +const service = window.CONFIG.services.wecom + '/tlp' /** * 获取欢迎语列表 @@ -14,13 +14,13 @@ const service = config.services.wecom + '/tlp' export function getList(params) { return request({ url: service + '/list', - params + params, }) } /** * 根据欢迎语模板id获取模板使用范围 - * @param {*} id + * @param {*} id */ export function getScop(id) { return request({ @@ -46,7 +46,7 @@ export function edit(data) { return request({ url: service, method: 'put', - data + data, }) } @@ -66,13 +66,13 @@ export function add(data) { return request({ url: service, method: 'POST', - data + data, }) } /** * 删除欢迎语 - * @param {*} ids + * @param {*} ids */ export function remove(ids) { return request({ diff --git a/linkwe-ui/src/api/enterpriseId.js b/linkwe-ui/src/api/enterpriseId.js index 589b5b9c79cdd6654d6edff504de2ba7acba18a6..b1b4de376605ce41aed51766ed3a7c3edcb431f5 100644 --- a/linkwe-ui/src/api/enterpriseId.js +++ b/linkwe-ui/src/api/enterpriseId.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const service = config.services.wecom + '/corp' +const service = window.CONFIG.services.wecom + '/corp' // 企业id /** @@ -8,13 +8,13 @@ const service = config.services.wecom + '/corp' export function getList(params) { return request({ url: service + '/list', - params + params, }) } /** * 获取企业id相关详情 - * @param {String} id + * @param {String} id */ export function getDetail(id) { return request({ @@ -24,7 +24,7 @@ export function getDetail(id) { /** * 新增企业id - * @param {Object} data + * @param {Object} data */ export function add(data) { return request({ @@ -56,17 +56,17 @@ export function update(data) { return request({ url: service, method: 'put', - data + data, }) } /** * 启用有效企业微信账号 - * @param {*} corpId + * @param {*} corpId */ export function start(corpId) { return request({ url: service + '/startVailWeCorpAccount/' + corpId, method: 'put', }) -} \ No newline at end of file +} diff --git a/linkwe-ui/src/api/material/index.js b/linkwe-ui/src/api/material/index.js index b34b643e6d80c1a5dfc3701d0cff74fae367cb15..f9b8fd9a1628d78fc00c7b74fff295ef80d80083 100644 --- a/linkwe-ui/src/api/material/index.js +++ b/linkwe-ui/src/api/material/index.js @@ -1,12 +1,13 @@ import request from '@/utils/request' -const service = config.services.wecom + '/material' -const serviceCategory = config.services.wecom + '/category' +const service = window.CONFIG.services.wecom + '/material' +const serviceCategory = window.CONFIG.services.wecom + '/category' /** * 查询素材列表 * @param {*} params * { categoryId:类目id search:搜索的值 +mediaType: '' 0 图片(image)、1 语音(voice)、2 视频(video),3 普通文件(file), 4 文本 } */ export function getList(params) { @@ -66,12 +67,12 @@ export function remove(id) { * @param {*} data * { * file:文件 -type:0 图片(image)、1 语音(voice)、2 视频(video),3 普通文件(file), 4 文本 +type:0 图片(image)、1 语音(voice)、2 视频(video),3 普通文件(file) } */ export function upload(data) { return request({ - url: config.services.wecom + '/upload', + url: window.CONFIG.services.wecom + '/upload', method: 'post', data, }) @@ -88,7 +89,7 @@ export function upload(data) { export function moveGroup(categoryId, materials) { return request({ url: service + '/resetCategory', - method: 'post', + method: 'put', data: { categoryId, materials, diff --git a/linkwe-ui/src/api/organization.js b/linkwe-ui/src/api/organization.js index 56ac9784574ce2de0fe2d2ede2aa3a34898b3f40..97825e88158abe0e13abe5cd7033bbe50b7db24b 100644 --- a/linkwe-ui/src/api/organization.js +++ b/linkwe-ui/src/api/organization.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -const service = config.services.wecom + '/department' -const serviceUser = config.services.wecom + '/user' +const service = window.CONFIG.services.wecom + '/department' +const serviceUser = window.CONFIG.services.wecom + '/user' /** * 获取所有部门 @@ -14,7 +14,7 @@ const serviceUser = config.services.wecom + '/user' export function getTree(params) { return request({ url: service + '/list', - params + params, }) } @@ -31,7 +31,7 @@ export function updateDepart(data) { return request({ url: service, method: 'put', - data + data, }) } @@ -76,13 +76,13 @@ export function removeDepart(ids) { export function getList(params) { return request({ url: serviceUser + '/list', - params + params, }) } /** * 根据ID获取通讯录人员详情 - * @param {String} id + * @param {String} id */ export function getUserDetail(id) { return request({ @@ -92,7 +92,7 @@ export function getUserDetail(id) { /** * 新增用户 - * @param {Object} data + * @param {Object} data */ export function addUser(data) { return request({ @@ -132,7 +132,7 @@ export function updateUser(data) { return request({ url: serviceUser, method: 'put', - data + data, }) } @@ -148,7 +148,7 @@ export function startOrStop(data) { return request({ url: serviceUser + '/startOrStop', method: 'put', - data + data, }) } diff --git a/linkwe-ui/src/components/Upload.vue b/linkwe-ui/src/components/Upload.vue new file mode 100644 index 0000000000000000000000000000000000000000..fe2592a1e3ca63fd86159865e69b855fef49ba7e --- /dev/null +++ b/linkwe-ui/src/components/Upload.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/linkwe-ui/src/components/zmyComponents/ZmyTree.vue b/linkwe-ui/src/components/zmyComponents/ZmyTree.vue deleted file mode 100644 index c49533bf1635bf39626bec3ae2b90f0c6d9986d9..0000000000000000000000000000000000000000 --- a/linkwe-ui/src/components/zmyComponents/ZmyTree.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - - \ No newline at end of file diff --git a/linkwe-ui/src/components/zmyComponents/zmyDialog.vue b/linkwe-ui/src/components/zmyComponents/zmyDialog.vue deleted file mode 100644 index a04edb235ef58a07fdf9ac57cda460ae263b8148..0000000000000000000000000000000000000000 --- a/linkwe-ui/src/components/zmyComponents/zmyDialog.vue +++ /dev/null @@ -1,210 +0,0 @@ - - - - - diff --git a/linkwe-ui/src/components/zmyComponents/zmyTable.vue b/linkwe-ui/src/components/zmyComponents/zmyTable.vue deleted file mode 100644 index 1dfb41250ddf40b982c47d12d00657eb7ec91293..0000000000000000000000000000000000000000 --- a/linkwe-ui/src/components/zmyComponents/zmyTable.vue +++ /dev/null @@ -1,359 +0,0 @@ - - - - \ No newline at end of file diff --git a/linkwe-ui/src/config.js b/linkwe-ui/src/config.js index 2ece58c04f0ff0797765fb186d6d3a376e7b0bc0..635c7aa8e2f54728a30a0e96c170fc0c9e097f63 100644 --- a/linkwe-ui/src/config.js +++ b/linkwe-ui/src/config.js @@ -1,4 +1,6 @@ -module.exports = { +import { getToken } from '@/utils/auth' + +window.CONFIG = { /** * 是否系统布局配置 */ @@ -28,10 +30,12 @@ module.exports = { errorLog: 'production', services: { - wecom: "wecom", - wecom: "wecom", - wecom: "wecom", - wecom: "wecom", - wecom: "wecom", - } + wecom: '/wecom', + }, + + get headers() { + return { Authorization: 'Bearer ' + getToken() } + }, } + +module.exports = window.CONFIG diff --git a/linkwe-ui/src/main.js b/linkwe-ui/src/main.js index 3b7a57c967ced02a2a4bc2839baed5a156acbdbc..e5ceea69feaed90a339ee9f6dc70189b641086b3 100644 --- a/linkwe-ui/src/main.js +++ b/linkwe-ui/src/main.js @@ -9,11 +9,13 @@ import Element from 'element-ui' import './styles/element-variables.scss' Vue.use(Element, { - size: Cookies.get('size') || 'small' // set element-ui default size + size: Cookies.get('size') || 'small', // set element-ui default size }) import '@/styles/common.scss' // common css import '@/styles/index.scss' // global css + +import config from '@/config' import App from './App' import store from './store' import router from './router' @@ -21,16 +23,24 @@ import permission from './directive/permission' import './assets/icons' // icon import './permission' // permission control -import { getDicts } from "@/api/system/dict/data"; -import { getConfigKey } from "@/api/system/config"; -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/common"; -import Pagination from "@/components/Pagination"; +import { getDicts } from '@/api/system/dict/data' +import { getConfigKey } from '@/api/system/config' +import { + parseTime, + resetForm, + addDateRange, + selectDictLabel, + selectDictLabels, + download, + handleTree, +} from '@/utils/common' + +import Pagination from '@/components/Pagination' //自定义表格工具扩展 -import RightToolbar from "@/components/RightToolbar" -import config from '@/config' +import RightToolbar from '@/components/RightToolbar' +import Upload from '@/components/Upload' // 全局方法挂载 -window.config = config Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey Vue.prototype.parseTime = parseTime @@ -41,21 +51,22 @@ Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.download = download Vue.prototype.handleTree = handleTree -Vue.prototype.msgSuccess = function (msg) { - this.$message({ showClose: true, message: msg, type: "success" }); +Vue.prototype.msgSuccess = function(msg) { + this.$message({ showClose: true, message: msg, type: 'success' }) } -Vue.prototype.msgError = function (msg) { - this.$message({ showClose: true, message: msg, type: "error" }); +Vue.prototype.msgError = function(msg) { + this.$message({ showClose: true, message: msg, type: 'error' }) } -Vue.prototype.msgInfo = function (msg) { - this.$message.info(msg); +Vue.prototype.msgInfo = function(msg) { + this.$message.info(msg) } // 全局组件挂载 Vue.component('Pagination', Pagination) Vue.component('RightToolbar', RightToolbar) +Vue.component('Upload', Upload) Vue.use(permission) @@ -74,5 +85,5 @@ new Vue({ el: '#app', router, store, - render: h => h(App) + render: (h) => h(App), }) diff --git a/linkwe-ui/src/utils/request.js b/linkwe-ui/src/utils/request.js index 9338759391b4d26018a78e9ecbeb5979b4f7d63f..e9fdedda3a299e4792041f7ead5ff459b4070eaa 100644 --- a/linkwe-ui/src/utils/request.js +++ b/linkwe-ui/src/utils/request.js @@ -10,69 +10,71 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, // 超时 - timeout: 10000 + timeout: 10000, }) // request拦截器 -service.interceptors.request.use(config => { - // 是否需要设置 token - const isToken = (config.headers || {}).isToken === false - if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 +service.interceptors.request.use( + (config) => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + if (getToken() && !isToken) { + config.headers = window.CONFIG.headers // 让每个请求携带自定义token 请根据实际情况自行修改 + } + return config + }, + (error) => { + console.log(error) + Promise.reject(error) } - return config -}, error => { - console.log(error) - Promise.reject(error) -}) +) // 响应拦截器 -service.interceptors.response.use(res => { - // 未设置状态码则默认成功状态 - const code = res.data.code || 200; - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - if (code === 200) { - return res.data - } else if (code === 401) { - // MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { - // confirmButtonText: '重新登录', - // cancelButtonText: '取消', - // type: 'warning' - // } - // ).then(() => { - // store.dispatch('LogOut').then(() => { - // location.href = '/index'; - // }) - // }) - } else if (code === 500) { - Message({ - message: msg, - type: 'error' - }) - return Promise.reject(new Error(msg)) - } else { - Notification.error({ - title: msg - }) - return Promise.reject('error') - } -}, - error => { - console.log('err' + error) - let { message } = error; - if (message == "Network Error") { - message = "后端接口连接异常"; +service.interceptors.response.use( + (res) => { + // 未设置状态码则默认成功状态 + const code = res.data.code || 200 + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + if (code === 200) { + return res.data + } else if (code === 401) { + // MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { + // confirmButtonText: '重新登录', + // cancelButtonText: '取消', + // type: 'warning' + // } + // ).then(() => { + // store.dispatch('LogOut').then(() => { + // location.href = '/index'; + // }) + // }) + } else if (code === 500) { + Message({ + message: msg, + type: 'error', + }) + return Promise.reject(new Error(msg)) + } else { + Notification.error({ + title: msg, + }) + return Promise.reject('error') } - else if (message.includes("timeout")) { - message = "系统接口请求超时"; - } - else if (message.includes("Request failed with status code")) { - message = "系统接口" + message.substr(message.length - 3) + "异常"; + }, + (error) => { + console.log('err' + error) + let { message } = error + if (message == 'Network Error') { + message = '后端接口连接异常' + } else if (message.includes('timeout')) { + message = '系统接口请求超时' + } else if (message.includes('Request failed with status code')) { + message = '系统接口' + message.substr(message.length - 3) + '异常' } Message({ message: message, type: 'error', - duration: 5 * 1000 + duration: 5 * 1000, }) return Promise.reject(error) } diff --git a/linkwe-ui/src/views/material/audio.vue b/linkwe-ui/src/views/material/audio.vue index db36ce9520af97021ff8d1726f3752a0192fbc9c..20d61f518cef9c4113f24db5633ebb4d6689ec78 100644 --- a/linkwe-ui/src/views/material/audio.vue +++ b/linkwe-ui/src/views/material/audio.vue @@ -17,9 +17,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map((item) => item.userId) - this.single = selection.length != 1 - this.multiple = !selection.length + this.ids = selection.map((item) => item.id) + '' }, }, } @@ -27,13 +25,9 @@ export default {