优化

2024-12-26 13:57:12 +08:00 · 2024-12-26 13:57:12 +08:00 · b3755db6a7
parent d86c8b4b33
commit b3755db6a7
10 changed files with 144 additions and 74 deletions
--- a/src/components/Navmenu/index.vue
+++ b/src/components/Navmenu/index.vue
@ -10,7 +10,7 @@ const route = useRoute()
 //     // { name: '装备管理', routerName: '/home' },
 //     { name: '订单管理', routerName: '/home' },
 //     // { name: '基础管理', routerName: '/home' },
-//     { name: '消息通知', routerName: 'enterpriseZone' },
+//     { name: '通知', routerName: 'enterpriseZone' },
 //     // { name: '综合查询', routerName: 'enterpriseZone' },
 // ]

@ -25,7 +25,7 @@ const navMenuList = computed(() => {
            { name: '装备管理', routerName: 'goodsManagement' },
            { name: '订单管理', routerName: 'orderManagementCz' },
            { name: '接单管理', routerName: 'accept-orders' },
-            { name: '消息通知', routerName: 'enterpriseZone' },
+            { name: '通知', routerName: 'enterpriseZone' },
        ]
    if (isType == 2)
        return [
@ -34,7 +34,7 @@ const navMenuList = computed(() => {
            { name: '租赁需求大厅', routerName: 'parity' },
            { name: '订单管理', routerName: 'orderManagement' },
            { name: '需求管理', routerName: 'sourcingNeed' },
-            { name: '消息通知', routerName: 'enterpriseZone' },
+            { name: '通知', routerName: 'enterpriseZone' },
        ]
 })

--- a/src/components/equipCardHall/index.vue
+++ b/src/components/equipCardHall/index.vue
@ -4,6 +4,7 @@
        <ul class="item-details">
            <li style="margin: 10px 0">
                <span class="item_1_span"> {{ name }} </span>
+                <span>（{{ typeName }}）</span>
                <!-- <span class="item_2_span"> 待租 </span> -->
            </li>
            <li style="color: #b6b6b6; font-size: 14px">{{ company }}</li>
@ -57,6 +58,10 @@ const props: any = defineProps({
        type: String,
        default: '',
    },
+    typeName: {
+        type: String,
+        default: '',
+    },
 })

 const emit = defineEmits(['onClick'])
--- a/src/http/api/personalCenter/index.ts
+++ b/src/http/api/personalCenter/index.ts
@ -10,3 +10,12 @@ export const editMessageApi = (data: any = {}) => {
    return post('/material-mall/reply/edit', data)
 }

