diff --git a/public/jzTemplate/候车厅校准平台模板.xlsx b/public/jzTemplate/候车厅校准平台模板.xlsx
new file mode 100644
index 0000000..7368010
Binary files /dev/null and b/public/jzTemplate/候车厅校准平台模板.xlsx differ
diff --git a/public/jzTemplate/写字楼校准平台模板.xlsx b/public/jzTemplate/写字楼校准平台模板.xlsx
new file mode 100644
index 0000000..c973d8f
Binary files /dev/null and b/public/jzTemplate/写字楼校准平台模板.xlsx differ
diff --git a/public/jzTemplate/地铁校准平台模板.xlsx b/public/jzTemplate/地铁校准平台模板.xlsx
new file mode 100644
index 0000000..14d2b1c
Binary files /dev/null and b/public/jzTemplate/地铁校准平台模板.xlsx differ
diff --git a/public/jzTemplate/车库灯箱校准平台模板.xlsx b/public/jzTemplate/车库灯箱校准平台模板.xlsx
new file mode 100644
index 0000000..8829b1a
Binary files /dev/null and b/public/jzTemplate/车库灯箱校准平台模板.xlsx differ
diff --git a/public/jzTemplate/道闸校准平台模板.xlsx b/public/jzTemplate/道闸校准平台模板.xlsx
new file mode 100644
index 0000000..68c92d4
Binary files /dev/null and b/public/jzTemplate/道闸校准平台模板.xlsx differ
diff --git a/public/jzTemplate/门禁校准平台模板.xlsx b/public/jzTemplate/门禁校准平台模板.xlsx
new file mode 100644
index 0000000..1965631
Binary files /dev/null and b/public/jzTemplate/门禁校准平台模板.xlsx differ
diff --git a/public/jzTemplate/高铁校准平台模板.xlsx b/public/jzTemplate/高铁校准平台模板.xlsx
new file mode 100644
index 0000000..1f56eb5
Binary files /dev/null and b/public/jzTemplate/高铁校准平台模板.xlsx differ
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index c1d35d6..ce37d59 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -1175,7 +1175,9 @@ h6 {
.myInsertForm .el-tabs__item.is-active,
.myDetailForm .el-tabs__item.is-active,
.my_dialog .el-tabs__item.is-active,
-.el-tabs__item:hover {
+.myInsertForm .el-tabs__item:hover,
+.myDetailForm .el-tabs__item:hover,
+.my_dialog .el-tabs__item:hover {
font-family: Microsoft YaHei;
font-weight: 600;
font-size: 22px;
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index e2092ec..994ed4b 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -18,8 +18,24 @@
-
- {{ userStore.name }}
+
+
+
@@ -70,10 +86,10 @@ import useSettingsStore from '@/store/modules/settings'
import { addSysReaddBusProblemFeedbackgion } from "@/api/problemFeedback"
const appStore = useAppStore()
-const userStore = useUserStore()
+const userStore = useUserStore()
const settingsStore = useSettingsStore()
const { proxy } = getCurrentInstance()
-
+
function toggleSideBar() {
appStore.toggleSideBar()
}
diff --git a/src/views/mediaTool/calibrationIndex.vue b/src/views/mediaTool/calibrationIndex.vue
index 8dbb42d..ea57e8a 100644
--- a/src/views/mediaTool/calibrationIndex.vue
+++ b/src/views/mediaTool/calibrationIndex.vue
@@ -13,7 +13,26 @@
- 上传文件
+
+ 上传文件
+
+ 下载模板
+
+
+ 门禁校准模板
+ 候车厅校准模板
+ 道闸校准模板
+ 地铁校准模板
+ 高铁校准模板
+ 写字楼校准模板
+ 车库灯箱校准模板
+
+
+
+
@@ -47,6 +66,7 @@
+
{
loading.value = false
})
}
+// 模板下载
+const downloadExcelTemplate = (tempLateType) => {
+ const link = document.createElement('a')
+ if (tempLateType == 'mj') {
+ link.href = '/jzTemplate/门禁校准平台模板.xlsx'
+ link.download = '门禁校准平台模板.xlsx' // 设置下载文件名
+ }
+ if (tempLateType == 'hct') {
+ link.href = '/jzTemplate/候车厅校准平台模板.xlsx'
+ link.download = '候车厅校准平台模板.xlsx' // 设置下载文件名
+ }
+ if (tempLateType == 'dz') {
+ link.href = '/jzTemplate/道闸校准平台模板.xlsx'
+ link.download = '道闸校准平台模板.xlsx' // 设置下载文件名
+ }
+ if (tempLateType == 'dt') {
+ link.href = '/jzTemplate/地铁校准平台模板.xlsx'
+ link.download = '地铁校准平台模板.xlsx' // 设置下载文件名
+ }
+ if (tempLateType == 'gt') {
+ link.href = '/jzTemplate/高铁校准平台模板.xlsx'
+ link.download = '高铁校准平台模板.xlsx' // 设置下载文件名
+ }
+ if (tempLateType == 'xzl') {
+ link.href = '/jzTemplate/写字楼校准平台模板.xlsx'
+ link.download = '写字楼校准平台模板.xlsx' // 设置下载文件名
+ }
+ if (tempLateType == 'ckdx') {
+ link.href = '/jzTemplate/车库灯箱校准平台模板.xlsx'
+ link.download = '车库灯箱校准平台模板.xlsx' // 设置下载文件名
+ }
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link)
+}
// 自定义上传经纬度文件
const requestDocUpload = (options) => {
@@ -427,7 +482,7 @@ const handleExportCalibraTionResult = () => {
document.body.appendChild(a)
a.click()
document.body.removeChild(a)
-
+
proxy.$modal.msgSuccess("导出成功")
handleCloseModal()
})
@@ -581,4 +636,21 @@ defineExpose({
font-size: 16px;
color: #67C23A;
}
+
+.downloadTemplateBtnDrow {
+ width: 100px;
+ height: 36px;
+ font-family: Microsoft YaHei;
+ font-weight: 700;
+ font-size: 16px;
+ text-align: center;
+ color: #409eff !important;
+ background: transparent !important;
+ margin-top: 4px;
+}
+
+.downloadTemplateBtnDrow:hover {
+ background: transparent !important;
+ color: #409eff !important;
+}
\ No newline at end of file
diff --git a/src/views/mediaTool/pptAnalysisIndex.vue b/src/views/mediaTool/pptAnalysisIndex.vue
index 69504ce..c706e06 100644
--- a/src/views/mediaTool/pptAnalysisIndex.vue
+++ b/src/views/mediaTool/pptAnalysisIndex.vue
@@ -77,6 +77,7 @@
{{ moment(scope.row.created_at, "ddd, DD MMM YYYY HH:mm:ss [GMT]").format('YYYY-MM-DD HH:mm:ss') }}
+
-
+
-
- 个人信息
-
+
+ 个人信息
+
@@ -14,7 +14,7 @@
-
- 用户名称
+ 用户账号
{{ state.user.userName }}
-
@@ -27,7 +27,8 @@
-
所属部门
-
{{ state.user.dept.deptName }} / {{ state.postGroup }}
+ {{ state.user.dept.deptName }} / {{
+ state.postGroup }}
-
所属角色
@@ -42,13 +43,13 @@
-
+
-
- 基本资料
-
+
+ 基本资料
+
-
+
@@ -66,29 +67,33 @@
import userAvatar from "./userAvatar"
import userInfo from "./userInfo"
import resetPwd from "./resetPwd"
+import otherbg from '@/assets/images/otherbg.png'
import { getUserProfile } from "@/api/system/user"
+import { useBackgroundStore } from '@/store/modules/background'
+const bgStore = useBackgroundStore()
const route = useRoute()
const selectedTab = ref("userinfo")
const state = reactive({
- user: {},
- roleGroup: {},
- postGroup: {}
+ user: {},
+ roleGroup: {},
+ postGroup: {}
})
function getUser() {
- getUserProfile().then(response => {
- state.user = response.data
- state.roleGroup = response.roleGroup
- state.postGroup = response.postGroup
- })
+ getUserProfile().then(response => {
+ state.user = response.data
+ state.roleGroup = response.roleGroup
+ state.postGroup = response.postGroup
+ })
}
onMounted(() => {
- const activeTab = route.params && route.params.activeTab
- if (activeTab) {
- selectedTab.value = activeTab
- }
- getUser()
+ bgStore.setBgImage(otherbg)
+ const activeTab = route.params && route.params.activeTab
+ if (activeTab) {
+ selectedTab.value = activeTab
+ }
+ getUser()
})
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 73c6b18..801fc91 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -45,7 +45,7 @@ const rules = ref({
function submit() {
proxy.$refs.pwdRef.validate(valid => {
if (valid) {
- updateUserPwd(user.oldPassword, user.newPassword).then(response => {
+ updateUserPwd(user.oldPassword, user.newPassword, user.confirmPassword).then(response => {
proxy.$modal.msgSuccess("修改成功")
})
}
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 5099ffa..3a80845 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -1,7 +1,7 @@
-
-
+
+
@@ -35,7 +35,7 @@ const { proxy } = getCurrentInstance()
const form = ref({})
const rules = ref({
- nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+ realName: [{ required: true, message: "用户姓名不能为空", trigger: "blur" }],
email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
})
@@ -61,7 +61,7 @@ function close() {
// 回显当前登录用户信息
watch(() => props.user, user => {
if (user) {
- form.value = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex }
+ form.value = { realName: user.realName, phonenumber: user.phonenumber, email: user.email, sex: user.sex }
}
},{ immediate: true })