fix

.env.development

@@ -32,7 +32,7 @@ VITE_APP_BASE_CHAT_WS = 'ws://192.168.1.15:8060/'
 # VITE_APP_SIP_CONTACT_URL = "@192.168.8.17;transport=ws"
 
 # VITE_APP_PHONE_TYPE = 'PHONE'
-VITE_APP_PHONE_TYPE = 'SIP'
+VITE_APP_PHONE_TYPE = 'PHONE'
 VITE_APP_CALL_TYPE = 'VIOCE'
 VITE_APP_SIP_URL = 'ws://192.168.1.19:5066'
 VITE_APP_SIP_IP = '192.168.1.19'

src/components/main/ForceResetPwd.vue

@@ -0,0 +1,128 @@
+<template>
+  <el-dialog
+    :title="title"
+    v-model="dialogVisible"
+    width="400px"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :show-close="false"
+    :before-close="handleBeforeClose"
+  >
+    <el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
+      <el-form-item label="旧密码" prop="oldPwd">
+        <el-input
+          v-model="user.oldPwd"
+          placeholder="请输入旧密码"
+          type="password"
+          show-password
+        />
+      </el-form-item>
+      <el-form-item label="新密码" prop="Pwd">
+        <el-input
+          v-model="user.Pwd"
+          placeholder="请输入新密码（必须包含字母大小写和数字，长度8-16位）"
+          type="password"
+          show-password
+        />
+      </el-form-item>
+      <el-form-item label="确认密码" prop="confirmPassword">
+        <el-input
+          v-model="user.confirmPassword"
+          placeholder="请确认新密码"
+          type="password"
+          show-password
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submit" style="width: 100%">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, defineEmits } from 'vue'
+import { updateUserPwd } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const emit = defineEmits(['update:visible', 'success'])
+
+const dialogVisible = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    // 不允许关闭，除非密码修改成功
+  }
+})
+
+const title = '强制修改密码'
+const { proxy } = getCurrentInstance()
+
+const user = reactive({
+  oldPwd: undefined,
+  Pwd: undefined,
+  confirmPassword: undefined
+})
+
+const equalToPassword = (rule, value, callback) => {
+  if (user.Pwd !== value) {
+    callback(new Error('两次输入的密码不一致'))
+  } else {
+    callback()
+  }
+}
+
+const passwordStrength = (rule, value, callback) => {
+  // 检查密码强度：必须包含字母大小写和数字，长度8-16位
+  const regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,16}$/
+  if (!regex.test(value)) {
+    callback(new Error('密码必须包含字母大小写和数字，长度8-16位'))
+  } else {
+    callback()
+  }
+}
+
+const rules = ref({
+  oldPwd: [{ required: true, message: '旧密码不能为空', trigger: 'blur' }],
+  Pwd: [
+    { required: true, message: '新密码不能为空', trigger: 'blur' },
+    { validator: passwordStrength, trigger: 'blur' }
+  ],
+  confirmPassword: [
+    { required: true, message: '确认密码不能为空', trigger: 'blur' },
+    { required: true, validator: equalToPassword, trigger: 'blur' }
+  ]
+})
+
+const pwdRef = ref(null)
+
+/** 提交按钮 */
+function submit() {
+  pwdRef.value.validate((valid) => {
+    if (valid) {
+      updateUserPwd(user.oldPwd, user.Pwd).then((response) => {
+        proxy.$modal.msgSuccess('修改成功')
+        emit('success')
+        emit('update:visible', false)
+        // 重置表单
+        user.oldPwd = undefined
+        user.Pwd = undefined
+        user.confirmPassword = undefined
+      })
+    }
+  })
+}
+
+/** 阻止关闭 */
+function handleBeforeClose(done) {
+  // 不允许关闭
+}
+</script>

src/components/main/Navbar/cpns/TelephoneLogin/index.vue

