吉安感知网项目-前端
shuishen
2026-01-14 098ea60f200cbaa3f5369900e1946ae461b427b6
feat:设备出入库新增、查看、编辑等弹窗风格样式调整
3 files modified
400 ■■■■ changed files
applications/drone-command/src/styles/common/cockpit.scss 168 ●●●●● patch | view | raw | blame | history
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue 167 ●●●● patch | view | raw | blame | history
applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue 65 ●●●●● patch | view | raw | blame | history
applications/drone-command/src/styles/common/cockpit.scss
@@ -457,7 +457,11 @@
    }
}
.ztzf-dialog-history-search {
.el-form.ztzf-dialog-history-search {
    .el-form-item {
        margin-left: 20px;
    }
    .el-form-item__label {
        font-family: Source Han Sans CN, Source Han Sans CN;
        font-weight: 500;
@@ -528,6 +532,20 @@
                font-size: 16px;
                color: #fff;
            }
        }
    }
    .el-input {
        width: 160px;
    }
    .el-date-editor {
        width: 226px;
    }
    .el-select {
        .el-select__wrapper {
            width: 160px;
        }
    }
}
@@ -625,6 +643,9 @@
    .el-form-item {
        margin-left: 30px;
        margin-bottom: 0;
        padding: 0;
        display: flex;
        align-items: center;
        &:first-child {
            margin-left: 0;
@@ -633,6 +654,7 @@
    .el-form-item__label {
        margin-right: 12px;
        padding: 0 !important;
        height: 40px;
        line-height: 40px;
    }
@@ -657,6 +679,16 @@
    .el-button {
        width: 96px;
        height: 40px;
    }
    .history-search-actions {
        .el-button {
            margin-left: 20px;
            &:first-child {
                margin-left: 0;
            }
        }
    }
}
@@ -827,4 +859,138 @@
            box-shadow: none;
        }
    }
}
.ztzf-page-view-dialog {
    display: flex;
    flex-direction: column;
    width: 770px;
    background: #1A1A2A;
    border-radius: 6px 6px 6px 6px;
    border: 1px solid #2E2E46;
    .el-dialog__header {
        span {
            font-family: Source Han Sans CN, Source Han Sans CN;
            font-weight: bold;
            font-size: 18px;
            color: #FFFFFF;
            line-height: 22px;
            text-align: left;
            font-style: normal;
            text-transform: none;
        }
        .el-icon {
            color: #FFFFFF;
        }
    }
    .el-dialog__body {
        height: 0;
        flex: 1;
        .detail-container {
            padding: 0 10px;
            .detail-title {
                margin-bottom: 30px;
                font-family: Source Han Sans CN, Source Han Sans CN;
                font-weight: 500;
                font-size: 18px;
                color: #FFFFFF;
                text-align: left;
                font-style: normal;
                text-transform: none;
            }
            .el-row {
                .el-col {
                    margin-bottom: 20px;
                    display: flex;
                    align-items: center;
                    .label {
                        width: 88px;
                        font-family: Source Han Sans CN, Source Han Sans CN;
                        font-weight: 500;
                        font-size: 14px;
                        color: #D4D5D7;
                        line-height: 22px;
                        text-align: right;
                        font-style: normal;
                        text-transform: none;
                    }
                    .val {
                        margin-left: 12px;
                        font-family: Source Han Sans CN, Source Han Sans CN;
                        font-weight: 400;
                        font-size: 14px;
                        color: #9E9EBA;
                        line-height: 22px;
                        text-align: left;
                        font-style: normal;
                        text-transform: none;
                    }
                }
            }
            .ztzf-table-container {
                height: 360px;
                .ztzf-table-pagination {
                    justify-content: center;
                }
            }
        }
        .dialog-form {
            .el-form-item {
                display: flex;
                align-items: center;
                .el-form-item__label {
                    display: flex;
                    align-items: center;
                    font-family: Source Han Sans CN, Source Han Sans CN;
                    font-weight: 500;
                    font-size: 14px;
                    color: #D4D5D7;
                    line-height: 22px;
                    text-align: right;
                    font-style: normal;
                    text-transform: none;
                }
                .el-form-item__content {
                    display: flex;
                    align-items: center;
                }
                .el-input {
                    .el-input__wrapper {
                        background: #2E2E48;
                    }
                }
            }
        }
    }
    .el-dialog__footer {
        display: flex;
        justify-content: center;
        .el-button {
            margin-left: 16px;
            width: 96px;
            height: 36px;
            &:first-child {
                margin-left: 0;
            }
        }
    }
}
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -1,152 +1,161 @@
<template>
    <el-dialog v-model="visible" :title="dialogTitle" @closed="handleClosed" destroy-on-close>
        <div v-if="dialogReadonly">
            <h3>设备详情</h3>
    <el-dialog class="ztzf-page-view-dialog" v-model="visible" :title="dialogTitle" @closed="handleClosed"
        destroy-on-close>
        <div class="detail-container" v-if="dialogReadonly">
            <div class="detail-title">设备详情</div>
            <el-row>
                <el-col :span="12">
                    <div>设备信息: {{ formData.deviceName }}</div>
                    <div class="label">设备信息</div>
                    <div class="val">{{ formData.deviceName }}</div>
                </el-col>
                <el-col :span="12">
                    <div>设备类型: {{ formData.deviceType }}</div>
                    <div class="label">设备类型</div>
                    <div class="val">{{ formData.deviceType }}</div>
                </el-col>
                <el-col :span="12">
                    <div>设备属性: {{ formData.deviceAtt }}</div>
                    <div class="label">设备属性</div>
                    <div class="val">{{ formData.deviceAtt }}</div>
                </el-col>
                <el-col :span="12">
                    <div>型号: {{ formData.deviceModel }}</div>
                    <div class="label">型号</div>
                    <div class="val">{{ formData.deviceModel }}</div>
                </el-col>
                <el-col :span="12">
                    <div>规格: {{ formData.deviceSpecification }}</div>
                    <div class="label">规格</div>
                    <div class="val">{{ formData.deviceSpecification }}</div>
                </el-col>
                <el-col :span="12">
                    <div>生产厂商: {{ formData.manufacturer }}</div>
                    <div class="label">生产厂商</div>
                    <div class="val">{{ formData.manufacturer }}</div>
                </el-col>
                <el-col :span="12">
                    <div>来源: {{ formData.source }}</div>
                    <div class="label">来源</div>
                    <div class="val">{{ formData.source }}</div>
                </el-col>
                <el-col :span="12">
                    <div>用途: {{ formData.purpose }}</div>
                    <div class="label">用途</div>
                    <div class="val">{{ formData.purpose }}</div>
                </el-col>
                <el-col :span="12">
                    <div>所属部门: {{ formData.belongDeptName }}</div>
                    <div class="label">所属部门</div>
                    <div class="val">{{ formData.belongDeptName }}</div>
                </el-col>
                <el-col :span="12">
                    <div>负责人: {{ formData.charger }}</div>
                    <div class="label">负责人</div>
                    <div class="val">{{ formData.charger }}</div>
                </el-col>
                <el-col :span="12">
                    <div>联系电话: {{ formData.contactPhone }}</div>
                    <div class="label">联系电话</div>
                    <div class="val">{{ formData.contactPhone }}</div>
                </el-col>
            </el-row>
            <h3>出库去向详情</h3>
            <el-table v-loading="loading" :data="list">
                <el-table-column type="index" width="60" label="序号" />
                <el-table-column prop="charger" label="用户" />
                <el-table-column prop="contactPhone" label="电话" />
                <el-table-column prop="outTarget" label="出库去向" />
                <el-table-column prop="outTime" label="出库时间" />
                <el-table-column prop="purpose" label="用途" />
            </el-table>
            <el-pagination
                v-model:current-page="searchParams.current"
                v-model:page-size="searchParams.size"
                :total="total"
                @change="getList"
            />
            <div class="detail-title">出库去向详情</div>
            <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
                <div class="ztzf-table-content">
                    <el-table class="ztzf-data-cockpit-table" :data="list">
                        <el-table-column type="index" width="60" label="序号" />
                        <el-table-column prop="charger" label="用户" />
                        <el-table-column prop="contactPhone" label="电话" />
                        <el-table-column prop="outTarget" label="出库去向" />
                        <el-table-column prop="outTime" label="出库时间" />
                        <el-table-column prop="purpose" label="用途" />
                    </el-table>
                </div>
                <div class="ztzf-table-pagination">
                    <el-pagination popper-class="ztzf-data-cockpit-select-popper"
                        v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
                        layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
                </div>
            </div>
        </div>
        <el-form v-else ref="formRef" :model="formData" :rules="rules" label-width="100px">
        <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="100px">
            <el-row>
                <el-col :span="12">
                    <el-form-item label="设备名称" prop="deviceName">
                        <el-input v-model="formData.deviceName" maxlength="50" placeholder="请输入" clearable />
                        <el-input class="ztzf-data-cockpit-search-input" v-model="formData.deviceName" maxlength="50"
                            placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="设备类型" prop="deviceType">
                        <el-select v-model="formData.deviceType" placeholder="请选择" clearable>
                            <el-option
                                v-for="item in dictObj.deviceType"
                                :key="item.dictKey"
                                :label="item.dictValue"
                                :value="item.dictKey"
                            />
                        <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
                            v-model="formData.deviceType" placeholder="请选择" clearable>
                            <el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
                                :value="item.dictKey" />
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="设备属性" prop="deviceAtt">
                        <el-select v-model="formData.deviceAtt" placeholder="请选择" clearable>
                            <el-option
                                v-for="item in dictObj.deviceAtt"
                                :key="item.dictKey"
                                :label="item.dictValue"
                                :value="item.dictKey"
                            />
                        <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
                            v-model="formData.deviceAtt" placeholder="请选择" clearable>
                            <el-option v-for="item in dictObj.deviceAtt" :key="item.dictKey" :label="item.dictValue"
                                :value="item.dictKey" />
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="型号" prop="deviceModel">
                        <el-input v-model="formData.deviceModel" maxlength="50" placeholder="请输入" clearable />
                        <el-input class="ztzf-data-cockpit-search-input" v-model="formData.deviceModel" maxlength="50"
                            placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="规格" prop="deviceSpecification">
                        <el-input v-model="formData.deviceSpecification" maxlength="50" placeholder="请输入" clearable />
                        <el-input class="ztzf-data-cockpit-search-input" v-model="formData.deviceSpecification"
                            maxlength="50" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="生产厂商" prop="manufacturer">
                        <el-input v-model="formData.manufacturer" maxlength="50" placeholder="请输入" clearable />
                        <el-input class="ztzf-data-cockpit-search-input" v-model="formData.manufacturer" maxlength="50"
                            placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="来源" prop="source">
                        <el-input v-model="formData.source" maxlength="50" placeholder="请输入" clearable />
                        <el-input class="ztzf-data-cockpit-search-input" v-model="formData.source" maxlength="50"
                            placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="用途" prop="purpose">
                        <el-input v-model="formData.purpose" maxlength="50" placeholder="请输入" clearable />
                        <el-input class="ztzf-data-cockpit-search-input" v-model="formData.purpose" maxlength="50"
                            placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="所属部门" prop="belongDept">
                        <el-tree-select
                            v-model="formData.belongDept"
                            node-key="id"
                            :data="deptTree"
                            :props="treeProps"
                            check-strictly
                            @change="belongDeptChange"
                            clearable
                        />
                        <el-tree-select class="ztzf-data-cockpit-select"
                            popper-class="ztzf-data-cockpit-tree-select-popper" v-model="formData.belongDept"
                            node-key="id" :data="deptTree" :props="treeProps" check-strictly @change="belongDeptChange"
                            clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="负责人" prop="charger">
                        <el-select v-model="formData.charger" placeholder="请选择" :disabled="!formData.belongDept" clearable>
                        <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
                            v-model="formData.charger" placeholder="请选择" :disabled="!formData.belongDept" clearable>
                            <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="联系电话" prop="contactPhone">
                        <el-input v-model="formData.contactPhone" maxlength="50" placeholder="请输入" clearable />
                        <el-input class="ztzf-data-cockpit-search-input" v-model="formData.contactPhone" maxlength="50"
                            placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
            </el-row>
        </el-form>
        <template #footer>
            <el-button @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
            <el-button
                v-if="!dialogReadonly"
                type="primary"
                :loading="submitting"
                :disabled="submitting"
                @click="handleSubmit"
            >
                确定
            <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
            <el-button color="#284FE3" v-if="!dialogReadonly" type="primary" :loading="submitting"
                :disabled="submitting" @click="handleSubmit">
                保存
            </el-button>
        </template>
    </el-dialog>
