xg

CallCenterWeb.UI/RMYY/src/store/modules/user.js

@@ -84,8 +84,10 @@ const user = {
       return new Promise((resolve, reject) => {
         login(username, password, loginway)
           .then(response => {
-            setToken(response.data)
-            commit('SET_TOKEN', response.data)
+            setToken(response.data.token)
+            commit('SET_TOKEN', response.data.token)
+            window.localStorage.setItem('changePwdFlag', response.data.changePwdFlag)
+            window.localStorage.setItem('storageUsercode', response.data.usercode)
             resolve()
           })
           .catch(error => {

CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

@@ -157,7 +157,7 @@
     created() {
       this.getAllowDept()
       this.updatePass()
-      this.isLongPass()
+      // this.isLongPass()
     },
     mounted() {
       if (window.localStorage.getItem('roleCode') === 'DDZX' || window.localStorage.getItem('roleCode') === 'DDBZ') {

CallCenterWeb.UI/RMYY/src/views/layout/components/Navbar/permsgEdit.vue

@@ -122,6 +122,9 @@ export default {
 	      if (this.form.confirmpas !== '') {
 	        this.$refs.ruleForm.validateField('confirmpas')
 	      }
+        if(this.form.newpas == this.form.oldpas){
+          callback(new Error('新密码不能和原密码相同!'))
+        }
 	      callback()
 	    }
 	  }

CallCenterWeb.UI/RMYY/src/views/login/index.vue

@@ -51,6 +51,20 @@
         <!-- 综合保障服务中心 &copy; -->
       </p>
     </div>
+    <el-dialog title="修改密码" width="40%" :visible.sync="dialogTableVisible" :modal-append-to-body="false" :show-close="false">
+      <el-form ref="ruleForm" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="" prop="oldpas">
+          <span style="color: #ff0000; ">*</span>原密码:<el-input v-model="form.oldpas" show-password type="password" autocomplete="off" placeholder="请输入原密码"/>
+        </el-form-item>
+        <el-form-item label="" prop="newpas">
+          <span style="color: #ff0000; ">*</span>新密码:<el-input v-model="form.newpas" show-password type="password" autocomplete="off" placeholder="请输入新密码"/>
+        </el-form-item>
+        <el-form-item label="" prop="confirmpas">
+          <span style="color: #ff0000; ">*</span>确认密码:<el-input v-model="form.confirmpas" show-password type="password" autocomplete="off" placeholder="请输入确认密码"/>
+        </el-form-item>
+        <el-button type="primary" style="margin-left: 45%;" @click="onsub()">确 定</el-button>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -60,23 +74,27 @@
   } from "@/utils/dd";
   import md5 from "js-md5";
   import SvgIcon from "@/components/common/SvgIcon"; // svg组件
-
+  import permsgEdit from "../layout/components/Navbar/permsgEdit.vue";
+  import { getResetPwd } from '@/api/layout/permsgEdit'
   import {
     validUsername,
     validPassword,
-    validExtension
+    validExtension,
+    strongvalidPassword
   } from "@/utils/validate";
   import {
     getAllowUserDept
   } from "@/api/login"
   const sm2 = require('sm-crypto').sm2
-  const cipherMode = 0  // 1 - C1C3C2，0 - C1C2C3，默认为1
-  const publicKey = "042DBA45E7B03394F603CADAFCDDEC854D3E01A4E9C52CD799B85B1A14BDB970137AE58BA553D79F058604DC1CD4B77DE5408BA3308E767584100C2B663510C819"
+  const cipherMode = 0 // 1 - C1C3C2，0 - C1C2C3，默认为1
+  const publicKey =
+    "042DBA45E7B03394F603CADAFCDDEC854D3E01A4E9C52CD799B85B1A14BDB970137AE58BA553D79F058604DC1CD4B77DE5408BA3308E767584100C2B663510C819"
   const privateKey = "BF1F907B4E0487F798DC80AFD7BC2A6201E8514233002272EA3BE2FC6F797843"
   export default {
     name: "Login",
     components: {
       SvgIcon,
+      permsgEdit
     },
     data() {
       const validateUser = (rule, value, callback) => {
@@ -95,7 +113,59 @@
           callback();
         }
       };
+      const validatePass1 = (rule, value, callback) => {
+        if (!strongvalidPassword(value)) {
+          callback(
+            new Error('请输入有效的密码（8-20个字符必须包含字母大小写和数字）！')
+          )
+        } else {
+          if (this.form.confirmpas !== '') {
+            this.$refs.ruleForm.validateField('confirmpas')
+          }
+          if(this.form.newpas == this.form.oldpas){
+            callback(new Error('新密码不能和原密码相同!'))
+          }
+          callback()
+        }
+      }
+      const validatePass2 = (rule, value, callback) => {
+        if (!strongvalidPassword(this.form.confirmpas)) {
+          callback(
+            new Error(
+              '请输入有效的密码（8-20个字符必须包含字母大小写和数字）！'
+            )
+          )
+        } else {
+          if (this.form.confirmpas !== this.form.newpas) {
+            callback(new Error('两次输入密码不一致!'))
+          }
+          callback()
+        }
+      }
       return {
+        rules: {
+          oldpas: [{
+            required: true,
+            trigger: 'blur',
+            message: '请输入原密码'
+          }],
+          newpas: [{
+            required: true,
+            trigger: 'blur',
+            validator: validatePass1
+          }],
+          confirmpas: [{
+            required: true,
+            trigger: 'blur',
+            validator: validatePass2
+          }]
+        },
+        form: {
+          oldpas: '',
+          newpas: '',
+          confirmpas: '',
+        },
+        ruleForm: {},
         isAllow: "",
         userRole: "0",
         isShow: true,
@@ -129,6 +199,7 @@
         },
         loading: false,
         pwdType: "password",
+        dialogTableVisible: false
       };
     },
     created() {
@@ -141,6 +212,9 @@
       ) {
         this.handleOAlogin();
       }
+      // if (window.localStorage.getItem('changePwdFlag') == 1) {
+      //   this.isLongPass()
+      // }
     },
     methods: {
       init() {
@@ -183,9 +257,9 @@
           obj[arr[0]] = arr[1];
         }
         console.log(obj);
-        if(obj.dept){
+        if (obj.dept) {
           window.localStorage.setItem('oadept', obj.dept)
-        }else{
+        } else {
           window.localStorage.setItem('oadept', '0')
         }
         this.$store
@@ -212,21 +286,27 @@
         this.$refs.loginForm.validate((valid) => {
           if (valid) {
             // this.loading = true;
-            const password = this.loginForm.password;
-            console.log(password)
+            // console.log(password)
             // this.loginForm.jiamiword = this.encrypt(md5(password));
+            const password = this.loginForm.password;
             this.loginForm.jiamiword = sm2.doEncrypt(md5(password), publicKey, cipherMode);
             this.loginForm.loginway = "pc";
             this.$store
               .dispatch("Login", this.loginForm)
               .then(() => {
-                this.$message.success("登录成功");
+                // this.$message.success("登录成功");
                 window.localStorage.setItem('loginpass', password)
                 window.localStorage.setItem('loginway', 'pc')
                 window.localStorage.setItem('oadept', '0')
                 window.localStorage.setItem('clickChangeDept', '0')
                 this.loading = false;
-                this.getAllowDept()
+                const changePwdFlag = window.localStorage.getItem('changePwdFlag')
+                if (changePwdFlag == 1) {
+                  this.isLongPass()
+                } else {
+                  this.getAllowDept()
+                }
+                // this.getAllowDept()
                 // this.$router.push({
                 //   path: "/Dashboard",
                 // });
@@ -240,6 +320,37 @@
           }
         });
       },
+      isLongPass() {
+        this.$alert('您的密码已经超三个月未修改，请更新密码!', '提示', {
+          showClose: false,
+          confirmButtonText: '确定',
+          callback: action => {
+            this.dialogTableVisible = true
+          }
+        });
+      },
+      onsub() {
+        this.$refs.ruleForm.validate((valid) => {
+          if (valid) {
+            const params = {
+              oldpwd: md5(this.form.oldpas),
+              usercode: localStorage.getItem('storageUsercode'),
+              pwd: md5(this.form.confirmpas)
+            }
+            getResetPwd(params).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.$message.success('恭喜你，重置密码成功!')
+                this.dialogTableVisible = false
+                window.localStorage.setItem('loginpass', this.form.confirmpas)
+                window.localStorage.setItem('loginway', 'pc')
+                window.localStorage.setItem('oadept', '0')
+                window.localStorage.setItem('clickChangeDept', '0')
+                this.getAllowDept()
+              }
+            })
+          }
+        })
+      },
       toggle() {
         const validateExt = (rule, value, callback) => {
           if (!validExtension(value)) {

CallCenterWeb.UI/RMYYAPP/pages/index/index.vue

@@ -121,10 +121,10 @@
 								}
 								
 							})
-						}else{
-							uni.reLaunch({
-								url: '/pages/login/login'
-							});
+						}else{							
+							// uni.reLaunch({
+							// 	url: '/pages/login/login'
+							// });
 						}
 					}
 				})

CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -10,7 +10,7 @@
 				<wInput v-model="phoneData" type="text" maxlength="11" placeholder="用户名" :focus="isFocus"></wInput>
 				<wInput v-model="passData" type="password" maxlength="11" placeholder="密码"></wInput>
 			</view>
-			
+
 			<wButton class="wbutton" text="登 录" :rotate="isRotate" @click="startLogin"></wButton>
 			<!-- <wButton class="wbutton" text="用户注册" @click="registerStart"></wButton> -->
 			<!-- <view class="registerStyle" @click="registerStart"></view> -->
@@ -19,7 +19,6 @@
 </template>
 
 <script>
-	
 	import wInput from '@/components/watch-login/watch-input.vue' //input
 	import wButton from '@/components/watch-login/watch-button.vue' //button
 	// import CryptoJS from '@/static/js/crypto-js/crypto-js.js'
@@ -27,8 +26,9 @@
 	// import { encrypt, decrypt } from "@/utils/jsencrypt";
 	import pageData from '../myTask/repairList/addRepair/pageData.js'
 	const sm2 = require('sm-crypto').sm2
-	const cipherMode = 0  // 1 - C1C3C2，0 - C1C2C3，默认为1
-	const publicKey = "042DBA45E7B03394F603CADAFCDDEC854D3E01A4E9C52CD799B85B1A14BDB970137AE58BA553D79F058604DC1CD4B77DE5408BA3308E767584100C2B663510C819"
+	const cipherMode = 0 // 1 - C1C3C2，0 - C1C2C3，默认为1
+	const publicKey =
+		"042DBA45E7B03394F603CADAFCDDEC854D3E01A4E9C52CD799B85B1A14BDB970137AE58BA553D79F058604DC1CD4B77DE5408BA3308E767584100C2B663510C819"
 	const privateKey = "BF1F907B4E0487F798DC80AFD7BC2A6201E8514233002272EA3BE2FC6F797843"
 	// let pwd= sm2.doEncrypt(800100, publicKey, cipherMode) // sm2加密
 	// console.log(pwd)
