fix:修改病害确认增加是病害不重要,修改单据页面增加是否紧急条件
This commit is contained in:
		
							parent
							
								
									6f50e97cba
								
							
						
					
					
						commit
						fc7b760e4b
					
				| @ -2,7 +2,7 @@ | |||||||
|  * @Author: SunTao 328867980@qq.com |  * @Author: SunTao 328867980@qq.com | ||||||
|  * @Date: 2024-11-20 11:58:33 |  * @Date: 2024-11-20 11:58:33 | ||||||
|  * @LastEditors: SunTao 328867980@qq.com |  * @LastEditors: SunTao 328867980@qq.com | ||||||
|  * @LastEditTime: 2025-01-07 15:03:36 |  * @LastEditTime: 2025-01-10 15:03:20 | ||||||
|  * @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue |  * @FilePath: \znxjxt-ui\src\views\xj\document\maintenance-notice\index.vue | ||||||
|  * @Description: 养护通知单 |  * @Description: 养护通知单 | ||||||
| --> | --> | ||||||
| @ -64,6 +64,16 @@ | |||||||
|           <el-option label="下行" value="1" /> |           <el-option label="下行" value="1" /> | ||||||
|         </el-select> |         </el-select> | ||||||
|       </el-form-item> |       </el-form-item> | ||||||
|  |       <el-form-item label="是否紧急" prop="urgentFlag"> | ||||||
|  |         <el-select | ||||||
|  |           v-model="noticeForm.urgentFlag" | ||||||
|  |           placeholder="请选择" | ||||||
|  |           clearable | ||||||
|  |         > | ||||||
|  |           <el-option label="紧急" value="1" /> | ||||||
|  |           <el-option label="不紧急" value="2" /> | ||||||
|  |         </el-select> | ||||||
|  |       </el-form-item> | ||||||
|       <el-form-item label="公里桩" prop="stakeRange"> |       <el-form-item label="公里桩" prop="stakeRange"> | ||||||
|         <el-input |         <el-input | ||||||
|           v-model="noticeForm.stakeStart" |           v-model="noticeForm.stakeStart" | ||||||
| @ -206,6 +216,24 @@ | |||||||
|           </el-table-column> |           </el-table-column> | ||||||
|           <el-table-column label="病害面积" align="center" prop="targetArea" /> |           <el-table-column label="病害面积" align="center" prop="targetArea" /> | ||||||
|           <el-table-column label="状态" align="center" prop="noticeStatus" /> |           <el-table-column label="状态" align="center" prop="noticeStatus" /> | ||||||
|  |           <el-table-column label="是否紧急" align="center" prop="urgentFlag"> | ||||||
|  |             <template slot-scope="scope"> | ||||||
|  |               <el-button | ||||||
|  |                 v-if="scope.row.urgentFlag === 1" | ||||||
|  |                 type="danger" | ||||||
|  |                 plain | ||||||
|  |                 disabled | ||||||
|  |                 >紧急</el-button | ||||||
|  |               > | ||||||
|  |               <el-button | ||||||
|  |                 v-if="scope.row.urgentFlag === 2" | ||||||
|  |                 type="warning" | ||||||
|  |                 plain | ||||||
|  |                 disabled | ||||||
|  |                 >不紧急</el-button | ||||||
|  |               > | ||||||
|  |             </template> | ||||||
|  |           </el-table-column> | ||||||
|           <el-table-column |           <el-table-column | ||||||
|             label="操作" |             label="操作" | ||||||
|             align="center" |             align="center" | ||||||
| @ -352,6 +380,8 @@ export default { | |||||||
|         segmentName: "", |         segmentName: "", | ||||||
|         // 上下行 |         // 上下行 | ||||||
|         inspectDirection: "", |         inspectDirection: "", | ||||||
|  |         // 是否紧急 | ||||||
|  |         urgentFlag: "", | ||||||
|         // 公里桩 |         // 公里桩 | ||||||
|         stakeStart: undefined, |         stakeStart: undefined, | ||||||
|         stakeEnd: undefined, |         stakeEnd: undefined, | ||||||
| @ -404,13 +434,13 @@ export default { | |||||||
|       // 病害类型下拉级联 |       // 病害类型下拉级联 | ||||||
|       tableDefect: [], |       tableDefect: [], | ||||||
|       // 导航栏选择绑定 |       // 导航栏选择绑定 | ||||||
|       activeName: "已完成", |       activeName: "未生成", | ||||||
|       // 导航栏列表 |       // 导航栏列表 | ||||||
|       editableTabs: [ |       editableTabs: [ | ||||||
|         { title: "已完成", value: "已完成", status: "1" }, |  | ||||||
|         { title: "已开工", value: "已开工", status: "4" }, |  | ||||||
|         { title: "已生成", value: "已生成", status: "2" }, |  | ||||||
|         { title: "未生成", value: "未生成", status: "3" }, |         { title: "未生成", value: "未生成", status: "3" }, | ||||||
|  |         { title: "已生成", value: "已生成", status: "2" }, | ||||||
|  |         { title: "已开工", value: "已开工", status: "4" }, | ||||||
|  |         { title: "已完成", value: "已完成", status: "1" }, | ||||||
|       ], |       ], | ||||||
| 
 | 
 | ||||||
|       // 表格加载状态 |       // 表格加载状态 | ||||||
| @ -518,6 +548,8 @@ export default { | |||||||
|         segmentName: "", |         segmentName: "", | ||||||
|         // 上下行 |         // 上下行 | ||||||
|         inspectDirection: "", |         inspectDirection: "", | ||||||
|  |         // 是否紧急 | ||||||
|  |         urgentFlag: "", | ||||||
|         // 公里桩 |         // 公里桩 | ||||||
|         stakeStart: undefined, |         stakeStart: undefined, | ||||||
|         stakeEnd: undefined, |         stakeEnd: undefined, | ||||||
|  | |||||||
| @ -2,13 +2,17 @@ | |||||||
|  * @Author: SunTao 328867980@qq.com |  * @Author: SunTao 328867980@qq.com | ||||||
|  * @Date: 2024-10-22 15:30:25 |  * @Date: 2024-10-22 15:30:25 | ||||||
|  * @LastEditors: SunTao 328867980@qq.com |  * @LastEditors: SunTao 328867980@qq.com | ||||||
|  * @LastEditTime: 2025-01-08 16:03:44 |  * @LastEditTime: 2025-01-10 14:48:49 | ||||||
|  * @FilePath: \znxjxt-ui\src\views\big-screen\components\img-dialog.vue |  * @FilePath: \znxjxt-ui\src\views\big-screen\components\img-dialog.vue | ||||||
|  * @Description: 大屏查看图片弹窗 |  * @Description: 大屏查看图片弹窗 | ||||||
| --> | --> | ||||||
| 
 | 
 | ||||||
| <template> | <template> | ||||||
|   <div class="app" v-loading="loading"> |   <div | ||||||
|  |     class="app" | ||||||
|  |     v-loading="loading" | ||||||
|  |     element-loading-background="rgba(0, 0, 0, 0.8)" | ||||||
|  |   > | ||||||
|     <div class="left-list"> |     <div class="left-list"> | ||||||
|       <div class="sidebar" ref="sidebar" @scroll="handleScroll"> |       <div class="sidebar" ref="sidebar" @scroll="handleScroll"> | ||||||
|         <img |         <img | ||||||
| @ -204,6 +208,9 @@ | |||||||
|           <el-button type="success" plain size="mini" @click="changeDefect(2)" |           <el-button type="success" plain size="mini" @click="changeDefect(2)" | ||||||
|             >是病害(Y)</el-button |             >是病害(Y)</el-button | ||||||
|           > |           > | ||||||
|  |           <el-button type="primary" plain size="mini" @click="changeDefect(4)" | ||||||
|  |             >是病害不紧急(U) | ||||||
|  |           </el-button> | ||||||
|           <el-button type="warning" plain size="mini" @click="changeDefect(3)" |           <el-button type="warning" plain size="mini" @click="changeDefect(3)" | ||||||
|             >不是病害(N)</el-button |             >不是病害(N)</el-button | ||||||
|           > |           > | ||||||
| @ -716,6 +723,9 @@ export default { | |||||||
|       } else if (event.keyCode === 89) { |       } else if (event.keyCode === 89) { | ||||||
|         // 确认病害 |         // 确认病害 | ||||||
|         this.changeDefect(2); |         this.changeDefect(2); | ||||||
|  |       } else if (event.keyCode === 85) { | ||||||
|  |         // 确认病害 | ||||||
|  |         this.changeDefect(4); | ||||||
|       } else if (event.keyCode === 78) { |       } else if (event.keyCode === 78) { | ||||||
|         // 不是病害 |         // 不是病害 | ||||||
|         this.changeDefect(3); |         this.changeDefect(3); | ||||||
| @ -1091,7 +1101,9 @@ export default { | |||||||
|     background-color: #333c42; |     background-color: #333c42; | ||||||
| 
 | 
 | ||||||
|     > button { |     > button { | ||||||
|       width: 6rem; |       width: 7rem; | ||||||
|  |       height: 1.3rem; | ||||||
|  |       line-height: 0.4rem; | ||||||
|       margin: 0; |       margin: 0; | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  | |||||||
| @ -2,7 +2,7 @@ | |||||||
|  * @Author: SunTao 328867980@qq.com |  * @Author: SunTao 328867980@qq.com | ||||||
|  * @Date: 2024-11-01 13:17:41 |  * @Date: 2024-11-01 13:17:41 | ||||||
|  * @LastEditors: SunTao 328867980@qq.com |  * @LastEditors: SunTao 328867980@qq.com | ||||||
|  * @LastEditTime: 2024-12-27 14:25:36 |  * @LastEditTime: 2025-01-10 14:44:29 | ||||||
|  * @FilePath: \znxjxt-ui\src\views\xj\inspection\confirmation-management\index.vue |  * @FilePath: \znxjxt-ui\src\views\xj\inspection\confirmation-management\index.vue | ||||||
|  * @Description: 巡检信息-病害确认 |  * @Description: 巡检信息-病害确认 | ||||||
| --> | --> | ||||||
| @ -173,7 +173,18 @@ | |||||||
|       </el-col> |       </el-col> | ||||||
|       <el-col :span="1.5"> |       <el-col :span="1.5"> | ||||||
|         <el-button |         <el-button | ||||||
|           type="danger" |           type="primary" | ||||||
|  |           plain | ||||||
|  |           icon="el-icon-collection-tag" | ||||||
|  |           size="mini" | ||||||
|  |           :disabled="multiple" | ||||||
|  |           @click="handleConfirm(4)" | ||||||
|  |           >是病害(不紧急) | ||||||
|  |         </el-button> | ||||||
|  |       </el-col> | ||||||
|  |       <el-col :span="1.5"> | ||||||
|  |         <el-button | ||||||
|  |           type="warning" | ||||||
|           plain |           plain | ||||||
|           icon="el-icon-close" |           icon="el-icon-close" | ||||||
|           size="mini" |           size="mini" | ||||||
| @ -182,16 +193,6 @@ | |||||||
|           >不是病害 |           >不是病害 | ||||||
|         </el-button> |         </el-button> | ||||||
|       </el-col> |       </el-col> | ||||||
|       <!-- <el-col :span="1.5"> |  | ||||||
|         <el-button |  | ||||||
|           type="primary" |  | ||||||
|           plain |  | ||||||
|           icon="el-icon-picture-outline" |  | ||||||
|           size="mini" |  | ||||||
|           @click="handleBatch()" |  | ||||||
|           >影像模式 |  | ||||||
|         </el-button> |  | ||||||
|       </el-col> --> |  | ||||||
|     </el-row> |     </el-row> | ||||||
| 
 | 
 | ||||||
|     <!-- 数据表格 --> |     <!-- 数据表格 --> | ||||||
| @ -540,7 +541,7 @@ export default { | |||||||
|      * @return {*} |      * @return {*} | ||||||
|      */ |      */ | ||||||
|     handleSelectionChange(selection) { |     handleSelectionChange(selection) { | ||||||
|       this.checkIds = selection.map((item) => item.id); |       this.checkIds = selection.map((item) => item.snapshotId); | ||||||
|       this.multiple = !selection.length; |       this.multiple = !selection.length; | ||||||
|     }, |     }, | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user