+// 修改密码
+export const resetPwd = (data: any = {}) => {
+    return post('/system/user/resetPwd', data)
+}
+
+// 修改电话
+export const editPhone = (data: any = {}) => {
+    return post('/material-mall/userManage/editUser', data)
+}
--- a/src/store/user.ts
+++ b/src/store/user.ts
@ -134,7 +134,7 @@ export const useStore = defineStore('myUser', {
                { name: '租赁需求大厅', routerName: 'parity' },
                { name: '装备管理', routerName: '/home' },
                { name: '订单管理', routerName: '/home' },
-                { name: '消息通知', routerName: 'enterpriseZone' },
+                { name: '通知', routerName: 'enterpriseZone' },
            ]
            if (type == 1) {
                this.leaseAndLesseeList = baseList
--- a/src/views/cart/components/date-picker-button.vue
+++ b/src/views/cart/components/date-picker-button.vue
@ -10,6 +10,7 @@
            v-model="selectedDate"
            style="margin-top: -100px"
            :placeholder="placeholder"
+            range-separator="To"
            @change="handleDateChange"
            :value-format="valueFormat"
            :disabled-date="disabledDate"
@ -42,7 +43,7 @@ const props = defineProps({
    },
    pickerType: {
        type: String,
-        default: 'daterange',
+        default: 'datetimerange',
    },
    placeholder: {
        type: String,
@ -50,11 +51,11 @@ const props = defineProps({
    },
    format: {
        type: String,
-        default: 'YYYY-MM-DD',
+        default: 'YYYY-MM-DD HH:mm:ss',
    },
    valueFormat: {
        type: String,
-        default: 'YYYY-MM-DD',
+        default: 'YYYY-MM-DD HH:mm:ss',
    },
    companyIndex: {
        type: Number,
--- a/src/views/cart/index.vue
+++ b/src/views/cart/index.vue
@ -90,7 +90,7 @@
                        <div class="lease-date">
                            <div style="margin-bottom: 8px">
                                {{ goods.rentBeginTime }}
-                                <span v-if="goods.rentBeginTime && goods.rentEndTime">-</span>
+                                <span v-if="goods.rentBeginTime && goods.rentEndTime">~</span>
                                {{ goods.rentEndTime }}
                            </div>

@ -563,8 +563,8 @@ const onCartSubmit = async () => {
                itemsArray.push({
                    maId: e.maId,
                    id: e.id,
-                    rentBeginTime: e.rentBeginTime + ' ' + '00:00:00',
-                    rentEndTime: e.rentEndTime + ' ' + '23:59:59',
+                    rentBeginTime: e.rentBeginTime,
+                    rentEndTime: e.rentEndTime,
                    manageType: e.manageType,
                    days: e.days,
                    num: e.num,
--- a/src/views/enterpriseZone/index.vue
+++ b/src/views/enterpriseZone/index.vue
@ -1,5 +1,6 @@
 <script setup lang="ts">
 import NavMenu from 'components/Navmenu/index.vue'
+import { ElMessageBox } from 'element-plus'
 import {
    getListApi, //列表
 } from 'http/api/info'
@ -7,19 +8,30 @@ const leaseList = ref([
    {
        noticeContent: '',
        createTime: '',
+    },
+])

-    }])
-
-    const getList = async () => {
-        leaseList.value = []
+const getList = async () => {
+    leaseList.value = []
    const { data: res }: any = await getListApi()
    leaseList.value = res.rows
-    }
+    console.log('🚀 ~ getList ~ leaseList.value:', leaseList.value)
+}

-
-    onMounted(() => {
-    getList()
+const handleRowClick = (row: any) => {
+    console.log('🚀 ~ handleRowClick ~ row', row)
+    // 弹框显示消息内容
+    ElMessageBox.alert(row.noticeContent, '消息内容', {
+        showConfirmButton: false,
+        showCancelButton: true,
+        cancelButtonText: '关闭',
+        dangerouslyUseHTMLString: true,
    })
+}
+
+onMounted(() => {
+    getList()
+})
 </script>

 <template>
@ -28,16 +40,19 @@ const leaseList = ref([

    <div class="container">
        <el-table
-        :data="leaseList"
-        style="width: 100%"
-        :header-cell-style="{ background: '#00a288', color: '#fff' }"
-    >
-        <el-table-column align="center" type="index" label="序号" width="80" />
-        <el-table-column align="center" prop="createTime" label="消息发布时间" />
-        <el-table-column align="center" prop="noticeContent" label="消息内容" />
-
-    </el-table>
-
+            :data="leaseList"
+            style="width: 100%"
+            :header-cell-style="{ background: '#00a288', color: '#fff' }"
+            @row-click="handleRowClick"
+        >
+            <el-table-column align="center" type="index" label="序号" width="80" />
+            <el-table-column align="center" prop="createTime" label="消息发布时间" />
+            <el-table-column align="center" prop="noticeContent" label="消息标题">
+                <template #default="{ row }">
+                    <div v-html="row.noticeTitle"></div>
+                </template>
+            </el-table-column>
+        </el-table>
    </div>
 </template>

--- a/src/views/equip/list.vue
+++ b/src/views/equip/list.vue
@ -136,6 +136,7 @@
                :price="v.dayLeasePrice"
                :company="v.companyName"
                :personPhone="v.personPhone"
+                :typeName="v.typeName"
                @click="onHandleDetails(v.maId)"
            />
            <!-- <equip-card
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@ -1207,11 +1207,11 @@ const viewCertificate = (url:string) => {
  window.open(url, '_blank');
 };
 const changeDate = (row:any,index:number) => {
-    console.log('3333',row)
+    console.log('3333', row);
    const currentDate = new Date(row.checkDate);
-    console.log('1111',currentDate)
-    console.log('2222',warningDays.value)
-    currentDate.setDate(currentDate.getDate() + warningDays.value);
+    console.log('1111', currentDate);
+    console.log('🚀 ~ 告警时间 ~ warningDays.value:', warningDays.value)
+    currentDate.setDate(currentDate.getDate() + Number(warningDays.value));
    equipTableList.value[index].nextCheckDate = dayjs(currentDate).format('YYYY-MM-DD');
    // equipTableList.value = [...equipTableList.value];
 }
--- a/src/views/user/personalCenter/index.vue
+++ b/src/views/user/personalCenter/index.vue
@ -1,33 +1,38 @@
 <template>
    <el-card class="box-card">
-        <div slot="header" class="clearfix" style="margin-bottom: 20px;">
-          <span>个人信息</span>
+        <div slot="header" class="clearfix" style="margin-bottom: 20px">
+            <span>个人信息</span>
        </div>
        <el-form :model="form" label-width="120px">
-          <el-form-item label="姓名" >
-            <el-input v-model="form.nickName" style="width:30%" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="登录账号">
-            <el-input v-model="form.userName" style="width:30%" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="密码">
-            <el-input v-model="form.password" show-password style="width:30%"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话">
-            <el-input v-model="form.phonenumber" style="width:30%"></el-input>
-          </el-form-item>
-          <el-form-item label="关联公司" prop="deptId">
-
+            <el-form-item label="姓名">
+                <el-input v-model="form.nickName" style="width: 30%" disabled></el-input>
            </el-form-item>
-          <el-form-item>
-            <div  style="margin-left: 25%;">
-            <el-button type="primary" @click="submitForm" >修改</el-button>
-            </div>
-          </el-form-item>
+            <el-form-item label="登录账号">
+                <el-input v-model="form.userName" style="width: 30%" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="密码">
+                <el-input
+                    v-model="form.password"
+                    show-password
+                    style="width: 30%; margin-right: 15px"
+                ></el-input>
+                <el-button type="text" icon="EditPen" @click="resetPassword">修改密码</el-button>
+            </el-form-item>
+            <el-form-item label="联系电话">
+                <el-input
+                    v-model="form.phoneNumber"
+                    style="width: 30%; margin-right: 15px"
+                ></el-input>
+                <el-button type="text" icon="EditPen" @click="resetPhone">重新绑定</el-button>
+            </el-form-item>
+            <!-- <el-form-item label="关联公司" prop="deptId"> </el-form-item> -->
+            <!-- <el-form-item>
+                <div style="margin-left: 25%">
+                    <el-button type="primary" @click="submitForm">修改</el-button>
+                </div>
+            </el-form-item> -->
        </el-form>
-      </el-card>
-
-
+    </el-card>
 </template>

 <script setup lang="ts">
@ -53,45 +58,79 @@ const deptOptions = ref<any>([])
 import {
    getUserInfo, //用户信息
    editMessageApi, //修改
-
+    resetPwd, // 重置密码
+    editPhone, // 修改手机号
 } from 'http/api/personalCenter'
 import { InfoFilled, UploadFilled } from '@element-plus/icons-vue'
+import { pa } from 'element-plus/es/locale'

-
-const form:any = ref({
-  name: '',
-  nickName: '',
-  userName: '',
-  password: '6',
-  phonenumber: '',
-  deptId: '',
-});
+const form: any = ref({
+    userId: '',
+    name: '',
+    nickName: '',
+    userName: '',
+    password: '',
+    phoneNumber: '',
+    deptId: '',
+})

 const editField = (field: string) => {
    // 这里可以添加编辑字段的逻辑，例如弹出编辑框
-    console.log(`编辑字段: ${field}`);
-};
+    console.log(`编辑字段: ${field}`)
+}

 const submitForm = () => {
    // 这里可以添加保存表单的逻辑
-    console.log('提交表单:', form.value);
-};
+    console.log('提交表单:', form.value)
+}

 const getUserListData = async () => {
    let res = await getUserInfo()
    form.value = res.data
 }

+const resetPassword = async () => {
+    ElMessageBox.confirm('确定要重置密码吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(async () => {
+        const params = {
+            password: form.value.password,
+            userId: form.value.userId,
+        }
+        let res: any = await resetPwd(params)
+        if (res.code === 200) {
+            ElMessage.success('重置成功')
+        }
+    })
+}
+
+const resetPhone = async () => {
+    ElMessageBox.confirm('确定要修改手机号吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(async () => {
+        const params = {
+            userId: form.value.userId,
+            phoneNumber: form.value.phoneNumber,
+        }
+        let res: any = await editPhone(params)
+        if (res.code === 200) {
+            ElMessage.success('修改成功')
+        }
+    })
+}
+
 onMounted(() => {
    getUserListData()
-
 })
 </script>

 <style lang="scss" scoped>
 .box-card {
-  width: 100%;
-  height: 100%;
+    width: 100%;
+    height: 100%;
 }
-
 </style>