提交

.env.development

@@ -10,7 +10,7 @@ VITE_APP_ENV = 'development'
 
 # 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.149:8899'

src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue

@@ -328,13 +328,14 @@ onUnmounted(() => {
       padding: 15px 5px 5px 5px;
       .progress_text_title {
         width: 100%;
-        // height: 100%;
+        height: 100%;
         display: flex;
-        justify-content: space-between;
+        justify-content: center;
         align-items: center;
         & > div:first-child {
           // 第一个子元素的样式
-          width: 50%;
+          // width: 50%;
+          height: 100%;
           font-size: 24px;
           // font-weight: bold;
           font-family: 'AlimamaShuHeiTi', sans-serif;
@@ -343,10 +344,14 @@ onUnmounted(() => {
 
         & > div:last-child {
           // 最后一个子元素的样式
-          width: 50%;
+          // width: 50%;
+          height: 100%;
           font-size: 12px;
           color: #999;
-          text-align: center;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          padding-left: 5px;
         }
       }
       .content_text {

src/views/mechanism/ledger/components/details.vue

@@ -0,0 +1,115 @@
+<template>
+  <!-- 机械台账详情抽屉 -->
+
+  <el-drawer v-model="isShowDialog" size="40%" direction="ltr">
+    <template #header>
+      <span>机械台账详情</span>
+    </template>
+    <el-form ref="formRef" :model="formData" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="设备名称">{{ formData.devicename }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型">{{ formData.deviceType }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备编号">{{ formData.deviceNumber }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="班组名称">{{ formData.teamName }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入场日期">{{ parseTime(formData.entryTime, '{y}-{m}-{d}') }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="规格型号">{{ formData.specification }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="生产能力">{{ formData.production }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="车牌号码">{{ formData.plateNumber }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备管理员">{{ formData.deviceKeeper }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="车辆行驶证">{{ formData.drivingLicence }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="新旧程度">{{ formData.degree }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="车辆容量">{{ formData.vehicleCapacity }}</el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="车辆净重">{{ formData.suttle }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="铭牌">
+            <el-image :src="formData.nameplate" fit="contain" style="width: 150px; height: 150px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合格证书">
+            <el-image :src="formData.equipmentPhoto" fit="fill" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备照片"> </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="检验报告"> </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上传时间">{{ formData.createdAt }}</el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="备注">{{ formData.remark }}</el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-drawer>
+</template>
+
+<script setup lang="ts">
+import { getMechanicalrewriting } from '@/api/mechanical/mechanicalrewriting';
+const formData: any = ref({
+  devicename: '',
+  deviceType: '',
+  deviceNumber: '',
+  teamName: '',
+  entryTime: '',
+  specification: '',
+  production: '',
+  plateNumber: '',
+  deviceKeeper: '',
+  drivingLicence: '',
+  degree: '',
+  vehicleCapacity: '',
+  suttle: '',
+  nameplate: '',
+  qualification: '',
+  equipmentPhoto: '',
+  verificationReport: '',
+  createdAt: '',
+  remark: ''
+});
+const isShowDialog = ref(false);
+const open = async (id?: any) => {
+  console.log(id);
+  isShowDialog.value = true;
+  if (id) {
+    const res = await getMechanicalrewriting(id);
+    console.log(res);
+    formData.value = res.data;
+    // form.value.equipmentType = res.data.deviceNumber + '_' + res.data.deviceType;
+    // Object.assign(form.value, res.data);
+  }
+};
+
+defineExpose({
+  open
+});
+</script>

src/views/mechanism/ledger/index.vue

@@ -58,7 +58,7 @@
         <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 link type="primary" icon="View" @click="handleDetails(scope.row)" v-hasPermi="['mechanical:mechanicalrewriting:edit']"
                 >详情</el-button
               >
             </el-tooltip>
@@ -80,6 +80,7 @@
     </el-card>
 
     <addComponent ref="addComponentRef" @success="getList" />
+    <detailsComponent ref="detailsComponentRef" />
   </div>
 </template>
 
@@ -93,6 +94,7 @@ import {
 } from '@/api/mechanical/mechanicalrewriting';
 import { MechanicalrewritingVO, MechanicalrewritingQuery, MechanicalrewritingForm } from '@/api/mechanical/mechanicalrewriting/types';
 import addComponent from './components/add.vue';
+import detailsComponent from './components/details.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -216,13 +218,14 @@ const handleAdd = () => {
 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 detailsComponentRef = ref();
+//详情
+const handleDetails = (row) => {
+  const _id = row?.id || ids.value[0];
+  detailsComponentRef.value?.open(_id);
+};
 /** 提交按钮 */
 const submitForm = () => {
   mechanicalrewritingFormRef.value?.validate(async (valid: boolean) => {