@@ -155,7 +164,7 @@
<script setup>
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDeviceDetailApi,  fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'
import { fwDeviceDetailApi, fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'
import { getUserListApi } from '@/api/system/user'
import { fieldRules, getDictLabel } from '@ztzf/utils'
import { fwDeviceTrackPageApi } from '@/views/basicManage/deviceStock/fwDeviceTrackApi'
@@ -219,11 +228,11 @@
const userList = ref([])
function belongDeptChange() {
function belongDeptChange () {
    formData.value.charger = ''
}
function getUserList() {
function getUserList () {
    getUserListApi(formData.value.belongDept).then(res => {
        userList.value = res.data.data.records
    })
@@ -232,12 +241,12 @@
watch(() => formData.value.belongDept, getUserList)
// 关闭弹框
function handleCancel() {
function handleCancel () {
    visible.value = false
}
// 提交新增/编辑
async function handleSubmit() {
async function handleSubmit () {
    const isValid = await formRef.value?.validate().catch(() => false)
    if (!isValid) return
    submitting.value = true
@@ -252,20 +261,20 @@
}
// 加载详情
async function loadDetail() {
async function loadDetail () {
    if (!formData.value.id) return
    const res = await fwDeviceDetailApi({ id: formData.value.id })
    formData.value = res?.data?.data ?? {}
}
// 关闭后重置
function handleClosed() {
function handleClosed () {
    formData.value = initForm()
}
const total = ref(0) // 总条数
const loading = ref(false) // 列表加载中
const list = ref([]) // 列表数据
async function getList() {
async function getList () {
    loading.value = true
    try {
        const params = { ...searchParams.value, deviceId: formData.value.id }
@@ -278,7 +287,7 @@
}
// 打开弹框
async function open({ mode, row } = {}) {
async function open ({ mode, row } = {}) {
    dialogMode.value = mode || 'add'
    visible.value = true
    if (dialogMode.value === 'add') {
applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
@@ -2,43 +2,36 @@
    <el-dialog class="ztzf-data-cockpit-dialog" append-to-body v-model="visibleModel" :title="dialogTitle"
        :close-on-click-modal="false" :destroy-on-close="true">
        <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-dialog-history-search">
            <el-row :gutter="12">
                <el-col :span="4">
                    <el-form-item label="关键字" prop="keyword">
                        <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.keyword"
                            placeholder="名称/序列号" clearable @clear="handleSearch" />
                    </el-form-item>
                </el-col>
                <el-col :span="5">
                    <el-form-item prop="dateRange">
                        <el-date-picker class="ztzf-data-cockpit-date-picker"
                            popper-class="ztzf-data-cockpit-date-picker-popper" v-model="searchParams.dateRange"
                            type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
                            value-format="YYYY/MM/DD" @change="handleSearch" />
                    </el-form-item>
                </el-col>
                <el-col :span="4">
                    <el-form-item label="区域" prop="area">
                        <el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-tree-cockpit-select-popper"
                            v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value"
                            check-strictly clearable placeholder="请选择" @change="handleSearch" />
                    </el-form-item>
                </el-col>
                <el-col :span="5">
                    <el-form-item label="无人机类型" prop="droneType">
                        <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
                            v-model="searchParams.droneType" placeholder="请选择" clearable @change="handleSearch">
                            <el-option v-for="item in droneTypeOptions" :key="item.value" :label="item.label"
                                :value="item.value" />
                        </el-select>
                    </el-form-item>
                </el-col>
            <el-form-item label="关键字" prop="keyword">
                <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.keyword" placeholder="名称/序列号"
                    clearable @clear="handleSearch" />
            </el-form-item>
                <el-form-item class="history-search-actions">
                    <el-button :icon="RefreshRight" @click="resetForm"></el-button>
                    <el-button :icon="Search" @click="handleSearch"></el-button>
                </el-form-item>
            </el-row>
            <el-form-item prop="dateRange">
                <el-date-picker class="ztzf-data-cockpit-date-picker"
                    popper-class="ztzf-data-cockpit-tree-select-popper" v-model="searchParams.dateRange"
                    type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
                    value-format="YYYY/MM/DD" @change="handleSearch" />
            </el-form-item>
            <el-form-item label="区域" prop="area">
                <el-tree-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-tree-select-popper"
                    v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value" check-strictly
                    clearable placeholder="请选择" @change="handleSearch" />
            </el-form-item>
            <el-form-item label="无人机类型" prop="droneType">
                <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
                    v-model="searchParams.droneType" placeholder="请选择" clearable @change="handleSearch">
                    <el-option v-for="item in droneTypeOptions" :key="item.value" :label="item.label"
                        :value="item.value" />
                </el-select>
            </el-form-item>
            <el-form-item class="history-search-actions">
                <el-button :icon="RefreshRight" @click="resetForm"></el-button>
                <el-button :icon="Search" @click="handleSearch"></el-button>
            </el-form-item>
        </el-form>
        <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">