From 11c8cd5f619e6f1bf51db1e7599860ccdb57c855 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 25 Apr 2024 09:23:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ah-jjzhgd-web/src/views/basic/project/index.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ah-jjzhgd-web/src/views/basic/project/index.vue b/ah-jjzhgd-web/src/views/basic/project/index.vue
index 544cf08..6a1c4ae 100644
--- a/ah-jjzhgd-web/src/views/basic/project/index.vue
+++ b/ah-jjzhgd-web/src/views/basic/project/index.vue
@@ -217,6 +217,7 @@
             :file-list="imageList"
             :on-change="handleImageChange"
             :accept="'image/jpeg, image/png, image/jpg'"
+            :on-exceed="handleExceed"
           >
             <i slot="default" class="el-icon-plus" />
             <div slot="file" slot-scope="{file}">
@@ -247,6 +248,7 @@
             :limit="imageUploadLimit2"
             :on-change="handleImageChange2"
             :accept="'image/jpeg, image/png, image/jpg'"
+            :on-exceed="handleExceed2"
           >
             <i slot="default" class="el-icon-plus" />
             <div slot="file" slot-scope="{file}">
@@ -481,6 +483,12 @@ export default {
     this.getList()
   },
   methods: {
+    handleExceed(files, fileList) {
+      this.$message.error(`最多只能上传 1 张图片`);
+    },
+    handleExceed2(files, fileList) {
+      this.$message.error(`最多只能上传 5 张图片`);
+    },
     // 图片上传验证
     validateImageNum(rule, value, callback) {
       if (this.imageList2.length) {

From 024ba888587b3671c2cfedd4b06972805dcf1eb0 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 26 Apr 2024 11:10:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ah-jjzhgd-web/src/views/man-car/car/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ah-jjzhgd-web/src/views/man-car/car/index.vue b/ah-jjzhgd-web/src/views/man-car/car/index.vue
index 2e004de..79f9a65 100644
--- a/ah-jjzhgd-web/src/views/man-car/car/index.vue
+++ b/ah-jjzhgd-web/src/views/man-car/car/index.vue
@@ -42,6 +42,7 @@
           <span>{{ (listQuery.pageNum - 1) * 10 + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="所属工程" align="center" prop="proName" />
       <el-table-column label="司机姓名" align="center" prop="userName" />
       <el-table-column label="车牌号" align="center" prop="carNum" />
       <el-table-column label="电话" align="center" prop="phone" />

From 0d7388f639ba1afd9fafcc5a0f8092b2717d2eb1 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Sun, 28 Apr 2024 14:50:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=94=E6=80=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/risk/emergency/components/EmergencyProcess.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ah-jjzhgd-web/src/views/risk/emergency/components/EmergencyProcess.vue b/ah-jjzhgd-web/src/views/risk/emergency/components/EmergencyProcess.vue
index 9d3869c..f596c91 100644
--- a/ah-jjzhgd-web/src/views/risk/emergency/components/EmergencyProcess.vue
+++ b/ah-jjzhgd-web/src/views/risk/emergency/components/EmergencyProcess.vue
@@ -70,7 +70,7 @@
         label-width="120px"
       >
         <el-form-item label="应急流程名称：" prop="emergencyName">
-          <el-input v-model="temp.emergencyName" placeholder="姓名" :maxlength="50" />
+          <el-input v-model="temp.emergencyName" placeholder="应急流程名称" :maxlength="50" />
         </el-form-item>
         <el-form-item label="附件：" prop="addition">
           <el-upload