Merge remote-tracking branch 'origin/master'

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) {

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" />

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