diff --git a/.env.development b/.env.development index afec87a..7f06b58 100644 --- a/.env.development +++ b/.env.development @@ -7,18 +7,17 @@ VITE_APP_ENV = 'development' # 开发环境 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' -# 李陈杰 209 -<<<<<<< HEAD -VITE_APP_BASE_API = 'http://192.168.110.149:8899' -======= -# VITE_APP_BASE_API = 'http://192.168.110.209:8899' ->>>>>>> 2cd70eb41584033214fe707b9f16b5037fc2beba + +# VITE_APP_BASE_API = 'http://192.168.110.149:8899' + +VITE_APP_BASE_API = 'http://192.168.110.209:8899' + # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +# VITE_APP_BASE_API = 'http://192.168.110.149:8899' #曾涛 # VITE_APP_BASE_API = 'http://192.168.110.171:8899' diff --git a/src/api/mechanical/mechanicalrewriting/index.ts b/src/api/mechanical/mechanicalrewriting/index.ts new file mode 100644 index 0000000..89305ef --- /dev/null +++ b/src/api/mechanical/mechanicalrewriting/index.ts @@ -0,0 +1,72 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MechanicalrewritingVO, MechanicalrewritingForm, MechanicalrewritingQuery } from '@/api/mechanical/mechanicalrewriting/types'; + +/** + * 查询机械台账列表 + * @param query + * @returns {*} + */ + +export const listMechanicalrewriting = (query?: MechanicalrewritingQuery): AxiosPromise => { + return request({ + url: '/mechanical/mechanicalrewriting/list', + method: 'get', + params: query + }); +}; + +/** + * 查询机械台账详细 + * @param id + */ +export const getMechanicalrewriting = (id: string | number): AxiosPromise => { + return request({ + url: '/mechanical/mechanicalrewriting/' + id, + method: 'get' + }); +}; + +/** + * 新增机械台账 + * @param data + */ +export const addMechanicalrewriting = (data: MechanicalrewritingForm) => { + return request({ + url: '/mechanical/mechanicalrewriting', + method: 'post', + data: data + }); +}; + +/** + * 修改机械台账 + * @param data + */ +export const updateMechanicalrewriting = (data: MechanicalrewritingForm) => { + return request({ + url: '/mechanical/mechanicalrewriting', + method: 'put', + data: data + }); +}; + +/** + * 删除机械台账 + * @param id + */ +export const delMechanicalrewriting = (id: string | number | Array) => { + return request({ + url: '/mechanical/mechanicalrewriting/' + id, + method: 'delete' + }); +}; + +//获取类型 +export const getType = (query?: any) => { + return request({ + url: '/mechanical/mechanicaltype/getTree', + method: 'get', + params: query + }); +}; diff --git a/src/api/mechanical/mechanicalrewriting/types.ts b/src/api/mechanical/mechanicalrewriting/types.ts new file mode 100644 index 0000000..d673aeb --- /dev/null +++ b/src/api/mechanical/mechanicalrewriting/types.ts @@ -0,0 +1,306 @@ +export interface MechanicalrewritingVO { + /** + * 自增ID + */ + id: string | number; + + /** + * 项目ID + */ + projectId: string | number; + + /** + * 班组名称 + */ + teamName: string; + + /** + * 设备名称 + */ + devicename: string; + + /** + * 设备类型 + */ + deviceType: string; + + /** + * 设备编号 + */ + deviceNumber: string; + + /** + * 入场日期 + */ + entryTime: string; + + /** + * 规格型号 + */ + specification: string; + + /** + * 生产能力 + */ + production: string; + + /** + * 车牌号码 + */ + plateNumber: string; + + /** + * 设备管理员 + */ + deviceKeeper: string; + + /** + * 车辆行驶证 + */ + drivingLicence: string; + + /** + * 新旧程度 + */ + degree: string; + + /** + * 车辆容量 + */ + vehicleCapacity: string; + + /** + * 车辆净重 + */ + suttle: string; + + /** + * 铭牌 + */ + nameplate: string; + + /** + * 合格证书 + */ + qualification: string; + + /** + * 设备照片 + */ + equipmentPhoto: string; + + /** + * 检验报告 + */ + verificationReport: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface MechanicalrewritingForm extends BaseEntity { + /** + * 自增ID + */ + id?: string | number; + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 班组名称 + */ + teamName?: string; + + /** + * 设备名称 + */ + devicename?: string; + + /** + * 设备类型 + */ + deviceType?: string; + + /** + * 设备编号 + */ + deviceNumber?: string; + + /** + * 入场日期 + */ + entryTime?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 生产能力 + */ + production?: string; + + /** + * 车牌号码 + */ + plateNumber?: string; + + /** + * 设备管理员 + */ + deviceKeeper?: string; + + /** + * 车辆行驶证 + */ + drivingLicence?: string; + + /** + * 新旧程度 + */ + degree?: string; + + /** + * 车辆容量 + */ + vehicleCapacity?: string; + + /** + * 车辆净重 + */ + suttle?: string; + + /** + * 铭牌 + */ + nameplate?: string; + + /** + * 合格证书 + */ + qualification?: string; + + /** + * 设备照片 + */ + equipmentPhoto?: string; + + /** + * 检验报告 + */ + verificationReport?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface MechanicalrewritingQuery extends PageQuery { + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 班组名称 + */ + teamName?: string; + + /** + * 设备名称 + */ + devicename?: string; + + /** + * 设备类型 + */ + deviceType?: string; + + /** + * 设备编号 + */ + deviceNumber?: string; + + /** + * 入场日期 + */ + entryTime?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 生产能力 + */ + production?: string; + + /** + * 车牌号码 + */ + plateNumber?: string; + + /** + * 设备管理员 + */ + deviceKeeper?: string; + + /** + * 车辆行驶证 + */ + drivingLicence?: string; + + /** + * 新旧程度 + */ + degree?: string; + + /** + * 车辆容量 + */ + vehicleCapacity?: string; + + /** + * 车辆净重 + */ + suttle?: string; + + /** + * 铭牌 + */ + nameplate?: string; + + /** + * 合格证书 + */ + qualification?: string; + + /** + * 设备照片 + */ + equipmentPhoto?: string; + + /** + * 检验报告 + */ + verificationReport?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/mechanical/mechanicaltype/index.ts b/src/api/mechanical/mechanicaltype/index.ts new file mode 100644 index 0000000..4ccce04 --- /dev/null +++ b/src/api/mechanical/mechanicaltype/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MechanicaltypeVO, MechanicaltypeForm, MechanicaltypeQuery } from '@/api/mechanical/mechanicaltype/types'; + +/** + * 查询设备类型列表 + * @param query + * @returns {*} + */ + +export const listMechanicaltype = (query?: MechanicaltypeQuery): AxiosPromise => { + return request({ + url: '/mechanical/mechanicaltype/list', + method: 'get', + params: query + }); +}; + +/** + * 查询设备类型详细 + * @param id + */ +export const getMechanicaltype = (id: string | number): AxiosPromise => { + return request({ + url: '/mechanical/mechanicaltype/' + id, + method: 'get' + }); +}; + +/** + * 新增设备类型 + * @param data + */ +export const addMechanicaltype = (data: MechanicaltypeForm) => { + return request({ + url: '/mechanical/mechanicaltype', + method: 'post', + data: data + }); +}; + +/** + * 修改设备类型 + * @param data + */ +export const updateMechanicaltype = (data: MechanicaltypeForm) => { + return request({ + url: '/mechanical/mechanicaltype', + method: 'put', + data: data + }); +}; + +/** + * 删除设备类型 + * @param id + */ +export const delMechanicaltype = (id: string | number | Array) => { + return request({ + url: '/mechanical/mechanicaltype/' + id, + method: 'delete' + }); +}; diff --git a/src/api/mechanical/mechanicaltype/types.ts b/src/api/mechanical/mechanicaltype/types.ts new file mode 100644 index 0000000..9672600 --- /dev/null +++ b/src/api/mechanical/mechanicaltype/types.ts @@ -0,0 +1,129 @@ +export interface MechanicaltypeVO { + /** + * 自增ID + */ + id: string | number; + + /** + * 编码 + */ + code: string; + + /** + * 父编码 + */ + pcode: string; + + /** + * 大 + */ + largeclass: string; + + /** + * 中 + */ + middleclass: string | number; + + /** + * 子类 + */ + subclass: string; + + /** + * 备注 + */ + remark: string; + + /** + * 全名 + */ + fullName: string; + /** + * 类型 + */ + deviceType?: string; +} + +export interface MechanicaltypeForm extends BaseEntity { + /** + * 自增ID + */ + id?: string | number; + + /** + * 编码 + */ + code?: string; + + /** + * 父编码 + */ + pcode?: string; + + /** + * 大 + */ + largeclass?: string; + + /** + * 中 + */ + middleclass?: string | number; + + /** + * 子类 + */ + subclass?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 全名 + */ + fullName?: string; + + /** + * 类型 + */ + deviceType?: string; +} + +export interface MechanicaltypeQuery extends PageQuery { + /** + * 编码 + */ + code?: string; + + /** + * 父编码 + */ + pcode?: string; + + /** + * 大 + */ + largeclass?: string; + + /** + * 中 + */ + middleclass?: string | number; + + /** + * 子类 + */ + subclass?: string; + + /** + * 全名 + */ + fullName?: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/outputApi/index.ts b/src/api/outputApi/index.ts index 8d1a75a..d99bf79 100644 --- a/src/api/outputApi/index.ts +++ b/src/api/outputApi/index.ts @@ -23,7 +23,7 @@ export const projectProgress = (query?: any): any => { export const outpuProgress = (query?: any): any => { return request({ - url: '/enterprise/big/screen/projectOutputValueComparison', + url: '/enterprise/big/screen/projectProgressCapacity', method: 'get', params: query }); diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index bac4213..3949f4e 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -46,6 +46,7 @@ import { OssVO } from '@/api/system/oss/types'; import { propTypes } from '@/utils/propTypes'; import { globalHeaders } from '@/utils/request'; import { compressAccurately } from 'image-conversion'; +import { bool } from 'vue-types'; const props = defineProps({ modelValue: { @@ -72,7 +73,7 @@ const props = defineProps({ compressTargetSize: propTypes.number.def(300), idCardType: { type: String, - default: false + default: '' } }); diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue index b710a33..f13f2c4 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue @@ -48,6 +48,7 @@ const loading = ref(false); const tableData = ref([]); const risk_level_type = ref(); const safety_inspection_type = ref(); +const router = useRouter(); // 新增:获取项目地理信息数据 const getProjectGisData = async () => { try { @@ -159,6 +160,7 @@ const initEcharts = () => {
${data.name}
地点:${data.projectSite}
经纬度:${data.value[0].toFixed(6)}, ${data.value[1].toFixed(6)}
+ `; } if (params.seriesType === 'map') { @@ -196,6 +198,17 @@ const initEcharts = () => { }; myChart.setOption(option); + // 添加点击事件监听 - 这是关键修改部分 + myChart.on('click', function (params: any) { + // 检查点击的是散点图系列 + if (params.componentType === 'series' && params.seriesType === 'scatter') { + // 跳转到项目详情页 + navigateToProjectDetail(); + } + }); +}; +const navigateToProjectDetail = () => { + window.open('http://xny.yj-3d.com:7788/ProjectScreen', '_blank'); }; const risk_level_type1 = ref([]); const safety_inspection_type1 = ref([]); diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/header.vue b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue index d8fe781..de77cbe 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/header.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/header.vue @@ -11,8 +11,8 @@
-
煤科建管-新能源项目数智化管理平台
-
Coal Science Construction Management - New Energy Project Digital Intelligent Management Platform
+
新能源项目数智化管理平台
+
New Energy Project Digital Intelligent Management Platform
@@ -214,6 +214,7 @@ onUnmounted(() => { .header_left_text { font-weight: 500; text-shadow: 0px 1.24px 6.21px rgba(25, 179, 250, 1); + font-size: 26px; } } diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts index 502ddc2..95c05d1 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts +++ b/src/views/enterpriseLarge/digitalizationScreen/components/optionList.ts @@ -75,7 +75,7 @@ export let barOption = { itemWidth: 12, itemHeight: 12, // 调整文字与图标间距 - data: ['计划产值', '实际产值'], + data: ['实际进度', '计划进度'], top: 0, right: 10, bottom: 10, @@ -90,11 +90,17 @@ export let barOption = { trigger: 'axis', // formatter: '{b0}:{c0}万元', formatter: (params: any) => { + console.log(params); + const projectName = params[0].name; // params 是数组,对应每条柱子 - return params - .map((p: any) => `${p.seriesName}:${Number(p.value).toFixed(2)} 亿元`) - - .join('
'); + // return params.map((p: any) => `${p.name}
${p.seriesName}:${Number(p.value).toFixed(2)} MW`).join('
'); + return ( + `${projectName}
` + + params + .slice(0, 2) + .map((p) => `${p.seriesName}:${Number(p.value).toFixed(2)} MW`) + .join('
') + ); }, textStyle: { color: '#fff' @@ -119,7 +125,7 @@ export let barOption = { } }, yAxis: { - name: '单位:亿元', + name: 'MW', type: 'value', axisLabel: { formatter: '{value}' @@ -136,7 +142,7 @@ export let barOption = { }, series: [ { - name: '计划产值', + name: '实际进度', type: 'bar', data: [], barWidth: '10', @@ -161,7 +167,7 @@ export let barOption = { } }, { - name: '实际产值', + name: '计划进度', type: 'bar', data: [], barWidth: '10', diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue index f4e4be7..e33a3b9 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue @@ -53,7 +53,7 @@
- + <Title title="实际进度与计划进度对比" style="font-size: 22px" /> <div class="chart_container"> <div ref="lineChartRef" class="echart" /> </div> @@ -155,8 +155,8 @@ const initPieChart = () => { const getOutputData = async () => { const res = await outpuProgress(); if (res.code == 200) { - designAreaData.value = res.data.map((item: any) => Number(item.planValue)); - transferAreaData.value = res.data.map((item: any) => Number(item.actualValue)); + designAreaData.value = res.data.map((item: any) => Number(item.plannedCapacity * item.progressPercentage)); + transferAreaData.value = res.data.map((item: any) => Number(item.plannedCapacity)); barNames.value = res.data.map((item: any) => item.projectName); initLineChart(); } diff --git a/src/views/mechanism/deviceType/index.vue b/src/views/mechanism/deviceType/index.vue new file mode 100644 index 0000000..40b72c2 --- /dev/null +++ b/src/views/mechanism/deviceType/index.vue @@ -0,0 +1,311 @@ +<template> + <div class="p-2"> + <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> + <div v-show="showSearch" class="mb-[10px]"> + <el-card shadow="hover"> + <el-form ref="queryFormRef" :model="queryParams" :inline="true"> + <el-form-item label="编码" prop="code"> + <el-input v-model="queryParams.code" placeholder="请输入编码" clearable @keyup.enter="handleQuery" /> + </el-form-item> + <el-form-item> + <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> + <el-button icon="Refresh" @click="resetQuery">重置</el-button> + </el-form-item> + </el-form> + </el-card> + </div> + </transition> + + <el-card shadow="never"> + <template #header> + <el-row :gutter="10" class="mb8"> + <el-col :span="1.5"> + <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mechanical:mechanicaltype:add']">新增</el-button> + </el-col> + <!-- <el-col :span="1.5"> + <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mechanical:mechanicaltype:edit']" + >修改</el-button + > + </el-col> + <el-col :span="1.5"> + <el-button + type="danger" + plain + icon="Delete" + :disabled="multiple" + @click="handleDelete()" + v-hasPermi="['mechanical:mechanicaltype:remove']" + >删除</el-button + > + </el-col> --> + <!-- <el-col :span="1.5"> + <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mechanical:mechanicaltype:export']">导出</el-button> + </el-col> --> + <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> + </el-row> + </template> + + <el-table v-loading="loading" :data="mechanicaltypeList"> + <!-- <el-table-column type="selection" width="55" align="center" /> --> + <!-- <el-table-column label="id" align="center" prop="id" v-if="true" /> --> + <el-table-column label="编码" align="center" prop="code" /> + <el-table-column label="父编码" align="center" prop="pcode" /> + <el-table-column label="大" align="center" prop="largeclass" /> + <el-table-column label="中" align="center" prop="middleclass" /> + <el-table-column label="子类" align="center" prop="subclass" /> + <el-table-column label="备注" align="center" prop="remark" /> + <el-table-column label="全名" align="center" prop="fullName" /> + <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> + <template #default="scope"> + <el-tooltip content="修改" placement="top"> + <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mechanical:mechanicaltype:edit']" + >修改</el-button + > + </el-tooltip> + <el-tooltip content="删除" placement="top"> + <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mechanical:mechanicaltype:remove']" + >删除</el-button + > + </el-tooltip> + </template> + </el-table-column> + </el-table> + + <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> + </el-card> + <!-- 添加或修改设备类型对话框 --> + <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> + <el-form ref="mechanicaltypeFormRef" :model="form" :rules="rules" label-width="80px"> + <el-form-item label="编码" prop="code"> + <el-input v-model="form.code" placeholder="请输入编码" :disabled="form.id ? true : false" /> + </el-form-item> + <el-form-item label="父编码" prop="pcode"> + <el-input v-model="form.pcode" placeholder="请输入父编码" :disabled="form.id ? true : false" /> + </el-form-item> + + <el-form-item label="类型" prop="deviceType"> + <el-select v-model="form.deviceType" placeholder="选择类型" @change="changeDeviceType" :disabled="form.id ? true : false"> + <el-option v-for="item in devicelist" :key="item.value" :label="item.label" :value="item.value" /> + </el-select> + </el-form-item> + <el-form-item label="大类" prop="largeclass" v-if="form.deviceType == '1'"> + <el-input v-model="form.largeclass" placeholder="请输入大类" /> + </el-form-item> + <el-form-item label="中" prop="middleclass" v-if="form.deviceType == '2'"> + <el-input v-model="form.middleclass" placeholder="请输入中" /> + </el-form-item> + <el-form-item label="子类" prop="subclass" v-if="form.deviceType == '3'"> + <el-input v-model="form.subclass" placeholder="请输入子类" /> + </el-form-item> + <el-form-item label="备注" prop="remark"> + <el-input v-model="form.remark" placeholder="请输入备注" /> + </el-form-item> + <el-form-item label="全名" prop="fullName" v-if="form.deviceType == '3'"> + <el-input v-model="form.fullName" placeholder="请输入全名" /> + </el-form-item> + </el-form> + <template #footer> + <div class="dialog-footer"> + <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> + <el-button @click="cancel">取 消</el-button> + </div> + </template> + </el-dialog> + </div> +</template> + +<script setup name="Mechanicaltype" lang="ts"> +import { listMechanicaltype, getMechanicaltype, delMechanicaltype, addMechanicaltype, updateMechanicaltype } from '@/api/mechanical/mechanicaltype'; +import { MechanicaltypeVO, MechanicaltypeQuery, MechanicaltypeForm } from '@/api/mechanical/mechanicaltype/types'; + +const { proxy } = getCurrentInstance() as ComponentInternalInstance; + +const mechanicaltypeList = ref<MechanicaltypeVO[]>([]); +const buttonLoading = ref(false); +const loading = ref(true); +const showSearch = ref(true); +const ids = ref<Array<string | number>>([]); +const single = ref(true); +const multiple = ref(true); +const total = ref(0); + +const queryFormRef = ref<ElFormInstance>(); +const mechanicaltypeFormRef = ref<ElFormInstance>(); + +const dialog = reactive<DialogOption>({ + visible: false, + title: '' +}); +const devicelist = ref([ + { + label: '大', + value: '1' + }, + { + label: '中', + value: '2' + }, + { + label: '子类', + value: '3' + } +]); +const initFormData: MechanicaltypeForm = { + id: undefined, + code: undefined, + pcode: undefined, + largeclass: undefined, + middleclass: undefined, + subclass: undefined, + remark: undefined, + fullName: undefined, + deviceType: undefined +}; +const data = reactive<PageData<MechanicaltypeForm, MechanicaltypeQuery>>({ + form: { ...initFormData }, + queryParams: { + pageNum: 1, + pageSize: 10, + code: undefined, + pcode: undefined, + largeclass: undefined, + middleclass: undefined, + subclass: undefined, + fullName: undefined, + params: {} + }, + rules: { + code: [{ required: true, message: '编码不能为空', trigger: 'blur' }], + pcode: [{ required: true, message: '父编码不能为空', trigger: 'blur' }], + deviceType: [{ required: true, message: '类型不能为空', trigger: 'blur' }], + largeclass: [{ required: true, message: '大不能为空', trigger: 'blur' }], + middleclass: [{ required: true, message: '中不能为空', trigger: 'blur' }], + subclass: [{ required: true, message: '子类不能为空', trigger: 'blur' }], + // remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }], + fullName: [{ required: true, message: '全名不能为空', trigger: 'blur' }] + } +}); + +const { queryParams, form, rules } = toRefs(data); +const changeDeviceType = () => { + if (form.value.deviceType == '1') { + form.value.middleclass = undefined; + form.value.subclass = undefined; + form.value.fullName = undefined; + } else if (form.value.deviceType == '2') { + form.value.largeclass = undefined; + form.value.subclass = undefined; + form.value.fullName = undefined; + } else if (form.value.deviceType == '3') { + form.value.largeclass = undefined; + form.value.middleclass = undefined; + } +}; +/** 查询设备类型列表 */ +const getList = async () => { + loading.value = true; + const res = await listMechanicaltype(queryParams.value); + mechanicaltypeList.value = res.rows; + total.value = res.total; + loading.value = false; +}; + +/** 取消按钮 */ +const cancel = () => { + reset(); + dialog.visible = false; +}; + +/** 表单重置 */ +const reset = () => { + form.value = { ...initFormData }; + mechanicaltypeFormRef.value?.resetFields(); +}; + +/** 搜索按钮操作 */ +const handleQuery = () => { + queryParams.value.pageNum = 1; + getList(); +}; + +/** 重置按钮操作 */ +const resetQuery = () => { + queryFormRef.value?.resetFields(); + handleQuery(); +}; + +/** 多选框选中数据 */ +const handleSelectionChange = (selection: MechanicaltypeVO[]) => { + ids.value = selection.map((item) => item.id); + single.value = selection.length != 1; + multiple.value = !selection.length; +}; + +/** 新增按钮操作 */ +const handleAdd = () => { + reset(); + dialog.visible = true; + dialog.title = '添加设备类型'; +}; + +/** 修改按钮操作 */ +const handleUpdate = async (row?: MechanicaltypeVO) => { + reset(); + const _id = row?.id || ids.value[0]; + const res = await getMechanicaltype(_id); + console.log(res); + if (res.data.subclass) { + res.data.deviceType = '3'; + } + if (res.data.middleclass) { + res.data.deviceType = '2'; + } + if (res.data.largeclass) { + res.data.deviceType = '1'; + } + Object.assign(form.value, res.data); + dialog.visible = true; + dialog.title = '修改设备类型'; +}; + +/** 提交按钮 */ +const submitForm = () => { + mechanicaltypeFormRef.value?.validate(async (valid: boolean) => { + if (valid) { + buttonLoading.value = true; + if (form.value.id) { + await updateMechanicaltype(form.value).finally(() => (buttonLoading.value = false)); + } else { + await addMechanicaltype(form.value).finally(() => (buttonLoading.value = false)); + } + proxy?.$modal.msgSuccess('操作成功'); + dialog.visible = false; + await getList(); + } + }); +}; + +/** 删除按钮操作 */ +const handleDelete = async (row?: MechanicaltypeVO) => { + const _ids = row?.id || ids.value; + await proxy?.$modal.confirm('是否确认删除设备类型编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false)); + await delMechanicaltype(_ids); + proxy?.$modal.msgSuccess('删除成功'); + await getList(); +}; + +/** 导出按钮操作 */ +const handleExport = () => { + proxy?.download( + 'mechanical/mechanicaltype/export', + { + ...queryParams.value + }, + `mechanicaltype_${new Date().getTime()}.xlsx` + ); +}; + +onMounted(() => { + getList(); +}); +</script> diff --git a/src/views/mechanism/ledger/components/add.vue b/src/views/mechanism/ledger/components/add.vue new file mode 100644 index 0000000..492551e --- /dev/null +++ b/src/views/mechanism/ledger/components/add.vue @@ -0,0 +1,300 @@ +<template> + <!-- 添加或修改机械台账对话框 --> + <el-dialog :title="dialog.title" v-model="dialog.visible" width="50%" append-to-body> + <el-form ref="mechanicalrewritingFormRef" :model="form" :rules="rules" label-width="120px"> + <el-row> + <el-col :span="12"> + <el-form-item label="设备名称" prop="devicename"> + <el-input v-model="form.devicename" placeholder="请输入设备名称" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="设备类型" prop="equipmentType"> + <!-- <el-cascader v-model="form.deviceType" :options="options" @change="handleChange" /> --> + <el-cascader + placeholder="请选择设备类型" + :emitPath="false" + filterable + v-model="form.equipmentType" + :options="options" + :props="propsConfig" + @change="handleChange" + style="width: 300px" + /> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="设备编号" prop="deviceNumber"> + <el-input v-model="form.deviceNumber" placeholder="请输入设备编号" disabled /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="班组名称" prop="teamName"> + <el-input v-model="form.teamName" placeholder="请输入班组名称" /> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="入场日期" prop="entryTime"> + <el-date-picker clearable v-model="form.entryTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择入场日期"> </el-date-picker> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="规格型号" prop="specification"> + <el-input v-model="form.specification" placeholder="请输入规格型号" /> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="生产能力" prop="production"> + <el-input v-model="form.production" placeholder="请输入生产能力" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="车牌号码" prop="plateNumber"> + <el-input v-model="form.plateNumber" placeholder="请输入车牌号码" /> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="设备管理员" prop="deviceKeeper"> + <el-input v-model="form.deviceKeeper" placeholder="请输入设备管理员" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="车辆行驶证" prop="drivingLicence"> + <el-input v-model="form.drivingLicence" placeholder="请输入车辆行驶证" /> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="新旧程度" prop="degree"> + <el-input v-model="form.degree" placeholder="请输入新旧程度" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="车辆容量" prop="vehicleCapacity"> + <el-input v-model="form.vehicleCapacity" placeholder="请输入车辆容量" /> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="车辆净重" prop="suttle"> + <el-input v-model="form.suttle" placeholder="请输入车辆净重" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="铭牌" prop="nameplateId"> + <image-upload v-model="form.nameplateId" :limit="1" :is-show-tip="false" /> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="合格证书" prop="qualificationId"> + <image-upload v-model="form.qualificationId" :limit="1" :is-show-tip="false" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="设备照片" prop="equipmentPhotoId"> + <image-upload v-model="form.equipmentPhotoId" :limit="1" :is-show-tip="false" /> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="检验报告" prop="verificationReportId"> + <image-upload v-model="form.verificationReportId" :limit="1" :is-show-tip="false" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="备注" prop="remark"> + <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> + </el-form-item> + </el-col> + </el-row> + </el-form> + <template #footer> + <div class="dialog-footer"> + <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> + <el-button @click="cancel">取 消</el-button> + </div> + </template> + </el-dialog> +</template> + +<script setup lang="ts"> +import { getType, addMechanicalrewriting, getMechanicalrewriting, updateMechanicalrewriting } from '@/api/mechanical/mechanicalrewriting'; +import { useUserStoreHook } from '@/store/modules/user'; + +const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const dialog = reactive<DialogOption>({ + visible: false, + title: '添加机械台账' +}); +const form: any = ref({ + id: undefined, + projectId: undefined, + teamName: undefined, + devicename: undefined, + deviceType: undefined, + equipmentType: undefined, + deviceNumber: undefined, + entryTime: undefined, + specification: undefined, + production: undefined, + plateNumber: undefined, + deviceKeeper: undefined, + drivingLicence: undefined, + degree: undefined, + vehicleCapacity: undefined, + suttle: undefined, + nameplateId: undefined, + qualificationId: undefined, + equipmentPhotoId: undefined, + verificationReportId: undefined, + remark: undefined +}); +const rules = ref({ + devicename: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }], + equipmentType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }], + deviceNumber: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }], + entryTime: [{ required: true, message: '入场时间不能为空', trigger: 'blur' }], + specification: [{ required: true, message: '规格不能为空', trigger: 'blur' }], + production: [{ required: true, message: '生产能力不能为空', trigger: 'blur' }], + teamName: [{ required: true, message: '班组名称不能为空', trigger: 'blur' }], + degree: [{ required: true, message: '新旧程度不能为空', trigger: 'blur' }], + nameplateId: [{ required: true, message: '铭牌不能为空', trigger: 'blur' }], + qualificationId: [{ required: true, message: '合格证书不能为空', trigger: 'blur' }], + equipmentPhotoId: [{ required: true, message: '设备照片不能为空', trigger: 'blur' }] +}); +const buttonLoading = ref(false); +const mechanicalrewritingFormRef = ref(); +const propsConfig = { + expandTrigger: 'hover' as const, + value: 'code', + label: 'name', + children: 'children' +}; +const userStore = useUserStoreHook(); +const currentProject = computed(() => userStore.selectedProject); +const emit = defineEmits(['success']); + +const submitForm = () => { + mechanicalrewritingFormRef.value?.validate(async (valid: boolean) => { + if (valid) { + // buttonLoading.value = true; + console.log(form.value); + const parmas = { + ...form.value, + projectId: currentProject.value.id + }; + if (form.value.id) { + const res = await updateMechanicalrewriting(parmas); + if (res.code === 200) { + proxy?.$modal.msgSuccess('操作成功'); + dialog.visible = false; + emit('success'); + } + } else { + const res = await addMechanicalrewriting(parmas); + if (res.code === 200) { + proxy?.$modal.msgSuccess('操作成功'); + dialog.visible = false; + emit('success'); + } + } + } + }); +}; +/** 取消按钮 */ +const cancel = () => { + reset(); + dialog.visible = false; +}; + +/** 表单重置 */ +const reset = () => { + form.value = { + id: undefined, + projectId: undefined, + teamName: undefined, + devicename: undefined, + deviceType: undefined, + deviceNumber: undefined, + entryTime: undefined, + specification: undefined, + production: undefined, + plateNumber: undefined, + deviceKeeper: undefined, + drivingLicence: undefined, + degree: undefined, + vehicleCapacity: undefined, + suttle: undefined, + nameplateId: undefined, + qualificationId: undefined, + equipmentPhotoId: undefined, + verificationReportId: undefined, + equipmentType: undefined, + remark: undefined + }; + mechanicalrewritingFormRef.value?.resetFields(); +}; +const options: any = ref([]); +const open = async (id?: number) => { + const title = id ? '修改机械台账' : '添加机械台账'; + dialog.title = title; + dialog.visible = true; + getTypeList(); + if (id) { + const res = await getMechanicalrewriting(id); + console.log(res); + form.value = res.data; + form.value.equipmentType = res.data.deviceNumber + '_' + res.data.deviceType; + // Object.assign(form.value, res.data); + } +}; +//获取类型 +const getTypeList = async () => { + const res = await getType(); + if (res.code === 200) { + res.data.forEach((element) => { + element.name = element.largeclass; + element.code = element.code + '_' + element.largeclass; + if (element.children && element.children.length) { + element.children.forEach((elements) => { + elements.name = elements.middleclass; + elements.code = elements.code + '_' + elements.middleclass; + if (elements.children && elements.children.length) { + elements.children.forEach((elementss) => { + elementss.code = elementss.code + '_' + elementss.subclass; + elementss.name = elementss.subclass; + }); + } + }); + } + }); + options.value = res.data; + console.log(options.value); + } +}; +//选择了类型 +const handleChange = (val: any) => { + form.value.deviceNumber = val[val.length - 1].split('_')[0]; + form.value.deviceType = val[val.length - 1].split('_')[1]; +}; +defineExpose({ + open +}); +</script> + +<style scoped></style> diff --git a/src/views/mechanism/ledger/components/details.vue b/src/views/mechanism/ledger/components/details.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/mechanism/ledger/index.vue b/src/views/mechanism/ledger/index.vue new file mode 100644 index 0000000..a143fc2 --- /dev/null +++ b/src/views/mechanism/ledger/index.vue @@ -0,0 +1,266 @@ +<template> + <div class="p-2"> + <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> + <div v-show="showSearch" class="mb-[10px]"> + <el-card shadow="hover"> + <el-form ref="queryFormRef" :model="queryParams" :inline="true"> + <el-form-item label="设备名称" prop="devicename"> + <el-input v-model="queryParams.devicename" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" /> + </el-form-item> + + <el-form-item> + <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> + <el-button icon="Refresh" @click="resetQuery">重置</el-button> + </el-form-item> + </el-form> + </el-card> + </div> + </transition> + + <el-card shadow="never"> + <template #header> + <el-row :gutter="10" class="mb8"> + <el-col :span="1.5"> + <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mechanical:mechanicalrewriting:add']">新增</el-button> + </el-col> + <el-col :span="1.5"> + <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mechanical:mechanicalrewriting:export']" + >导出</el-button + > + </el-col> + <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> + </el-row> + </template> + + <el-table v-loading="loading" :data="mechanicalrewritingList"> + <!-- <el-table-column type="selection" width="55" align="center" /> --> + <!-- <el-table-column label="自增ID" align="center" prop="id" v-if="true" /> + <el-table-column label="项目ID" align="center" prop="projectId" /> --> + <el-table-column label="班组名称" align="center" prop="teamName" /> + <el-table-column label="设备名称" align="center" prop="devicename" /> + <el-table-column label="设备类型" align="center" prop="deviceType" /> + <el-table-column label="设备编号" align="center" prop="deviceNumber" /> + <el-table-column label="入场日期" align="center" prop="entryTime" width="180"> + <template #default="scope"> + <span>{{ parseTime(scope.row.entryTime, '{y}-{m}-{d}') }}</span> + </template> + </el-table-column> + <el-table-column label="规格型号" align="center" prop="specification" /> + <el-table-column label="生产能力" align="center" prop="production" /> + <el-table-column label="车牌号码" align="center" prop="plateNumber" /> + <el-table-column label="设备管理员" align="center" prop="deviceKeeper" /> + <el-table-column label="车辆行驶证" align="center" prop="drivingLicence" /> + <el-table-column label="新旧程度" align="center" prop="degree" /> + <el-table-column label="车辆容量" align="center" prop="vehicleCapacity" /> + <el-table-column label="车辆净重" align="center" prop="suttle" /> + + <el-table-column label="备注" align="center" prop="remark" /> + <el-table-column label="操作" align="center" fixed="right" min-width="200" fixed-width> + <template #default="scope"> + <el-tooltip content="修改" placement="top"> + <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)" v-hasPermi="['mechanical:mechanicalrewriting:edit']" + >详情</el-button + > + </el-tooltip> + <el-tooltip content="修改" placement="top"> + <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mechanical:mechanicalrewriting:edit']" + >修改</el-button + > + </el-tooltip> + <el-tooltip content="删除" placement="top"> + <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mechanical:mechanicalrewriting:remove']" + >删除</el-button + > + </el-tooltip> + </template> + </el-table-column> + </el-table> + + <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> + </el-card> + + <addComponent ref="addComponentRef" @success="getList" /> + </div> +</template> + +<script setup name="Mechanicalrewriting" lang="ts"> +import { + listMechanicalrewriting, + getMechanicalrewriting, + delMechanicalrewriting, + addMechanicalrewriting, + updateMechanicalrewriting +} from '@/api/mechanical/mechanicalrewriting'; +import { MechanicalrewritingVO, MechanicalrewritingQuery, MechanicalrewritingForm } from '@/api/mechanical/mechanicalrewriting/types'; +import addComponent from './components/add.vue'; + +const { proxy } = getCurrentInstance() as ComponentInternalInstance; + +const mechanicalrewritingList = ref<MechanicalrewritingVO[]>([]); +const buttonLoading = ref(false); +const loading = ref(true); +const showSearch = ref(true); +const ids = ref<Array<string | number>>([]); +const single = ref(true); +const multiple = ref(true); +const total = ref(0); + +const queryFormRef = ref<ElFormInstance>(); +const mechanicalrewritingFormRef = ref<ElFormInstance>(); + +const dialog = reactive<DialogOption>({ + visible: false, + title: '' +}); + +const initFormData: MechanicalrewritingForm = { + id: undefined, + projectId: undefined, + teamName: undefined, + devicename: undefined, + deviceType: undefined, + deviceNumber: undefined, + entryTime: undefined, + specification: undefined, + production: undefined, + plateNumber: undefined, + deviceKeeper: undefined, + drivingLicence: undefined, + degree: undefined, + vehicleCapacity: undefined, + suttle: undefined, + nameplate: undefined, + qualification: undefined, + equipmentPhoto: undefined, + verificationReport: undefined, + remark: undefined +}; +const data = reactive<PageData<MechanicalrewritingForm, MechanicalrewritingQuery>>({ + form: { ...initFormData }, + queryParams: { + pageNum: 1, + pageSize: 10, + projectId: undefined, + teamName: undefined, + devicename: undefined, + deviceType: undefined, + deviceNumber: undefined, + entryTime: undefined, + specification: undefined, + production: undefined, + plateNumber: undefined, + deviceKeeper: undefined, + drivingLicence: undefined, + degree: undefined, + vehicleCapacity: undefined, + suttle: undefined, + nameplate: undefined, + qualification: undefined, + equipmentPhoto: undefined, + verificationReport: undefined, + params: {} + }, + rules: { + id: [{ required: true, message: '自增ID不能为空', trigger: 'blur' }] + } +}); + +const { queryParams, form, rules } = toRefs(data); + +/** 查询机械台账列表 */ +const getList = async () => { + loading.value = true; + const res = await listMechanicalrewriting(queryParams.value); + mechanicalrewritingList.value = res.rows; + total.value = res.total; + loading.value = false; +}; + +/** 取消按钮 */ +const cancel = () => { + reset(); + dialog.visible = false; +}; + +/** 表单重置 */ +const reset = () => { + form.value = { ...initFormData }; + mechanicalrewritingFormRef.value?.resetFields(); +}; + +/** 搜索按钮操作 */ +const handleQuery = () => { + queryParams.value.pageNum = 1; + getList(); +}; + +/** 重置按钮操作 */ +const resetQuery = () => { + queryFormRef.value?.resetFields(); + handleQuery(); +}; + +/** 多选框选中数据 */ +const handleSelectionChange = (selection: MechanicalrewritingVO[]) => { + ids.value = selection.map((item) => item.id); + single.value = selection.length != 1; + multiple.value = !selection.length; +}; +const addComponentRef = ref(); +/** 新增按钮操作 */ +const handleAdd = () => { + addComponentRef.value?.open(); +}; + +/** 修改按钮操作 */ +const handleUpdate = async (row?: MechanicalrewritingVO) => { + // reset(); + const _id = row?.id || ids.value[0]; + // const res = await getMechanicalrewriting(_id); + // Object.assign(form.value, res.data); + // dialog.visible = true; + // dialog.title = '修改机械台账'; + addComponentRef.value?.open(_id); +}; + +/** 提交按钮 */ +const submitForm = () => { + mechanicalrewritingFormRef.value?.validate(async (valid: boolean) => { + if (valid) { + buttonLoading.value = true; + if (form.value.id) { + await updateMechanicalrewriting(form.value).finally(() => (buttonLoading.value = false)); + } else { + await addMechanicalrewriting(form.value).finally(() => (buttonLoading.value = false)); + } + proxy?.$modal.msgSuccess('操作成功'); + dialog.visible = false; + await getList(); + } + }); +}; + +/** 删除按钮操作 */ +const handleDelete = async (row?: MechanicalrewritingVO) => { + const _ids = row?.id || ids.value; + await proxy?.$modal.confirm('是否确认删除机械台账编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false)); + await delMechanicalrewriting(_ids); + proxy?.$modal.msgSuccess('删除成功'); + await getList(); +}; + +/** 导出按钮操作 */ +const handleExport = () => { + proxy?.download( + 'mechanical/mechanicalrewriting/export', + { + ...queryParams.value + }, + `mechanicalrewriting_${new Date().getTime()}.xlsx` + ); +}; + +onMounted(() => { + getList(); +}); +</script>