@@ -50,6 +50,17 @@
           <el-input v-model="formLogin.accountNumber" disabled autocomplete="off" />
         </el-form-item>
         <el-form-item
+          label="坐席组"
+          :label-width="formLabelWidth"
+          prop="groupNumber"
+          required
+        >
+          <el-radio-group v-model="formLogin.groupNumber">
+            <el-radio label="zxz">呼入组</el-radio>
+            <el-radio label="whz">呼出组</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
           label="分机号"
           :label-width="formLabelWidth"
           prop="extensionNumber"
@@ -82,7 +93,7 @@ import useUserStore from '@/store/modules/user'
 import { jssipInit,localMediaStream } from '@/utils/jsSip'
 import Cookies from 'js-cookie'
 
-import { ref } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 const { proxy } = getCurrentInstance();
 
 const scoketState = ref('签出')
@@ -101,6 +112,7 @@ const formLogin = reactive({
 })
 const rules = reactive({
   accountNumber: [{ required: true, message: '请输入工号', trigger: 'blur' }],
+  groupNumber: [{ required: true, message: '请选择坐席组', trigger: 'change' }],
   extensionNumber: [
     { required: true, message: '请输入分机号', trigger: 'blur' },
     { min: 4, max: 4, message: '分机号长度为4位', trigger: 'blur' }
@@ -165,6 +177,8 @@ function signIn() {
   }
   
 }
+
+
 function sipRegistered(data) {
   console.log(data)
 }
@@ -177,12 +191,12 @@ function loginIn() {
     Type: 'Login',
     AgentId: useUserStore().name,
     AgentExten: Cookies.get('extensionNumber'),
-    AgentGroup: 'zxz'
+    AgentGroup: Cookies.get('groupNumber') || 'zxz'
   }
   
   useSocketStore().setAccountNumber(useUserStore().name)
   useSocketStore().setExtensionNumber(Cookies.get('extensionNumber'))
-  useSocketStore().setGroupNumber('zxz')
+  useSocketStore().setGroupNumber(Cookies.get('groupNumber') || 'zxz')
   Send(scoketDatas.value, (data) => {
     if (data.Type === 'Login' && data.Result === true) {
       loginFlag.value = true
@@ -205,6 +219,7 @@ const signInConfirm = async (formEl) => {
       }
 
       Cookies.set('extensionNumber', formLogin.extensionNumber, { expires: 30 })
+      Cookies.set('groupNumber', formLogin.groupNumber, { expires: 30 })
       useSocketStore().setAccountNumber(formLogin.accountNumber)
       useSocketStore().setExtensionNumber(formLogin.extensionNumber)
       useSocketStore().setGroupNumber(formLogin.groupNumber)

src/views/login/login.vue

@@ -117,12 +117,15 @@ function handleLogin() {
   proxy.$refs.loginRef.validate((valid) => {
     if (valid) {
       loading.value = true
+      // 存储加密前的密码用于密码强度检查
+        Cookies.set('plainPassword', loginForm.value.password, { expires: 30 })
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
       if (loginForm.value.rememberMe) {
         Cookies.set('username', loginForm.value.username, { expires: 30 })
-        Cookies.set('password', encrypt(loginForm.value.password), {
-          expires: 30
-        })
+        
+        // 密码加密后存储
+        Cookies.set('password', encrypt(loginForm.value.password), { expires: 30 })
+        
         Cookies.set('rememberMe', loginForm.value.rememberMe, { expires: 30 })
       } else {
         // 否则移除
@@ -161,11 +164,11 @@ function getCode() {
 function getCookie() {
   const username = Cookies.get('username')
   const password = Cookies.get('password')
+  const plainPassword = Cookies.get('plainPassword')
   const rememberMe = Cookies.get('rememberMe')
   loginForm.value = {
     username: username === undefined ? loginForm.value.username : username,
-    password:
-      password === undefined ? loginForm.value.password : decrypt(password),
+    password: password === undefined ? loginForm.value.password : decrypt(password),
     rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
   }
 }

src/views/main/main.vue

@@ -31,25 +31,31 @@
     <drawer-phone ref="drawerPhoneRef" id="drawerPhoneOutID"></drawer-phone>
     <!-- 来电弹屏 -->
     <page-incoming></page-incoming>
-	<!-- 右下角消息提示 -->
-	<msg-modal></msg-modal>
+    <!-- 右下角消息提示 -->
+    <msg-modal></msg-modal>
+    <!-- 强制修改密码弹框 -->
+    <force-reset-pwd v-model:visible="showForceResetPwd" @success="onPasswordResetSuccess" />
   </div>
 </template>
 
 <script setup>
 import { useWindowSize } from '@vueuse/core'
+import { onMounted, ref, computed, watchEffect } from 'vue'
+
 import Sidebar from '@/components/main/Sidebar/index.vue'
-import {
-  AppMain,
-  Navbar,
-  TagsView,
-  Settings,
-  DrawerPhone,
-  PageIncoming,
-  MsgModal
+import { 
+  AppMain, 
+  Navbar, 
+  TagsView, 
+  Settings, 
+  DrawerPhone, 
+  PageIncoming, 
+  MsgModal 
 } from '@/components/main'
+import ForceResetPwd from '@/components/main/ForceResetPwd.vue'
 import useAppStore from '@/store/modules/app'
 import useSettingsStore from '@/store/modules/settings'
+import Cookies from 'js-cookie'
 
 const settingsStore = useSettingsStore()
 const theme = computed(() => settingsStore.theme)
@@ -69,6 +75,10 @@ const classObj = computed(() => ({
 const { width, height } = useWindowSize()
 const WIDTH = 992 // refer to Bootstrap's responsive design
 
+// 强制修改密码相关
+const showForceResetPwd = ref(false)
+const passwordChecked = ref(false)
+
 watchEffect(() => {
   if (device.value === 'mobile' && sidebar.value.opened) {
     useAppStore().closeSideBar({ withoutAnimation: false })
@@ -80,19 +90,52 @@ watchEffect(() => {
     useAppStore().toggleDevice('desktop')
   }
 })
-// useSelectStore().getPageListAction()
+
+// 检查密码强度
+function checkPasswordStrength() {
+  // 只有在用户登录后且未检查过密码强度时才检查
+  if (passwordChecked.value) {
+    return
+  }
+  
+  const plainPassword = Cookies.get('plainPassword')
+  console.log('plainPassword', plainPassword)
+  if (plainPassword) {
+    // 检查密码强度：必须包含字母大小写和数字，长度8-16位
+    const regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,16}$/
+    if (!regex.test(plainPassword)) {
+      // 密码强度不足，显示强制修改密码弹框
+      showForceResetPwd.value = true
+    }
+  }
+  // 标记为已检查
+  passwordChecked.value = true
+}
+
+// 密码修改成功后的回调
+function onPasswordResetSuccess() {
+  // 密码修改成功后，可以清除标记，下次登录时重新检查
+  passwordChecked.value = false
+}
+
+onMounted(() => {
+  // 页面加载后检查密码强度
+  setTimeout(() => {
+    checkPasswordStrength()
+  }, 1000)
+})
+
 const drawerPhoneOutID = ref(null)
 const drawerPhoneRef = ref(null)
 const drawerPhoneFlag = ref(false)
-onMounted(() => {
-  // document.addEventListener('click', handleClickOutsideDrawer);
-})
+
 function handleClickOutsideDrawer(event) {
   drawerPhoneOutID.value = document.getElementById('drawerPhoneOutID')
   if (drawerPhoneOutID.value && !drawerPhoneOutID.value.contains(event.target)) {
     drawerPhoneRef.value.hidePhone()
   }
 }
+
 function handleClickOutside() {
   useAppStore().closeSideBar({ withoutAnimation: false })
 }