Merge pull request 'master' (#9) from master into test

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/9

src/api/auth/auth.js

@@ -7,3 +7,10 @@ export const modifyUser=(data)=>{
         data
     })
 }
+export const editPassword=(data)=>{
+    return request({
+        url:'/admin/mosr/user/update/password',
+        method:'post',
+        data
+    })
+}

src/layout/navbar/index.vue

@@ -4,10 +4,13 @@
     <Breadcrumb></Breadcrumb>
     <div class="right-bar">
       <div class="user-box">
-       <div>
+        <div @click.stop="handleVisitedP" style="cursor: pointer">
-<!--         <img :src="userInfo.avatar" alt="" @click.stop="handleVisitedP">-->
+          <div>{{ userInfo.userName }}
-         <span>{{userInfo.userName}}</span>
+            <el-icon style="margin-left: 5px">
-       </div>
+              <ArrowDownBold/>
+            </el-icon>
+          </div>
+        </div>
         <div class="person" v-if="visitedP">
           <ul>
             <li @click="handleToAuth">个人中心</li>

src/views/auth/index.vue

@@ -6,37 +6,91 @@
           <!-- 标题 -->
           <template #header>
             <div class="card-header">
-              <span>个人信息</span>
+              <div>个人信息</div>
             </div>
           </template>
           <div class="userDetail">
-            <!-- 头像上传 -->
+            <div class="userInfo_item">
-            <div class="userImg">
+              <div style="display: flex;align-items: center">
-              <el-image class="avatar" :src="userParams.avatar" fit="fill"/>
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                用户名:
+              </div>
+              <div>{{ userParams.userName }}</div>
             </div>
             <div class="userInfo_item">
