代码提交

This commit is contained in:
jiang 2025-09-27 11:17:05 +08:00
parent 36ac1a77ef
commit f6bd288b5e
4 changed files with 109 additions and 190 deletions

View File

@ -41,6 +41,19 @@ export const constantRoutes = [
}
]
},
{
path: '',
component: Layout,
redirect: 'index',
children: [
{
path: 'index',
component: () => import('@/views/index'),
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
}
]
},
{
path: '/login',
component: () => import('@/views/login1'),
@ -61,138 +74,6 @@ export const constantRoutes = [
component: () => import('@/views/error/401'),
hidden: true
},
{
path: '',
component: Layout,
redirect: 'index',
children: [
{
path: 'index',
component: () => import('@/views/index'),
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
},
{
path: 'equipment-ledger',
component: () => import('@/views/EquipmentLedger/index.vue'),
name: 'EquipmentLedger',
meta: { title: '设备台账', icon: 'dashboard', affix: true }
},
{
path: 'equipment-roam-record',
component: () => import('@/views/EquipmentRoamRecord/index.vue'),
name: 'EquipmentRoamRecord',
meta: { title: '装备流转记录', icon: 'dashboard', affix: true }
},
{
path: 'equipment-servicing',
component: () => import('@/views/EquipmentServicing/index.vue'),
name: 'EquipmentServicing',
meta: { title: '装备维保记录', icon: 'dashboard', affix: true }
},
{
path: 'equipment-retire',
component: () => import('@/views/EquipmentRetire/index.vue'),
name: 'EquipmentRetire',
meta: { title: '装备退役', icon: 'dashboard', affix: true }
},
{
path: 'equipment-entry-apply',
component: () => import('@/views/EquipmentEntryApply/index.vue'),
name: 'EquipmentEntryApply',
meta: { title: '装备录入申请', icon: 'dashboard', affix: true }
},
{
path: 'equipment-entry-approval',
component: () => import('@/views/EquipmentEntryApproval/index.vue'),
name: 'EquipmentEntryApproval',
meta: { title: '装备录入审批', icon: 'dashboard', affix: true }
},
{
path: 'equipment-shared-hall',
component: () => import('@/views/EquipmentSharedHall/index.vue'),
name: 'EquipmentSharedHall',
meta: { title: '装备工共享大厅', icon: 'dashboard', affix: true }
},
{
path: 'equipment-shared-order',
component: () => import('@/views/EquipmentSharedOrder/order/index.vue'),
name: 'search',
meta: { title: '租赁订单管理', icon: 'dashboard', affix: true }
},
{
path: 'contract-manage',
component: () => import('@/views/contract-manage/index.vue'),
name: 'search',
meta: { title: '合同管理', icon: 'dashboard', affix: true }
},
{
path: 'rent-facility',
component: () => import('@/views/rent-facility/index.vue'),
name: 'search',
meta: { title: '机械化施工装备配置率', icon: 'dashboard', affix: true }
},
{
path: 'sourcingNeed',
component: () => import('@/views/sourcingNeed/index.vue'),
name: 'search',
meta: { title: '需求管理', icon: 'dashboard', affix: true }
},
{
path: 'address-manage',
component: () => import('@/views/address-manage/index.vue'),
name: 'search',
meta: { title: '收货地址管理', icon: 'dashboard', affix: true }
},
{
path: 'equipment-shared-lessor',
component: () => import('@/views/EquipmentSharedLease/order/index.vue'),
name: 'search',
meta: { title: '出租订单管理', icon: 'dashboard', affix: true }
},
{
path: 'equipment-type-config',
component: () => import('@/views/EquipmentTypeConfig/index.vue'),
name: 'EquipmentTypeConfig',
meta: { title: '装备类型配置', icon: 'dashboard', affix: true }
},
{
path: 'interface-config',
component: () => import('@/views/InterfaceConfig/index.vue'),
name: 'InterfaceConfig',
meta: { title: '接口配置', icon: 'dashboard', affix: true }
},
{
path: 'equipment-ledger-out',
component: () => import('@/views/EquipmentLedger/components/euq-out.vue'),
name: 'EquipmentLedgerOut',
meta: { title: '设备台账出库', icon: 'dashboard', affix: true }
},
{
path: 'equipment-ledger-store',
component: () => import('@/views/EquipmentLedger/components/equ-store.vue'),
name: 'EquipmentLedgerStore',
meta: { title: '设备台账入库', icon: 'dashboard', affix: true }
},
{
path: 'equipment-ledger-repair',
component: () => import('@/views/EquipmentLedger/components/equ-repair.vue'),
name: 'EquipmentLedgerRepair',
meta: { title: '设备台账维修', icon: 'dashboard', affix: true }
},
{
path: 'equipment-ledger-retire',
component: () => import('@/views/EquipmentLedger/components/equ-retire.vue'),
name: 'EquipmentLedgerRetire',
meta: { title: '设备台账退役', icon: 'dashboard', affix: true }
}
]
},
{
path: '/qrCode/qrCodePage',
component: () => import('@/views/qrCode/qrCode'),
@ -299,6 +180,63 @@ export const dynamicRoutes = [
}
]
},
{
path: '/equipment-ledger-out',
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
children: [
{
path: 'index',
component: () => import('@/views/EquipmentLedger/components/euq-out.vue'),
name: 'EquipmentLedgerOut',
meta: { title: '设备台账出库',activeMenu: '/equipment/equipment-input' }
}
]
},
{
path: '/equipment-ledger-store',
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
children: [
{
path: 'index',
component: () => import('@/views/EquipmentLedger/components/equ-store.vue'),
name: 'EquipmentLedgerStore',
meta: { title: '设备台账入库', icon: 'dashboard', affix: true }
}
]
},
{
path: '/equipment-ledger-repair',
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
children: [
{
path: 'index',
component: () => import('@/views/EquipmentLedger/components/equ-repair.vue'),
name: 'EquipmentLedgerRepair',
meta: { title: '设备台账维修', icon: 'dashboard', affix: true }
}
]
},
{
path: '/equipment-ledger-retire',
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
children: [
{
path: 'index',
component: () => import('@/views/EquipmentLedger/components/equ-retire.vue'),
name: 'EquipmentLedgerRetire',
meta: { title: '设备台账退役', icon: 'dashboard', affix: true }
}
]
},
{
path: '/face/face-data',
component: Layout,

View File

@ -36,9 +36,9 @@ export default {
// 调试模式 - start
if (DEBUG_MODE) {
// 调试模式,不缩放,居中显示
appRef.style.transform = `translate(-25%, -45%) scale(0.9, 0.9)`
appRef.style.overflow = 'visible'
return
// appRef.style.transform = `translate(-25%, -45%) scale(0.9, 0.9)`
// appRef.style.overflow = 'visible'
return
}
// 调试模式 - end

View File

@ -70,11 +70,11 @@
<el-table-column prop="reject" label="已驳回数量" align="center"/>
<el-table-column label="操作" align="center" min-width="100">
<template slot-scope="{ row }">
<el-button type="success" size="mini" @click="showEquipmentInput(row.id, true)">
<el-button type="text" size="mini" @click="showEquipmentInput(row.id, true)">
<i class="el-icon-view"></i> 查看
</el-button>
<el-button
type="primary"
type="text"
size="mini"
@click="showEquipmentInput(row.id, false)"
v-if="row.status === '3'"
@ -82,7 +82,7 @@
<i class="el-icon-edit"></i> 编辑
</el-button>
<el-button
type="danger"
type="text"
size="mini"
@click="deleteItem(row)"
v-if="row.status === '3'"
@ -103,24 +103,13 @@
/>
</el-form>
</template>
<!-- <EquipmentEntryDialog
:is-visible.sync="isVisible"
:order-id="orderId"
:is-add-visible="isAddVisible"
:is-approval-visible="true"
@submit="getEquipmentApplyList"
/>-->
</div>
</template>
<script>
import { getEquipmentApplyListApi, equipmentDelApiNew } from '@/api/EquipmentEntryApply/index'
import EquipmentEntryDialog from '@/views/EquipmentEntryApply/equipmentInput/index.vue'
export default {
components: {
EquipmentEntryDialog
},
data() {
return {
total: 0,
@ -170,15 +159,6 @@ export default {
this.getEquipmentApplyList()
},
/**
* 显示装备录入/编辑/查看界面
*/
/* showEquipmentInput(orderId, isAddVisible) {
this.orderId = orderId
this.isVisible = true
this.isAddVisible = isAddVisible
}, */
// -
showEquipmentInput(orderId, isAddVisible) {

View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-row :gutter="24" class="main-content" type="justify">
<el-col :span="collapsed ? 1: 5" class="tree-column">
<el-col :span="collapsed ? 1: 5" class="tree-column" style="">
<div class="card-container" v-if="!collapsed">
<div class="card-header" v-if="!collapsed">
<!-- 只有在未折叠状态显示标题 -->
@ -21,7 +21,7 @@
</div>
<div style="position: relative;width:20px;height: calc(100vh - 130px);margin-left: 5px">
<div style="position: relative;width:20px;height: calc(100vh - 130px);margin-left: 5px">
<!-- 右侧折叠/展开按钮 -->
<el-button
icon="el-icon-d-arrow-left"
@ -184,7 +184,21 @@
<!-- 状态统计和操作按钮 - 固定定位 -->
<div class="status-operation-bar sticky-bar">
<div class="operation-buttons">
<el-button type="primary" size="mini" @click="onHandleOut" class="operation-btn">
<el-button icon="el-icon-refresh" style="float: right;margin-left: 20px" type="primary" size="mini" @click="resetQuery">
重置
</el-button>
<el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="getDeviceList"
>
查询
</el-button>
</div>
</div>
<!-- 装备列表表格 -->
<div class="card-container">
<div class="card-header">
<span class="card-title">装备列表
<el-button type="primary" style="margin-left: 20px" size="mini" @click="onHandleOut" class="operation-btn">
<i class="el-icon-ship"></i> 出库
</el-button>
<el-button type="primary" size="mini" @click="onHandleIn" class="operation-btn">
@ -196,33 +210,20 @@
<el-button type="primary" size="mini" @click="onHandleRetire" class="operation-btn">
<i class="el-icon-document-delete"></i> 退役
</el-button>
<el-button type="success" size="mini" @click="onHandleDeviceUp" class="operation-btn">
<el-button type="primary" size="mini" @click="onHandleDeviceUp" class="operation-btn">
<i class="el-icon-arrow-up"></i> 上架
</el-button>
<el-button type="warning" size="mini" @click="onHandleDeviceDown" class="operation-btn">
<el-button type="primary" size="mini" @click="onHandleDeviceDown" class="operation-btn">
<i class="el-icon-arrow-down"></i> 下架
</el-button>
<el-button icon="el-icon-download" style="float: right" size="mini" @click="exportData" class="export-btn">
<el-button icon="el-icon-download" style="float: right" type="primary" size="mini" @click="exportData">
导出数据
</el-button>
<el-button icon="el-icon-refresh" style="float: right" size="mini" @click="resetQuery" class="reset-btn">
重置
</el-button>
<el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="getDeviceList"
class="query-btn"
>
查询
</el-button>
</div>
</div>
</span>
<!-- 装备列表表格 -->
<div class="card-container">
<div class="card-header">
<span class="card-title">装备列表</span>
<span class="table-count"> {{ total }} 条记录</span>
</div>
<el-table
@ -360,13 +361,13 @@
</template>
<el-table-column align="center" fixed="right" min-width="200" label="操作">
<template slot-scope="scope">
<el-button type="text" size="mini" @click="onHandlePreview(scope.row)" class="view-btn">
<el-button type="text" size="mini" @click="onHandlePreview(scope.row)">
<i class="el-icon-view"></i> 查看
</el-button>
<el-button type="text" size="mini" @click="onHandleEdit(scope.row)" class="edit-btn">
<el-button type="text" size="mini" @click="onHandleEdit(scope.row)">
<i class="el-icon-edit"></i> 编辑
</el-button>
<el-button type="text" size="mini" @click="onHandleDelete(scope.row)" class="delete-btn">
<el-button type="text" size="mini" @click="onHandleDelete(scope.row)">
<i class="el-icon-delete"></i> 删除
</el-button>
</template>
@ -870,7 +871,7 @@ export default {
* 出库按钮
*/
onHandleOut() {
this.$router.push('/equipment-ledger-out')
this.$router.push('/equipment-ledger-out/index')
},
/**
@ -886,21 +887,21 @@ export default {
* 入库按钮
*/
onHandleIn() {
this.$router.push('/equipment-ledger-store')
this.$router.push('/equipment-ledger-store/index')
},
/**
* 维修按钮
*/
onHandleRepair() {
this.$router.push('/equipment-ledger-repair')
this.$router.push('/equipment-ledger-repair/index')
},
/**
* 退役按钮
*/
onHandleRetire() {
this.$router.push('/equipment-ledger-retire')
this.$router.push('/equipment-ledger-retire/index')
},
/**
@ -1369,15 +1370,15 @@ export default {
}
.view-btn {
color: #409eff;
color: #00a288;
}
.edit-btn {
color: #67c23a;
color: #00a288;
}
.delete-btn {
color: #f56c6c;
color: #00a288;
}
/* 弹窗表单样式 */