diff --git a/src/api/auth/auth.js b/src/api/auth/auth.js index 38be5c4..62cb2da 100644 --- a/src/api/auth/auth.js +++ b/src/api/auth/auth.js @@ -1,4 +1,5 @@ import request from "@/utils/request.js"; +import { method } from "lodash"; export const modifyUser=(data)=>{ return request({ @@ -9,8 +10,16 @@ export const modifyUser=(data)=>{ } export const editPassword=(data)=>{ return request({ - url:'/admin/mosr/user/update/password', + url:'/ops/user/detail/info', method:'post', data }) } + +//查询用户详细 +export const detailsUser=()=>{ + return request({ + url:'ops/user/detail/info', + method:'get' + }) +} diff --git a/src/api/workbench/index.js b/src/api/workbench/index.js new file mode 100644 index 0000000..ceedeca --- /dev/null +++ b/src/api/workbench/index.js @@ -0,0 +1,11 @@ +import request from '@/utils/request.js' +import { method } from 'lodash' + +//获取历史通话文本记录 + +export const getHistoryCallContent=(params)=>{ + return request({ + url:`/text/history/list/${params}`, + method:'get' + }) +} \ No newline at end of file diff --git a/src/components/infoLiveCall/index.vue b/src/components/infoLiveCall/index.vue index c89da96..8574160 100644 --- a/src/components/infoLiveCall/index.vue +++ b/src/components/infoLiveCall/index.vue @@ -1,7 +1,13 @@ - + - {{ userParams.userNumber }} + @@ -31,18 +32,18 @@ 邮箱 : - + {{ userParams.email||'--' }} - {{ userParams.email }} + 登录账号 : - + {{ userParams.loginAccount||'--' }} - {{ userParams.loginAccount }} + @@ -50,9 +51,9 @@ 用户名称 : - + {{ userParams.userName||'--' }} - {{ userParams.userName }} + @@ -60,9 +61,9 @@ 手机号码 : - + {{ userParams.phoneNumber||'--' }} - {{ userParams.userPhone }} + @@ -70,9 +71,9 @@ 账号类型 : - + {{ userParams.remark||'--' }} - {{ userParams.accountType }} + @@ -122,7 +123,8 @@ import { ElNotification } from 'element-plus' import { useTagsView } from '@/stores/tagsview.js' import { editPassword } from "@/api/auth/auth"; import { Lock } from '@element-plus/icons-vue' -import { ref } from 'vue'; +import { onMounted, ref } from 'vue'; +import { detailsUser } from '@/api/auth/auth'; const infoWidth = ref(22) const isShowDiv = ref(true) @@ -138,6 +140,18 @@ const userPassword = ref({ }); const tagsViewStore = useTagsView() +const getUserInfo= async ()=>{ + const res= await detailsUser() + userParams.value=res.data.user + console.log(userParams.value); + + } + + +getUserInfo() + + + const validatePasswordComplexity = (rule, value, callback) => { const reg = /^(?=.*[a-zA-Z])(?=.*\d).{1,9}$/; //密码必须是至少包含字母、数字,1-9位 if (!reg.test(value)) { @@ -191,7 +205,19 @@ const belongToRole = (roles) => { // 修改密码 const handleSubmit = async () => { - ElMessageBox.confirm( + // console.log(userPassword.value); + await passwordRef.value.validate() + editPassword({ + ...userPassword.value + }).then(res => { + ElNotification({ + title: '提示', + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' + }) + if (res.code === 1000) { + passwordRef.value.resetFields() + ElMessageBox.confirm( '提交成功', { confirmButtonText: '关闭', @@ -209,16 +235,6 @@ const handleSubmit = async () => { } ) - editPassword({ - ...userPassword.value - }).then(res => { - ElNotification({ - title: '提示', - message: res.msg, - type: res.code === 1000 ? 'success' : 'error' - }) - if (res.code === 1000) { - passwordRef.value.resetFields() } }) } @@ -321,6 +337,12 @@ div { border-bottom-style: solid; border-color: #daddd2; border-width: 2px; + + .box-info{ + // background-color: red; + + margin: auto; + } } // diff --git a/src/views/home/index.vue b/src/views/home/index.vue index e6edaab..19d4a85 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -7,7 +7,7 @@ 历史通话记录 - + @@ -16,6 +16,7 @@ import LiveCall from '@/components/liveCall/index.vue' import Voice from '@/components/voice/index.vue' import InfoLiveCall from '@/components/infoLiveCall/index.vue' +const rowData = ref() const infoLiveCallRef=ref() const voiceRef=ref() const tableIns = ref() @@ -37,30 +38,36 @@ const auths = reactive({ }) const tableConfig = reactive({ columns: [ - { + { prop: 'index', type: 'index', + label: '序号', + align: 'center', + width: 80, + }, + { + prop: 'orderNumber', label: '工单号', align: 'center', width: 80, }, { - prop: 'workOrderNumber', + prop: 'orderName', label: '工单名称', align: 'center' }, { - prop: 'workOrderNumber', + prop: 'orderContent', label: '工单内容', align: 'center' }, { - prop: 'workOrderNumber', + prop: 'operationUser', label: '处理人', align: 'center' }, { - prop: 'workOrderNumber', + prop: 'knotter', label: '关单人', align: 'center' }, @@ -124,7 +131,7 @@ const tableConfig = reactive({ } } ], - api: '', + api: '/order/list', params: {}, btns: [ // {name: '新增', key: 'add',type:'primary',icon:'Plus'}, @@ -134,7 +141,10 @@ const handleVoice = (row) => { voiceRef.value.open(true) } const handleInfo = (row) => { + // console.log(row); + infoLiveCallRef.value.open(true) + rowData.value = row.orderNumber } diff --git a/src/views/task-management/components/WorkDialog.vue b/src/views/task-management/components/WorkDialog.vue index 104a077..04bdc2f 100644 --- a/src/views/task-management/components/WorkDialog.vue +++ b/src/views/task-management/components/WorkDialog.vue @@ -1,7 +1,7 @@