-              <el-icon>
+              <div style="display: flex;align-items: center">
-                <UserFilled />
+                <el-icon size="18" style="margin-right: 5px">
-              </el-icon>
+                  <User/>
-              用户呢称: <span>{{ userParams.nickName }}</span>
+                </el-icon>
+                用户名称:
+              </div>
+              <div>{{ userParams.nickName }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Notification/>
+                </el-icon>
+                工号:
+              </div>
+              <div>{{ userParams.workCode }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Phone/>
+                </el-icon>
+                电话号码:
+              </div>
+              <div>{{ userParams.mobile }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <House/>
+                </el-icon>
+                所属公司:
+              </div>
+              <div>{{ userParams.subCompanyName }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <FolderOpened/>
+                </el-icon>
+                所属部门:
+              </div>
+              <div>{{ userParams.departmentName }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Folder/>
+                </el-icon>
+                岗位:
+              </div>
+              <div>{{ userParams.jobActivityDesc }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Wallet/>
+                </el-icon>
+                账号类型:
+              </div>
+              <div>{{ userParams.accountType === '0' ? '主账号' : '次账号' }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                所属角色:
+              </div>
+              <div>{{ belongToRole(userParams.roles) }}</div>
             </div>
-            <div class="userInfo_item"><el-icon>
-              <Iphone />
-            </el-icon>电话号码: <span>{{ userParams.phoneNumber }}</span> </div>
-            <div class="userInfo_item"><el-icon>
-              <Message />
-            </el-icon>用户邮箱:<span>{{ userParams.email }}</span> </div>
-            <div class="userInfo_item"><el-icon>
-              <HomeFilled />
-            </el-icon>所属部门: <span>{{ userParams.city }}</span> </div>
-            <div class="userInfo_item"><el-icon>
-              <OfficeBuilding />
-            </el-icon>所属角色: <span>{{ userParams.createBy }}</span> </div>
-            <div class="userInfo_item"><el-icon>
-              <Calendar />
-            </el-icon>创建日期:<span>{{ userParams.loginDate }}</span> </div>
-          </div>
-          <div>
           </div>
         </el-card>
       </el-col>
@@ -45,143 +99,121 @@
           <!-- 标题 -->
           <template #header>
             <div class="card-header">
-              <span>基本资料</span>
+              <div>{{ isInitPassword ? '修改密码' : '初始化密码' }}</div>
             </div>
           </template>
-
+          <el-form label-width="120px" ref="passwordRef" :model="userPassword" :rules="rules">
-          <el-tabs class="demo-tabs" v-model="activeName">
+            <el-form-item label="旧密码" prop="oldPassword" :required="true" style="text-align:left" v-if="isInitPassword">
-            <el-tab-pane label="基本资料" name="first" >
+              <el-input placeholder="请输入旧密码" v-model="userPassword.oldPassword" type="password"/>
-              <el-form
+            </el-form-item>
-                  :model="userParams"
+            <el-form-item label="新密码" prop="newPassword" :required="true" style="text-align:left">
-                  label-width="120px"
+              <el-input placeholder="请输入新密码" v-model="userPassword.newPassword" type="password"/>
-                  class="demo-ruleForm"
+            </el-form-item>
-              >
+            <el-form-item label="确认密码" prop="confirmPassword" :required="true" style="text-align:left">
-                <el-form-item label="用户昵称" prop="userName" :required="true" style="text-align:left">
+              <el-input placeholder="请确认新密码" v-model="userPassword.confirmPassword" type="password"/>
-                  <el-input  v-model="userParams.nickName"/>
+            </el-form-item>
-                </el-form-item>
+            <el-form-item>
-                <el-form-item label="手机号码"  :required="true" style="text-align:left">
+              <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
-                  <el-input v-model="userParams.phoneNumber"/>
+              <el-button @click="close">关闭</el-button>
-                </el-form-item>
+            </el-form-item>
-                <el-form-item label="邮箱" prop="email" :required="true" style="text-align:left">
+          </el-form>
-                  <el-input v-model="userParams.email"/>
-                </el-form-item>
-                <el-form-item label="性别" prop="sex">
-                  <el-radio-group v-model="userParams.sex">
-                    <el-radio label="0">男</el-radio>
-                    <el-radio label="1">女</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" @click="submit">保存</el-button>
-                  <el-button @click="close">关闭</el-button>
-                </el-form-item>
-              </el-form>
-            </el-tab-pane>
-            <el-tab-pane label="修改密码" name="second">
-              <el-form label-width="120px" :model="userPassword">
-                <el-form-item label="旧密码" :required="true" style="text-align:left">
-                  <el-input placeholder="请输入旧密码" v-model="userPassword.oldPassWord"/>
-                </el-form-item>
-                <el-form-item label="新密码" :required="true" style="text-align:left">
-                  <el-input placeholder="请输入新密码" v-model="userPassword.newPassWord"/>
-                </el-form-item>
-                <el-form-item label="确认密码" :required="true" style="text-align:left">
-                  <el-input placeholder="请确认新密码" v-model="userPassword.querenPassWord"/>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" @click="submit2">保存</el-button>
-                  <el-button @click="close">关闭</el-button>
-                </el-form-item>
-              </el-form>
-            </el-tab-pane>
-          </el-tabs>
         </el-card>
       </el-col>
     </el-row>
   </div>
 </template>
 <script setup>
-import {getUserInfo} from '@/api/login';
+import {ElNotification} from 'element-plus'
-import {ref} from "vue";
+import {useTagsView} from '@/stores/tagsview.js'
-import {modifyUser} from '@/api/auth/auth'
+import {editPassword} from "@/api/auth/auth";
-import { ElMessage } from 'element-plus'
+
-import { useTagsView } from '@/stores/tagsview.js'
+const isInitPassword = ref(false);
-var userParams = ref({})
+const userParams = ref({});
-var userPassword=ref({
+const passwordRef = ref();
-  oldPassWord:'',
+const router = useRouter()
-  newPassWord:'',
+const userPassword = ref({
-  querenPassWord:''
+  oldPassword: '',
-})
+  newPassword: '',
-const activeName = ref('first')
+  confirmPassword: ''
+});
 const tagsViewStore = useTagsView()
-const getuserinfo=async ()=>{
+const validatePasswordComplexity = (rule, value, callback) => {
-  await getUserInfo().then(res=>{
+  const reg = /^(?=.*[a-zA-Z])(?=.*\d).{1,9}$/; //密码必须是至少包含字母、数字，1-9位
-    userParams.value=res.data.user
+  if (!reg.test(value)) {
-  })
+    callback(new Error("密码必须是至少包含字母、数字，1-9位"));
-}
+  } else {
+    callback();
+  }
+};
 
-// 修改资料
+
-const submit=async ()=>{
+const validatePasswordEquality = (rule, value, callback) => {
-  await modifyUser({
+  if (userPassword.value.newPassword != value) {
-    userName:userParams.value.userName,
+    callback(new Error("两次输入密码不一致!"));
-    nickName:userParams.value.nickName,
+  } else {
-    phoneNumber:userParams.value.phoneNumber,
+    callback();
-    email:userParams.value.email,
+  }
-    sex:userParams.value.sex,
-    userId:userParams.value.userId
-  }).then(res=>{
-    console.log(res)
-  })
 }
-// 修改密码
+const rules = reactive({
-const submit2=async ()=>{
+  oldPassword: [
-  await getUserInfo().then( res=>{
+    {required: true, message: "旧密码不能为空", trigger: ["change", "blur"]},
-    if(res.data!=''){
+  ],
-      console.log(res.data.user.password)
+  newPassword: [
-      if (userPassword.value.oldPassWord==res.data.user.password && userPassword.value.newPassWord==userPassword.value.querenPassWord){
+    {required: true, message: "新密码不能为空", trigger: ["change", "blur"]},
-        modifyUser({
+    {
-          userName:userParams.value.userName,
+      required: true,
-          nickName:userParams.value.nickName,
+      trigger: ["change", "blur"],
-          password:userPassword.value.newPassWord,
+      validator: validatePasswordComplexity
-          userId:userParams.value.userId
-        }).then(res=>{
-          ElMessage({
-            message: '修改密码成功',
-            type: 'success',
-          })
-        })
-      }else if(userPassword.value.oldPassWord!=res.data.user.password && userPassword.value.newPassWord==userPassword.value.querenPassWord){
-        ElMessage({
-          message: '旧密码错误',
-          type: 'error',
-        })
-      }else if(userPassword.value.oldPassWord==res.data.user.password && userPassword.value.newPassWord!=userPassword.value.querenPassWord){
-        ElMessage({
-          message: '新密码与确认密码不同',
-          type: 'error',
-        })
-      }
-    }else{
-      ElMessage({
-        message: '请求错误',
-        type: 'error',
-      })
     }
+  ],
+  confirmPassword: [
+    {required: true, message: "确认密码不能为空", trigger: ["change", "blur"]},
+    {
+      required: true,
+      trigger: ["change", "blur"],
+      validator: validatePasswordEquality
+    }
+  ],
+})
 
-
+const getInfo = async () => {
+  await getAuthInfo().then(res => {
+    userParams.value = res.data.user
+    isInitPassword.value = res.data.initPassword
   })
 }
+
+const belongToRole = (roles) => {
+  if (!roles) return;
+  return roles.map(item => item.roleName).join('，')
+}
+
+// 修改密码
+const handleSubmit = async () => {
+    editPassword({
+      ...userPassword.value
+    }).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        passwordRef.value.resetFields()
+      }
+    })
+}
 // 关闭
 const close = () => {
-  tagsViewStore.delVisitedViews({
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      path:"/auth",meta:{hidden: false, title: '个人中心', breadcrumb: true}})
+  router.push('/')
 }
-onMounted(()=>{
+// onMounted(() => {
-  getuserinfo()
+//   getInfo()
-})
+// })
 </script>
 <style lang="scss">
-body,div {
+body, div {
   margin: 0;
   padding: 0;
 }
@@ -189,32 +221,39 @@ body,div {
 .my {
   margin: 0 auto;
   margin-top: 20px;
-    .userDetail {
+
-      .userImg {
+  .userDetail {
-        height: 170px;
+    .userImg {
-        text-align: center;
+      height: 170px;
-        border-bottom-style: solid;
+      text-align: center;
-        border-color: #daddd2;
-        border-width: 1px;
-        .avatar {
-          width: 150px;
-          height: 150px;
-          border-radius: 50%;
-        }
-      }
-    }
-    .userInfo_item {
-      height: 40px;
       border-bottom-style: solid;
       border-color: #daddd2;
       border-width: 1px;
-      text-align: left;
-      line-height: 40px;
-    }
 
-    .userInfo_item > span {
+      .avatar {
-      float: right;
+        width: 150px;
+        height: 150px;
+        border-radius: 50%;
+      }
     }
   }
 
-</style>
+  .userInfo_item {
+    display: flex;align-items: center;
+    justify-content: space-between;
+    height: 40px;
+    border-bottom-style: solid;
+    border-color: #daddd2;
+    border-width: 1px;
+    //text-align: left;
+    //line-height: 40px;
+
+  }
+
+  //
+  //.userInfo_item > div {
+  //  float: right;
+  //}
+}
+
+</style>

src/views/task-management/all-work-order/index.vue

@@ -1,10 +1,90 @@
 <template>
-
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" :data="mockData" @headBtnClick="headBtnClick"></fvTable>
 </template>
 
-<script>
+<script setup lang="jsx">
-export default {
+
-  name: "index"
+const router = useRouter()
+const tableIns = ref()
+const mockData=ref([
+  {
+    workOrderNumber:1211,
+  },
+  {
+    workOrderNumber:232,
+  },
+])
+const auths = reactive({
+  report: ['mosr:collect:reported'],
+})
+const searchConfig = reactive([
+  {
+    label: '工单号',
+    prop: 'requirementName',
+    props: {
+      placeholder: '请输入工单号查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  },
+])
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: 80,
+    },
+    {
+      prop: 'workOrderNumber',
+      label: '工单号',
+      align: 'center'
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      fixed: 'right',
+      width: 150,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        btn.push({label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary'})
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        // v-perm={item.prem}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
+        )
+      }
+    }
+  ],
+  api: '',
+  params: {},
+  btns: [
+    // {name: '新增', key: 'add', color: '#DED0B2', auth: auths.report},
+  ]
+})
+const headBtnClick = (key) => {
+  switch (key) {
+    case 'add':
+      handleAdd()
+      break;
+  }
 }
 </script>
 

src/views/task-management/historical-work-order/index.vue

@@ -1,5 +1,5 @@
 <template>
-
+历史工单
 </template>
 
 <script>

src/views/task-management/pending-work-order/index.vue

@@ -1,5 +1,5 @@
 <template>
-
+待处理工单
 </template>
 
 <script>