diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ff07953..103504c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,6 +38,7 @@ .then(res => { const data = res.data; data.user.posts = data.posts; + console.log('data.user', data.user); this.userInfo = data.user; const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar; diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ff07953..103504c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,6 +38,7 @@ .then(res => { const data = res.data; data.user.posts = data.posts; + console.log('data.user', data.user); this.userInfo = data.user; const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar; diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue index f2d1eda..85bb79a 100644 --- a/src/views/RongyunCommunication/ModalContact/index.vue +++ b/src/views/RongyunCommunication/ModalContact/index.vue @@ -2,25 +2,28 @@ +
+
融云通讯录
+
+
- +
- + @@ -42,7 +45,7 @@ -
+
{{ row.name }} ( - + {{ p.registerPlatform }} {{ p.isOnlion == 1 ? '在线 ' : '离线 ' }} @@ -522,4 +524,25 @@ onMounted(() => {}); - + diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ff07953..103504c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,6 +38,7 @@ .then(res => { const data = res.data; data.user.posts = data.posts; + console.log('data.user', data.user); this.userInfo = data.user; const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar; diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue index f2d1eda..85bb79a 100644 --- a/src/views/RongyunCommunication/ModalContact/index.vue +++ b/src/views/RongyunCommunication/ModalContact/index.vue @@ -2,25 +2,28 @@ +
+
融云通讯录
+
+
- +
- + @@ -42,7 +45,7 @@ -
+
{{ row.name }} ( - + {{ p.registerPlatform }} {{ p.isOnlion == 1 ? '在线 ' : '离线 ' }} @@ -522,4 +524,25 @@ onMounted(() => {}); - + diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue index af92ff6..8baa45c 100644 --- a/src/views/RongyunCommunication/ModelRongYun/index.vue +++ b/src/views/RongyunCommunication/ModelRongYun/index.vue @@ -7,26 +7,17 @@ :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" - :show-close="false" - append-to-body modal-class="pmpSitNewDialog" + z-index="10000" + :before-close="clearRY" + append-to-body > -
-
-
- - 视频会商 -
-
- -
-
- - +
+
视频会商
+
+
+
+
@@ -106,11 +97,11 @@ + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ff07953..103504c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,6 +38,7 @@ .then(res => { const data = res.data; data.user.posts = data.posts; + console.log('data.user', data.user); this.userInfo = data.user; const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar; diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue index f2d1eda..85bb79a 100644 --- a/src/views/RongyunCommunication/ModalContact/index.vue +++ b/src/views/RongyunCommunication/ModalContact/index.vue @@ -2,25 +2,28 @@ +
+
融云通讯录
+
+
- +
- + @@ -42,7 +45,7 @@ -
+
{{ row.name }} ( - + {{ p.registerPlatform }} {{ p.isOnlion == 1 ? '在线 ' : '离线 ' }} @@ -522,4 +524,25 @@ onMounted(() => {}); - + diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue index af92ff6..8baa45c 100644 --- a/src/views/RongyunCommunication/ModelRongYun/index.vue +++ b/src/views/RongyunCommunication/ModelRongYun/index.vue @@ -7,26 +7,17 @@ :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" - :show-close="false" - append-to-body modal-class="pmpSitNewDialog" + z-index="10000" + :before-close="clearRY" + append-to-body > -
-
-
- - 视频会商 -
-
- -
-
- - +
+
视频会商
+
+
+
+
@@ -106,11 +97,11 @@ diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ff07953..103504c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,6 +38,7 @@ .then(res => { const data = res.data; data.user.posts = data.posts; + console.log('data.user', data.user); this.userInfo = data.user; const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar; diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue index f2d1eda..85bb79a 100644 --- a/src/views/RongyunCommunication/ModalContact/index.vue +++ b/src/views/RongyunCommunication/ModalContact/index.vue @@ -2,25 +2,28 @@ +
+
融云通讯录
+
+
- +
- + @@ -42,7 +45,7 @@ -
+
{{ row.name }} ( - + {{ p.registerPlatform }} {{ p.isOnlion == 1 ? '在线 ' : '离线 ' }} @@ -522,4 +524,25 @@ onMounted(() => {}); - + diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue index af92ff6..8baa45c 100644 --- a/src/views/RongyunCommunication/ModelRongYun/index.vue +++ b/src/views/RongyunCommunication/ModelRongYun/index.vue @@ -7,26 +7,17 @@ :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" - :show-close="false" - append-to-body modal-class="pmpSitNewDialog" + z-index="10000" + :before-close="clearRY" + append-to-body > -
-
-
- - 视频会商 -
-
- -
-
- - +
+
视频会商
+
+
+
+
@@ -106,11 +97,11 @@ diff --git a/src/views/RongyunCommunication/rongyuncss/index.scss b/src/views/RongyunCommunication/rongyuncss/index.scss index f1d22f5..b41bcdc 100644 --- a/src/views/RongyunCommunication/rongyuncss/index.scss +++ b/src/views/RongyunCommunication/rongyuncss/index.scss @@ -12,7 +12,7 @@ #ryAcceptModal { width: 980px !important; - height: 628px !important; + height: 758px !important; background: url('@/assets/images/rongYunImg/popwindow-bg.png') no-repeat !important; background-size: 100% 100% !important; padding: 20px !important; @@ -57,7 +57,7 @@ .rong-container-app { width: 100%; - height: 500px; + height: 600px; position: relative; .rong-video-box-app { @@ -217,14 +217,15 @@ line-height: 22px; height: 590px; position: relative; - background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); + background: #071645; + // background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); box-shadow: 0 0 0 1px rgba(33, 109, 206, 1), inset 0 0 20px rgba(33, 109, 206, 1); top: calc(50% - 320px); z-index: 3; - .online { + .onlinery { color: green; } - .offline { + .offlinery { color: red; } .el-dialog__header { diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ff07953..103504c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,6 +38,7 @@ .then(res => { const data = res.data; data.user.posts = data.posts; + console.log('data.user', data.user); this.userInfo = data.user; const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar; diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue index f2d1eda..85bb79a 100644 --- a/src/views/RongyunCommunication/ModalContact/index.vue +++ b/src/views/RongyunCommunication/ModalContact/index.vue @@ -2,25 +2,28 @@ +
+
融云通讯录
+
+
- +
- + @@ -42,7 +45,7 @@ -
+
{{ row.name }} ( - + {{ p.registerPlatform }} {{ p.isOnlion == 1 ? '在线 ' : '离线 ' }} @@ -522,4 +524,25 @@ onMounted(() => {}); - + diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue index af92ff6..8baa45c 100644 --- a/src/views/RongyunCommunication/ModelRongYun/index.vue +++ b/src/views/RongyunCommunication/ModelRongYun/index.vue @@ -7,26 +7,17 @@ :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" - :show-close="false" - append-to-body modal-class="pmpSitNewDialog" + z-index="10000" + :before-close="clearRY" + append-to-body > -
-
-
- - 视频会商 -
-
- -
-
- - +
+
视频会商
+
+
+
+
@@ -106,11 +97,11 @@ diff --git a/src/views/RongyunCommunication/rongyuncss/index.scss b/src/views/RongyunCommunication/rongyuncss/index.scss index f1d22f5..b41bcdc 100644 --- a/src/views/RongyunCommunication/rongyuncss/index.scss +++ b/src/views/RongyunCommunication/rongyuncss/index.scss @@ -12,7 +12,7 @@ #ryAcceptModal { width: 980px !important; - height: 628px !important; + height: 758px !important; background: url('@/assets/images/rongYunImg/popwindow-bg.png') no-repeat !important; background-size: 100% 100% !important; padding: 20px !important; @@ -57,7 +57,7 @@ .rong-container-app { width: 100%; - height: 500px; + height: 600px; position: relative; .rong-video-box-app { @@ -217,14 +217,15 @@ line-height: 22px; height: 590px; position: relative; - background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); + background: #071645; + // background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); box-shadow: 0 0 0 1px rgba(33, 109, 206, 1), inset 0 0 20px rgba(33, 109, 206, 1); top: calc(50% - 320px); z-index: 3; - .online { + .onlinery { color: green; } - .offline { + .offlinery { color: red; } .el-dialog__header { diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 68f9fbc..5c8bb38 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -99,7 +99,7 @@ // 这个方法会出现当前已勾选节点,或者半节点的状态 function check(data, node) { selectList.value = []; - console.log('node', node); + console.log('node', node, data.value); if (node) { let arr = [...node.checkedNodes]; @@ -109,7 +109,26 @@ } }); } - console.log('selectList.value', selectList.value); + + nextTick(() => { + let arr = []; + dataSource.value[0].children.map(p => { + arr.push(p.value); + }); + console.log('arr', arr); + + arr.map(item => { + if (selectList.value.includes(item)) { + selectList.value.splice(selectList.value.indexOf(item), 1); + } + }); + selectList.value.push(data.value); + if (arr.includes(data.value)) { + proxy.$refs.layertree.setCheckedKeys(selectList.value); + } + + console.log('selectList.value', selectList.value); + }); } function setLayerVisible(newVal = [], oldVal = []) { const openLayer = _.difference(newVal, oldVal); @@ -142,7 +161,7 @@ const targetElements = document.querySelectorAll('.target-class'); targetElements.forEach(target => { const parent = target.parentElement; // 获取父级元素 - console.log('parent', parent); + // console.log('parent', parent); if (parent) { parent.classList.add('mycustomclass'); // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式 diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ff07953..103504c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,6 +38,7 @@ .then(res => { const data = res.data; data.user.posts = data.posts; + console.log('data.user', data.user); this.userInfo = data.user; const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar; diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue index f2d1eda..85bb79a 100644 --- a/src/views/RongyunCommunication/ModalContact/index.vue +++ b/src/views/RongyunCommunication/ModalContact/index.vue @@ -2,25 +2,28 @@ +
+
融云通讯录
+
+
- +
- + @@ -42,7 +45,7 @@ -
+
{{ row.name }} ( - + {{ p.registerPlatform }} {{ p.isOnlion == 1 ? '在线 ' : '离线 ' }} @@ -522,4 +524,25 @@ onMounted(() => {}); - + diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue index af92ff6..8baa45c 100644 --- a/src/views/RongyunCommunication/ModelRongYun/index.vue +++ b/src/views/RongyunCommunication/ModelRongYun/index.vue @@ -7,26 +7,17 @@ :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" - :show-close="false" - append-to-body modal-class="pmpSitNewDialog" + z-index="10000" + :before-close="clearRY" + append-to-body > -
-
-
- - 视频会商 -
-
- -
-
- - +
+
视频会商
+
+
+
+
@@ -106,11 +97,11 @@ diff --git a/src/views/RongyunCommunication/rongyuncss/index.scss b/src/views/RongyunCommunication/rongyuncss/index.scss index f1d22f5..b41bcdc 100644 --- a/src/views/RongyunCommunication/rongyuncss/index.scss +++ b/src/views/RongyunCommunication/rongyuncss/index.scss @@ -12,7 +12,7 @@ #ryAcceptModal { width: 980px !important; - height: 628px !important; + height: 758px !important; background: url('@/assets/images/rongYunImg/popwindow-bg.png') no-repeat !important; background-size: 100% 100% !important; padding: 20px !important; @@ -57,7 +57,7 @@ .rong-container-app { width: 100%; - height: 500px; + height: 600px; position: relative; .rong-video-box-app { @@ -217,14 +217,15 @@ line-height: 22px; height: 590px; position: relative; - background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); + background: #071645; + // background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); box-shadow: 0 0 0 1px rgba(33, 109, 206, 1), inset 0 0 20px rgba(33, 109, 206, 1); top: calc(50% - 320px); z-index: 3; - .online { + .onlinery { color: green; } - .offline { + .offlinery { color: red; } .el-dialog__header { diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 68f9fbc..5c8bb38 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -99,7 +99,7 @@ // 这个方法会出现当前已勾选节点,或者半节点的状态 function check(data, node) { selectList.value = []; - console.log('node', node); + console.log('node', node, data.value); if (node) { let arr = [...node.checkedNodes]; @@ -109,7 +109,26 @@ } }); } - console.log('selectList.value', selectList.value); + + nextTick(() => { + let arr = []; + dataSource.value[0].children.map(p => { + arr.push(p.value); + }); + console.log('arr', arr); + + arr.map(item => { + if (selectList.value.includes(item)) { + selectList.value.splice(selectList.value.indexOf(item), 1); + } + }); + selectList.value.push(data.value); + if (arr.includes(data.value)) { + proxy.$refs.layertree.setCheckedKeys(selectList.value); + } + + console.log('selectList.value', selectList.value); + }); } function setLayerVisible(newVal = [], oldVal = []) { const openLayer = _.difference(newVal, oldVal); @@ -142,7 +161,7 @@ const targetElements = document.querySelectorAll('.target-class'); targetElements.forEach(target => { const parent = target.parentElement; // 获取父级元素 - console.log('parent', parent); + // console.log('parent', parent); if (parent) { parent.classList.add('mycustomclass'); // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式 diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue index a043140..4366f9e 100644 --- a/src/views/pictureOnMap/TopTab/index.vue +++ b/src/views/pictureOnMap/TopTab/index.vue @@ -168,7 +168,7 @@ } }); } -const dialogShow = ref(true); +const dialogShow = ref(false); const dialogHide = val => { if (!val) { diff --git a/src/App.vue b/src/App.vue index 1cfde9e..69eacf5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,7 @@ const description = ref(''); import RongyunCommunication from '@/views/RongyunCommunication/index.vue'; //融云 const isRY = ref(false); +import useUserStore from '@/store/modules/user'; const appStore = useUserStore(); watch( () => appStore.token, @@ -122,4 +123,13 @@ color: #666666; } } + +:deep(.el-message) { + z-index: 9999999 !important; +} + + diff --git a/src/assets/styles/WaterAssets.scss b/src/assets/styles/WaterAssets.scss index 4b2f79a..8366383 100644 --- a/src/assets/styles/WaterAssets.scss +++ b/src/assets/styles/WaterAssets.scss @@ -280,14 +280,14 @@ } .blue { - color: #61cdfa; + color: #2cb7ff; } .green { - color: #a9fa61; + color: #00fcff; } .yellow { - color: #fabf61; + color: #ff993e; } } diff --git a/src/plugins/modal.js b/src/plugins/modal.js index fbdc5b4..0fbb3ff 100644 --- a/src/plugins/modal.js +++ b/src/plugins/modal.js @@ -1,44 +1,51 @@ -import { - ElMessage, - ElMessageBox, - ElNotification, - ElLoading, -} from "element-plus"; +import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'; let loadingInstance; export default { // 消息提示 msg(content) { - ElMessage.info(content); + ElMessage.info({ + message: content, + customClass: 'message-zindex', + }); }, // 错误消息 msgError(content) { - ElMessage.error(content); + ElMessage.error({ + message: content, + customClass: 'message-zindex', + }); }, // 成功消息 msgSuccess(content) { - ElMessage.success(content); + ElMessage.success({ + message: content, + customClass: 'message-zindex', + }); }, // 警告消息 msgWarning(content) { - ElMessage.warning(content); + ElMessage.warning({ + message: content, + customClass: 'message-zindex', + }); }, // 弹出提示 alert(content) { - ElMessageBox.alert(content, "系统提示"); + ElMessageBox.alert(content, '系统提示'); }, // 错误提示 alertError(content) { - ElMessageBox.alert(content, "系统提示", { type: "error" }); + ElMessageBox.alert(content, '系统提示', { type: 'error' }); }, // 成功提示 alertSuccess(content) { - ElMessageBox.alert(content, "系统提示", { type: "success" }); + ElMessageBox.alert(content, '系统提示', { type: 'success' }); }, // 警告提示 alertWarning(content) { - ElMessageBox.alert(content, "系统提示", { type: "warning" }); + ElMessageBox.alert(content, '系统提示', { type: 'warning' }); }, // 通知提示 notify(content) { @@ -58,18 +65,18 @@ }, // 确认窗体 confirm(content, confirmButtonText, cancelButtonText) { - return ElMessageBox.confirm(content, "系统提示", { - confirmButtonText: confirmButtonText || "确定", - cancelButtonText: cancelButtonText || "取消", - type: "warning", + return ElMessageBox.confirm(content, '系统提示', { + confirmButtonText: confirmButtonText || '确定', + cancelButtonText: cancelButtonText || '取消', + type: 'warning', }); }, // 提交内容 prompt(content) { - return ElMessageBox.prompt(content, "系统提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + return ElMessageBox.prompt(content, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', }); }, // 打开遮罩层 @@ -77,7 +84,7 @@ loadingInstance = ElLoading.service({ lock: true, text: content, - background: "rgba(0, 0, 0, 0.7)", + background: 'rgba(0, 0, 0, 0.7)', }); }, // 关闭遮罩层 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ff07953..103504c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -38,6 +38,7 @@ .then(res => { const data = res.data; data.user.posts = data.posts; + console.log('data.user', data.user); this.userInfo = data.user; const avatar = data.user.avatar == '' || data.user.avatar == null ? defAva : data.user.avatar; diff --git a/src/views/RongyunCommunication/ModalContact/index.vue b/src/views/RongyunCommunication/ModalContact/index.vue index f2d1eda..85bb79a 100644 --- a/src/views/RongyunCommunication/ModalContact/index.vue +++ b/src/views/RongyunCommunication/ModalContact/index.vue @@ -2,25 +2,28 @@ +
+
融云通讯录
+
+
- +
- + @@ -42,7 +45,7 @@ -
+
{{ row.name }} ( - + {{ p.registerPlatform }} {{ p.isOnlion == 1 ? '在线 ' : '离线 ' }} @@ -522,4 +524,25 @@ onMounted(() => {}); - + diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue index af92ff6..8baa45c 100644 --- a/src/views/RongyunCommunication/ModelRongYun/index.vue +++ b/src/views/RongyunCommunication/ModelRongYun/index.vue @@ -7,26 +7,17 @@ :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" - :show-close="false" - append-to-body modal-class="pmpSitNewDialog" + z-index="10000" + :before-close="clearRY" + append-to-body > -
-
-
- - 视频会商 -
-
- -
-
- - +
+
视频会商
+
+
+
+
@@ -106,11 +97,11 @@ diff --git a/src/views/RongyunCommunication/rongyuncss/index.scss b/src/views/RongyunCommunication/rongyuncss/index.scss index f1d22f5..b41bcdc 100644 --- a/src/views/RongyunCommunication/rongyuncss/index.scss +++ b/src/views/RongyunCommunication/rongyuncss/index.scss @@ -12,7 +12,7 @@ #ryAcceptModal { width: 980px !important; - height: 628px !important; + height: 758px !important; background: url('@/assets/images/rongYunImg/popwindow-bg.png') no-repeat !important; background-size: 100% 100% !important; padding: 20px !important; @@ -57,7 +57,7 @@ .rong-container-app { width: 100%; - height: 500px; + height: 600px; position: relative; .rong-video-box-app { @@ -217,14 +217,15 @@ line-height: 22px; height: 590px; position: relative; - background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); + background: #071645; + // background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); box-shadow: 0 0 0 1px rgba(33, 109, 206, 1), inset 0 0 20px rgba(33, 109, 206, 1); top: calc(50% - 320px); z-index: 3; - .online { + .onlinery { color: green; } - .offline { + .offlinery { color: red; } .el-dialog__header { diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 68f9fbc..5c8bb38 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -99,7 +99,7 @@ // 这个方法会出现当前已勾选节点,或者半节点的状态 function check(data, node) { selectList.value = []; - console.log('node', node); + console.log('node', node, data.value); if (node) { let arr = [...node.checkedNodes]; @@ -109,7 +109,26 @@ } }); } - console.log('selectList.value', selectList.value); + + nextTick(() => { + let arr = []; + dataSource.value[0].children.map(p => { + arr.push(p.value); + }); + console.log('arr', arr); + + arr.map(item => { + if (selectList.value.includes(item)) { + selectList.value.splice(selectList.value.indexOf(item), 1); + } + }); + selectList.value.push(data.value); + if (arr.includes(data.value)) { + proxy.$refs.layertree.setCheckedKeys(selectList.value); + } + + console.log('selectList.value', selectList.value); + }); } function setLayerVisible(newVal = [], oldVal = []) { const openLayer = _.difference(newVal, oldVal); @@ -142,7 +161,7 @@ const targetElements = document.querySelectorAll('.target-class'); targetElements.forEach(target => { const parent = target.parentElement; // 获取父级元素 - console.log('parent', parent); + // console.log('parent', parent); if (parent) { parent.classList.add('mycustomclass'); // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式 diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue index a043140..4366f9e 100644 --- a/src/views/pictureOnMap/TopTab/index.vue +++ b/src/views/pictureOnMap/TopTab/index.vue @@ -168,7 +168,7 @@ } }); } -const dialogShow = ref(true); +const dialogShow = ref(false); const dialogHide = val => { if (!val) { diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue index a89347e..0ca20f8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue @@ -45,7 +45,7 @@ - + diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue index af92ff6..8baa45c 100644 --- a/src/views/RongyunCommunication/ModelRongYun/index.vue +++ b/src/views/RongyunCommunication/ModelRongYun/index.vue @@ -7,26 +7,17 @@ :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" - :show-close="false" - append-to-body modal-class="pmpSitNewDialog" + z-index="10000" + :before-close="clearRY" + append-to-body > -
-
-
- - 视频会商 -
-
- -
-
- - +
+
视频会商
+
+
+
+
@@ -106,11 +97,11 @@ diff --git a/src/views/RongyunCommunication/rongyuncss/index.scss b/src/views/RongyunCommunication/rongyuncss/index.scss index f1d22f5..b41bcdc 100644 --- a/src/views/RongyunCommunication/rongyuncss/index.scss +++ b/src/views/RongyunCommunication/rongyuncss/index.scss @@ -12,7 +12,7 @@ #ryAcceptModal { width: 980px !important; - height: 628px !important; + height: 758px !important; background: url('@/assets/images/rongYunImg/popwindow-bg.png') no-repeat !important; background-size: 100% 100% !important; padding: 20px !important; @@ -57,7 +57,7 @@ .rong-container-app { width: 100%; - height: 500px; + height: 600px; position: relative; .rong-video-box-app { @@ -217,14 +217,15 @@ line-height: 22px; height: 590px; position: relative; - background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); + background: #071645; + // background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); box-shadow: 0 0 0 1px rgba(33, 109, 206, 1), inset 0 0 20px rgba(33, 109, 206, 1); top: calc(50% - 320px); z-index: 3; - .online { + .onlinery { color: green; } - .offline { + .offlinery { color: red; } .el-dialog__header { diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 68f9fbc..5c8bb38 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -99,7 +99,7 @@ // 这个方法会出现当前已勾选节点,或者半节点的状态 function check(data, node) { selectList.value = []; - console.log('node', node); + console.log('node', node, data.value); if (node) { let arr = [...node.checkedNodes]; @@ -109,7 +109,26 @@ } }); } - console.log('selectList.value', selectList.value); + + nextTick(() => { + let arr = []; + dataSource.value[0].children.map(p => { + arr.push(p.value); + }); + console.log('arr', arr); + + arr.map(item => { + if (selectList.value.includes(item)) { + selectList.value.splice(selectList.value.indexOf(item), 1); + } + }); + selectList.value.push(data.value); + if (arr.includes(data.value)) { + proxy.$refs.layertree.setCheckedKeys(selectList.value); + } + + console.log('selectList.value', selectList.value); + }); } function setLayerVisible(newVal = [], oldVal = []) { const openLayer = _.difference(newVal, oldVal); @@ -142,7 +161,7 @@ const targetElements = document.querySelectorAll('.target-class'); targetElements.forEach(target => { const parent = target.parentElement; // 获取父级元素 - console.log('parent', parent); + // console.log('parent', parent); if (parent) { parent.classList.add('mycustomclass'); // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式 diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue index a043140..4366f9e 100644 --- a/src/views/pictureOnMap/TopTab/index.vue +++ b/src/views/pictureOnMap/TopTab/index.vue @@ -168,7 +168,7 @@ } }); } -const dialogShow = ref(true); +const dialogShow = ref(false); const dialogHide = val => { if (!val) { diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue index a89347e..0ca20f8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue @@ -45,7 +45,7 @@ - + diff --git a/src/views/RongyunCommunication/ModelRongYun/index.vue b/src/views/RongyunCommunication/ModelRongYun/index.vue index af92ff6..8baa45c 100644 --- a/src/views/RongyunCommunication/ModelRongYun/index.vue +++ b/src/views/RongyunCommunication/ModelRongYun/index.vue @@ -7,26 +7,17 @@ :close-on-click-modal="false" v-model="RYShow" class="RongYunWindowShow" - :show-close="false" - append-to-body modal-class="pmpSitNewDialog" + z-index="10000" + :before-close="clearRY" + append-to-body > -
-
-
- - 视频会商 -
-
- -
-
- - +
+
视频会商
+
+
+
+
@@ -106,11 +97,11 @@ diff --git a/src/views/RongyunCommunication/rongyuncss/index.scss b/src/views/RongyunCommunication/rongyuncss/index.scss index f1d22f5..b41bcdc 100644 --- a/src/views/RongyunCommunication/rongyuncss/index.scss +++ b/src/views/RongyunCommunication/rongyuncss/index.scss @@ -12,7 +12,7 @@ #ryAcceptModal { width: 980px !important; - height: 628px !important; + height: 758px !important; background: url('@/assets/images/rongYunImg/popwindow-bg.png') no-repeat !important; background-size: 100% 100% !important; padding: 20px !important; @@ -57,7 +57,7 @@ .rong-container-app { width: 100%; - height: 500px; + height: 600px; position: relative; .rong-video-box-app { @@ -217,14 +217,15 @@ line-height: 22px; height: 590px; position: relative; - background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); + background: #071645; + // background: linear-gradient(to right bottom, rgba(4, 92, 196, 0.3), rgba(6, 28, 63, 1)); box-shadow: 0 0 0 1px rgba(33, 109, 206, 1), inset 0 0 20px rgba(33, 109, 206, 1); top: calc(50% - 320px); z-index: 3; - .online { + .onlinery { color: green; } - .offline { + .offlinery { color: red; } .el-dialog__header { diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index 68f9fbc..5c8bb38 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -99,7 +99,7 @@ // 这个方法会出现当前已勾选节点,或者半节点的状态 function check(data, node) { selectList.value = []; - console.log('node', node); + console.log('node', node, data.value); if (node) { let arr = [...node.checkedNodes]; @@ -109,7 +109,26 @@ } }); } - console.log('selectList.value', selectList.value); + + nextTick(() => { + let arr = []; + dataSource.value[0].children.map(p => { + arr.push(p.value); + }); + console.log('arr', arr); + + arr.map(item => { + if (selectList.value.includes(item)) { + selectList.value.splice(selectList.value.indexOf(item), 1); + } + }); + selectList.value.push(data.value); + if (arr.includes(data.value)) { + proxy.$refs.layertree.setCheckedKeys(selectList.value); + } + + console.log('selectList.value', selectList.value); + }); } function setLayerVisible(newVal = [], oldVal = []) { const openLayer = _.difference(newVal, oldVal); @@ -142,7 +161,7 @@ const targetElements = document.querySelectorAll('.target-class'); targetElements.forEach(target => { const parent = target.parentElement; // 获取父级元素 - console.log('parent', parent); + // console.log('parent', parent); if (parent) { parent.classList.add('mycustomclass'); // parent.style.backgroundColor = 'lightblue'; // 修改父级元素样式 diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue index a043140..4366f9e 100644 --- a/src/views/pictureOnMap/TopTab/index.vue +++ b/src/views/pictureOnMap/TopTab/index.vue @@ -168,7 +168,7 @@ } }); } -const dialogShow = ref(true); +const dialogShow = ref(false); const dialogHide = val => { if (!val) { diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue index a89347e..0ca20f8 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue @@ -45,7 +45,7 @@