Browse Source

feat: 合并线上代码

sy-water-data-board-ui
hejunjie 9 months ago
parent
commit
4f90138c17
  1. 2
      src/assets/styles/index.scss
  2. 4
      src/views/dike/runManage/maintenance/maintenancePlan/index.vue

2
src/assets/styles/index.scss

@ -174,7 +174,7 @@ aside {
align-items: center; align-items: center;
padding: 12px; padding: 12px;
background: #fff; background: #fff;
z-index: 2; z-index: 9;
box-shadow: 0px -2px 4px 0px rgba(0,0,0,0.1); box-shadow: 0px -2px 4px 0px rgba(0,0,0,0.1);
} }
} }

4
src/views/dike/runManage/maintenance/maintenancePlan/index.vue

@ -376,12 +376,12 @@ export default {
<el-table-column prop="createTime" align="center" sortable label="状态"> <el-table-column prop="createTime" align="center" sortable label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.status == 0" v-if="scope.row.status == '0'"
style="color: #f56c6c; font-weight: 600" style="color: #f56c6c; font-weight: 600"
>待提交</span >待提交</span
> >
<span <span
v-else-if="scope.row.status == 1" v-else-if="scope.row.status == '1'"
style="color: #67c23a; font-weight: 600" style="color: #67c23a; font-weight: 600"
>审批中</span >审批中</span
> >

Loading…
Cancel
Save