ming преди 3 години
родител
ревизия
90a526fa35
променени са 4 файла, в които са добавени 163 реда и са изтрити 83 реда
  1. 9 0
      src/api/user.js
  2. 3 3
      src/views/login/index.vue
  3. 6 2
      src/views/middle.vue
  4. 145 78
      src/views/perCenter/index.vue

+ 9 - 0
src/api/user.js

@@ -58,4 +58,13 @@ export async function getUserData(params) {
         method: 'get',
         params,
     })
+}
+
+// 个人中心,信息修改
+export async function setUserData(data) {
+    return request({
+        url: '/system/user/setUserData',
+        method: 'post',
+        data,
+    })
 }

+ 3 - 3
src/views/login/index.vue

@@ -120,8 +120,8 @@ export default {
     }
 
     this.getLoginStyle()
-    // this.companyName='永天智慧电力'
-    // this.backdropUrl=require('@/assets/login_images/login_background.png')
+    this.companyName='永天智慧电力平台'
+    this.backdropUrl=require('@/assets/login_images/login_background.png')
   },
   methods: {
 
@@ -129,7 +129,7 @@ export default {
     getLoginStyle() {
       api
         .getLoginStyle({
-          url:window.location.host.indexOf('localhost') != -1 ?'https://qhome.usky.cn':window.location.host
+          url:window.location.host.indexOf('localhost') != -1 ?'dianli.uskycloud.com':window.location.host
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {

+ 6 - 2
src/views/middle.vue

@@ -86,6 +86,10 @@ export default defineComponent({
 
     onMounted(() => {
 
+      middleBackUrl.value=require('@/assets/images/middle_background.png')
+      middleTitle.value='永天智慧电力平台'
+      middleLogo.value=require('@/assets/logo2.png')
+
       getLoginStyle()
       console.log('middleList')
       console.log(middleList)
@@ -120,7 +124,7 @@ export default defineComponent({
     function getLoginStyle() {
       api
         .getLoginStyle({
-          url:window.location.host.indexOf('localhost') != -1 ?'https://qhome.usky.cn':window.location.host
+          url:window.location.host.indexOf('localhost') != -1 ?'dianli.uskycloud.com':window.location.host
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
@@ -146,7 +150,7 @@ export default defineComponent({
 .middle-container {
   width: 100%;
 
-  // background: url('~@/assets/images/middle_background.png');
+  background: url('~@/assets/images/middle_background.png');
   background-size: cover;
   background-color: #000000b3;
   margin: 0 auto;

+ 145 - 78
src/views/perCenter/index.vue

@@ -10,27 +10,27 @@
       </template>
       <div class="text item">
         <span class="text-left">租户名称:</span>
-        <span class="text-right">{{tenantName}}</span>
+        <span class="text-right">{{tenantName }}</span>
       </div>
       <div class="text item">
         <span class="text-left">管理员:</span>
-        <span class="text-right">{{nickName}}</span>
+        <span class="text-right">{{nickName }}</span>
       </div>
       <div class="text item">
         <span class="text-left">管理员手机号:</span>
-        <span class="text-right">{{phonenumber}}</span>
+        <span class="text-right">{{phoneNumber }}</span>
       </div>
       <div class="text item">
         <span class="text-left">系统平台:</span>
-        <span class="text-right">智慧电力</span>
+        <span class="text-right">{{systemName }}</span>
       </div>
       <div class="text item">
         <span class="text-left">地址:</span>
-        <span class="text-right">{{address}}</span>
+        <span class="text-right">{{address }}</span>
       </div>
       <div class="text item">
         <span class="text-left">到期时间:</span>
-        <span class="text-right">{{tenantTerm}}</span>
+        <span class="text-right">{{tenantTerm }}</span>
       </div>
     </el-card>
 
@@ -46,33 +46,41 @@
       </template>
 
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+
+        <!-- 个人信息start -->
         <el-tab-pane label="个人信息" name="first">
-          <el-form :model="form" :rules="rules" label-width="120px">
-            <el-form-item label="租户名称" prop="name">
-              <el-input v-model="form.name" disabled />
+          <el-form :model="form" ref="formInfo" :rules="rules" label-width="120px">
+            <el-form-item label="租户名称" prop="tenantName">
+              <el-input v-model="form.tenantName" disabled />
             </el-form-item>
-            <el-form-item label="管理员" prop="administrators">
-              <el-input v-model="form.administrators" />
+            <el-form-item label="管理员" prop="nickName">
+              <el-input v-model="form.nickName" />
             </el-form-item>
-            <el-form-item label="管理员手机号" prop="phone">
-              <el-input v-model="form.phone" />
+            <el-form-item label="管理员手机号" prop="phoneNumber">
+              <el-input v-model="form.phoneNumber" />
             </el-form-item>
             <el-form-item label="地址" prop="address">
               <el-input v-model="form.address" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="onSubmit">保存</el-button>
-              <el-button>取消</el-button>
+              <el-button type="primary" @click="submitForm('formInfo')">保存</el-button>
+              <el-button @click="resetForm()">取消</el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>
+        <!-- 个人信息end -->
+
+        <!-- 修改密码start -->
         <el-tab-pane label="修改密码" name="second">
-          <el-form :model="form2" :rules="rules2" label-width="120px">
-            <el-form-item label="账号" prop="account">
-              <el-input v-model="form2.account" disabled />
+          <el-form model="form2" ref="formInfo2" :rules="rules2" label-width="120px">
+            <el-form-item label="账号" prop="userName">
+              <el-input v-model="form2.userName" disabled />
+            </el-form-item>
+            <el-form-item label="账号" prop="userName">
+              <el-input v-model="form2.userName"  />
             </el-form-item>
-            <el-form-item label="原密码" prop="oldPass" type="password">
-              <el-input v-model="form2.oldPass" show-password />
+            <el-form-item label="原密码" prop="password" type="password">
+              <el-input v-model="form2.password" show-password />
             </el-form-item>
             <el-form-item label="密码" prop="pass" type="password">
               <el-input v-model="form2.pass" show-password />
@@ -82,10 +90,11 @@
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="onSubmit">保存</el-button>
-              <el-button>取消</el-button>
+              <el-button >取消</el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>
+        <!-- 修改密码end -->
       </el-tabs>
     </el-card>
 
@@ -94,9 +103,10 @@
 </template>
 
 <script>
-import { defineComponent, ref, onMounted, reactive } from 'vue'
+import { defineComponent, ref, onMounted, } from 'vue'
 import * as api from '@/api/user.js'
-// import { ElMessage } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import {  validatorPhone} from '@/utils'
 
 import { useStore } from 'vuex'
 
@@ -107,32 +117,32 @@ export default defineComponent({
 
     const store = useStore()
 
-    const tenantName = ref('')
-    const phonenumber = ref('')
-    const nickName = ref('')
-    const address = ref('') 
-    const tenantTerm = ref('') 
-
-    const form = reactive({
-      name: '西游科技有限公司',
-      administrators: '孙悟空',
-      phone: '13255666666',
-      address: '上海市青浦区徐泾镇徐乐路208号',
-    })
-    const form2 = reactive({
-      account: 'admin',
-      oldPass: '',
-      pass: '',
-      passAggin: '',
-    })
+    const tenantName=ref('')
+    const phoneNumber=ref('')
+    const nickName=ref('')
+    const address=ref('')
+    const tenantTerm=ref('')
+    const systemName=ref('')
+    const userId=ref('')
+         
+    const form=ref([])
+    const formInfo=ref(null)
+
+    
+    const form2=ref([])
+    const formInfo2=ref(null)
+
+    
+
 
     const validatePass = (rule, value, callback) => {
       if (value === '') {
         callback(new Error('请输入密码'))
-      } else if(!/^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,20}$/.test(value)){
-         callback(new Error('请输入6-18位特殊字符、字母、数字组合的密码'))
-
-      }else {
+      } else if (
+        !/^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,20}$/.test(value)
+      ) {
+        callback(new Error('请输入6-18位特殊字符、字母、数字组合的密码'))
+      } else {
         if (this.ruleForm.confirmPwd !== '') {
           this.$refs.ruleForm.validateField('confirmPwd')
         }
@@ -140,43 +150,83 @@ export default defineComponent({
       }
     }
     const validatePass2 = (rule, value, callback) => {
-
       if (value === '') {
         callback(new Error('请再次输入密码'))
-        
-      } else if (value !== form2.pass) {
-       
+      } else if (value !== form2.value.pass) {
         callback(new Error('两次输入密码不一致!'))
       } else {
         callback()
       }
     }
 
-    //根据不同的域名,显示不同的title和背景图
+    //信息回显
     function getUserData() {
-      api
-        .getUserData({
-         
-        })
-        .then((requset) => {
-          if (requset.status === 'SUCCESS') {
-             console.log('request')
-             tenantName.value=requset.data[0].tenantName
-             phonenumber.value=requset.data[0].phonenumber
-             nickName.value=requset.data[0].nickName
-             address.value=requset.data[0].address 
-               tenantTerm.value=requset.data[0].tenantTerm 
+      api.getUserData({}).then((requset) => {
+        if (requset.status === 'SUCCESS') {
+          console.log('request')
+          console.log(requset)
 
-    
-            // console.log(request)
-            // this.backdropUrl = requset.data[0].loginBackUrl
-            // this.companyName = requset.data[0].loginTitle
-          } else {
-            alert(requset.msg)
-          }
-        })
+          tenantName.value = requset.data[0].tenantName
+          phoneNumber.value  = requset.data[0].phoneNumber
+          nickName.value  = requset.data[0].nickName
+          address.value  = requset.data[0].address
+          tenantTerm.value  = requset.data[0].tenantTerm
+          systemName.value  = requset.data[0].systemName
+          userId.value=requset.data[0].userId
+
+          form.value.tenantName = requset.data[0].tenantName
+          form.value.phoneNumber = requset.data[0].phoneNumber
+          form.value.nickName = requset.data[0].nickName
+          form.value.address = requset.data[0].address
+          form.value.tenantTerm = requset.data[0].tenantTerm
+          form.value.systemName = requset.data[0].systemName
+
+
+          form2.value.userName = requset.data[0].userName
+          form2.value.password = requset.data[0].password
+       
+        } else {
+          alert(requset.msg)
+        }
+      })
+    }
+    // 保存-修改操作
+    const submitForm = () => {
+      formInfo.value.validate((valid) => {
+        if (valid) {
+          // form.value.groupingId = props.groupingId
+          // console.log(form.value)
+
+          api
+            .setUserData({
+              userId: userId.value,
+            })
+            .then((requset) => {
+              if (requset.status === 'SUCCESS') {
+                ElMessage.success({
+                  message: '修改成功',
+                  type: 'success',
+                })
+
+                // context.emit('func')
+              } else {
+                ElMessage.error(requset.msg)
+              }
+            })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+    //重置
+    function resetForm() {
+      form.value.nickName='';
+      form.value.phoneNumber=''
+      form.value.address=''
     }
 
+
     onMounted(() => {
       getUserData()
     })
@@ -184,27 +234,44 @@ export default defineComponent({
     return {
       store,
       getUserData,
+      resetForm,
+      submitForm,
       tenantName,
-      phonenumber,
+      phoneNumber,
       nickName,
       address,
       tenantTerm,
+      systemName,
+      userId,
       activeName,
       form,
-      form2,
+      formInfo,
       rules: {
-        name: [{ required: true, message: '请输入分组名称', trigger: 'blur' }],
-        administrators: [
+        tenantName: [
+          { required: true, message: '请输入分组名称', trigger: 'blur' },
+        ],
+        nickName: [
           { required: true, message: '请输入管理员', trigger: 'blur' },
         ],
-        phone: [
-          { required: true, message: '请输入管理员手机号', trigger: 'blur' },
+        phoneNumber: [
+          {
+            required: true,
+            message: '请输入管理员手机号',
+            trigger: 'blur',
+          },
+          {
+            validator: validatorPhone,
+            message: '输入的电话号码不正确',
+            trigger: 'blur',
+          },
         ],
         address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
       },
+      form2,
+      formInfo2,
       rules2: {
-        account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
-        oldPass: [
+        userName: [{ required: true, message: '请输入账号', trigger: 'blur' }],
+        password: [
           { required: true, message: '请输入原密码', trigger: 'blur' },
           { validator: validatePass, trigger: 'blur' },
         ],