@@ -36,7 +36,7 @@
 	export default {
 		data() {
 			return {
-				isAllow:"",
+				isAllow: "",
 				//logo图片 base64
 				logoImage: '/static/login-icon.png',
 				phoneData: '', //用户/电话
@@ -54,7 +54,7 @@
 		},
 
 		methods: {
-			updatePass(){
+			updatePass() {
 				const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,20}$/;
 				const pass = uni.getStorageSync('loginpass');
 				if (!reg.test(pass)) {
@@ -72,9 +72,30 @@
 							}
 						}
 					});
+				} else {
+					this.isLongPass()
+				}
+			},
+			isLongPass() {
+				const changePwdFlag = uni.getStorageSync('changePwdFlag')
+				if(changePwdFlag == 1){
+					uni.showModal({
+						title: '提示',
+						content: '您的密码已经超三个月未修改，请更新密码！',
+						showCancel: false,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "/pages/setting/fontSizeSettingPass/fontSizeSettingPass"
+								})
+							} else if (res.cancel) {
+								console.log('取消');
+							}
+						}
+					});
 				}else{
 					this.getAllowDept()
-				}
+				}			
 			},
 			startLogin(e) {
 				this.saveDept()
@@ -96,77 +117,78 @@
 				let params = {
 					"usercode": this.phoneData,
 					"password": sm2.doEncrypt(md5.hex_md5(this.passData), publicKey, cipherMode),
-					"loginway":"phone"
+					"loginway": "phone"
 				}
-				
-				
-				this.$mStore.dispatch("Login", params).then((e)=>{
+
+
+				this.$mStore.dispatch("Login", params).then((e) => {
 					this.isRotate = false
-					if(e.state.toLowerCase() == 'success') {
-					    uni.setStorageSync('loginpass', this.passData)
-						uni.setStorageSync('token', e.data)
-						uni.setStorageSync('loginway','phone')
-						
-					}else{
+					if (e.state.toLowerCase() == 'success') {
+						uni.setStorageSync('loginpass', this.passData)
+						uni.setStorageSync('token', e.data.token)
+						uni.setStorageSync('loginway', 'phone')
+						uni.setStorageSync('userCode', e.data.usercode)
+						uni.setStorageSync('changePwdFlag', e.data.changePwdFlag)
+					} else {
 						this.$mHelper.toast(e.message)
-						return 
+						return
 					}
-					
-					this.$mStore.dispatch("GetInfo").then((e)=>{
+
+					this.$mStore.dispatch("GetInfo").then((e) => {
 						uni.setStorageSync('roleCode', e.data.Role.F_RoleCode)
 						uni.setStorageSync('userName', e.data.User.F_UserName)
-						if(e.data.Dept){
+						if (e.data.Dept) {
 							uni.setStorageSync('deptId', e.data.Dept.F_DeptId)
 							uni.setStorageSync('deptName', e.data.Dept.F_DeptName)
 						}
-						
+
 						uni.setStorageSync('userCode', e.data.User.F_UserCode)
 						uni.setStorageSync('userId', e.data.User.F_UserId.toString())
 						uni.setStorageSync('storageAllowUserDept', e.data.User.F_AllowDepartment)
-						const code = uni.getStorageSync("roleCode"); 
+						const code = uni.getStorageSync("roleCode");
 						this.updatePass()
-
-						if(!uni.getStorageSync('fontSizeValue')){
+						// this.isLongPass()
+						if (!uni.getStorageSync('fontSizeValue')) {
 							uni.setStorageSync('fontSizeValue', 1)
-						}					
-						 // ||code == 'GLY' || code == 'DDZX'
+						}
+						// ||code == 'GLY' || code == 'DDZX'
 						// if(code == 'WXY' || code == 'DDZX'|| code == 'GLY' || code == 'jcgn'  || code == 'GQY' || 
 						// code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {}else{
 						// 	this.$mHelper.toast("没有登录权限");
 						// 	return;
 						// }
 					})
-				}).catch((e)=>{
+				}).catch((e) => {
 					this.isRotate = false
 				})
-				
+
 			},
-			getAllowDept(){
-			  const params = {}
-			  this.$http.get('Index/GetUserDept', params).then(res=>{
-			    if(res.message == '需要选择科室'){
-			      this.isAllow = "1"
-			    }else{
-			      this.isAllow = "0"
-			    }
-				uni.setStorageSync('isAllow', this.isAllow)
-			    uni.switchTab({
-			    	url: '/pages/myTask/myTask'
-			    });
-			  })
+			getAllowDept() {
+				const params = {}
+				this.$http.get('Index/GetUserDept', params).then(res => {
+					if (res.message == '需要选择科室') {
+						this.isAllow = "1"
+					} else {
+						this.isAllow = "0"
+					}
+					uni.setStorageSync('isAllow', this.isAllow)
+					uni.switchTab({
+						url: '/pages/myTask/myTask'
+					});
+				})
 			},
-			registerStart(){
+			registerStart() {
 				uni.navigateTo({
 					url: '/pages/register/register'
 				})
 			},
-			saveDept(){
+			saveDept() {
 				pageData.getDet((res, data) => {
-					uni.setStorageSync('deptTreeData',JSON.stringify(res))
-					uni.setStorageSync('deptAllList',JSON.stringify(data))
+					uni.setStorageSync('deptTreeData', JSON.stringify(res))
+					uni.setStorageSync('deptAllList', JSON.stringify(data))
 				})
 			}
-			
+
 		}
 	}
 </script>
@@ -174,14 +196,16 @@
 <style>
 	@import url("@/components/watch-login/css/icon.css");
 	@import url("@/pages/login/css/main.css");
-	.wbutton{
+
+	.wbutton {
 		margin-top: 30px;
 	}
-	.registerStyle{
-		    color: blue;
-		    text-align: center;
-		    height: 30px;
-		    line-height: 30px;
-		    margin-top: 20px;
+
+	.registerStyle {
+		color: blue;
+		text-align: center;
+		height: 30px;
+		line-height: 30px;
+		margin-top: 20px;
 	}
-</style>
+</style>

CallCenterWeb.UI/RMYYAPP/pages/myTask/myTask.vue

@@ -179,7 +179,7 @@
 				})
 			}
 			// this.updatePass()			
-			this.isLongPass()
+			// this.isLongPass()
 			// uni.hideTabBar()
 		},
 		methods: {

CallCenterWeb.UI/RMYYAPP/pages/myTask/reportForm/reportForm.vue

@@ -182,10 +182,10 @@
 				<uni-tr>
 					<uni-th align="center" width="100rpx" class="thcol">姓名</uni-th>
 					<uni-th align="center" width="150rpx" class="thcol">班组</uni-th>
-					<uni-th align="center" width="110rpx" class="thcol" :sortable="true">接单量</uni-th>
-					<uni-th align="center" width="110rpx" class="thcol" :sortable="true">未完成</uni-th>
-					<uni-th align="center" width="120rpx" class="thcol" :sortable="true">超时工单</uni-th>
-					<uni-th align="center" width="110rpx" class="thcol" :sortable="true">不满意</uni-th>
+					<uni-th align="center" width="110rpx" class="thcol" sortable @sort-change="sortChange">接单量</uni-th>
+					<uni-th align="center" width="110rpx" class="thcol" sortable>未完成</uni-th>
+					<uni-th align="center" width="120rpx" class="thcol" sortable>超时工单</uni-th>
+					<uni-th align="center" width="110rpx" class="thcol" sortable>不满意</uni-th>
 				</uni-tr>
 				<uni-tr v-for="items in renyuanData">
 					<uni-td align="center" class="tdcol">{{ items.Maintenancer }}</uni-td>
@@ -281,6 +281,9 @@
 			this.chart = echarts.init(document.getElementById('echartbox'))
 		},
 		methods: {
+			sortChange(data){
+				console.log(data)
+			},
 			gotoDetail(num) {
 				console.log(num)
 				uni.navigateTo({

CallCenterWeb.UI/RMYYAPP/pages/setting/fontSizeSettingPass/fontSizeSettingPass.vue

@@ -82,6 +82,10 @@
 					this.$mHelper.toast("新密码不能为空");
 					return
 				}
+				if(this.newpass == this.oldpass){
+					this.$mHelper.toast("新密码不能和原密码相同！");
+					return
+				}
 				if(!this.confirmpass){
 					this.$mHelper.toast("确认密码不能为空");
 					return
@@ -97,7 +101,7 @@
 				const params={
 					oldpwd: md5.hex_md5(this.oldpass),
 					pwd: md5.hex_md5(this.confirmpass),
-					username: uni.getStorageSync("userName"),
+					// username: uni.getStorageSync("userName"),
 					usercode: uni.getStorageSync("userCode"),
 				}
 				this.$http.get("UserAccount/ResetPwd", params).then((response) => {

CallCenterWeb.UI/RMYYAPP/store/modules/user.js

@@ -47,8 +47,8 @@ const user = {
 		}, userInfo) {
 			return new Promise((resolve, reject) => {
 				http.post("/Home/Login", userInfo).then((response) => {
-						setToken(response.data)
-						commit('SET_TOKEN', response.data)
+						setToken(response.data.token)
+						commit('SET_TOKEN', response.data.token)
 						resolve(response)
 					})
 					.catch((e) => {