Merge remote-tracking branch 'origin/master'

src/views/dike/engineeringCondition/dikeBaseInfo/options/bainBenefitIndex.vue

@@ -13,8 +13,8 @@
     >
 
       <el-descriptions-item>
-        <template slot="label"> 堤防代码 </template>
+        <template slot="label"> 堤防名称 </template>
-        {{ dikeCode }}
+        {{ this.form.dikeName }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label"> 记录更新时间 </template>

src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue

@@ -466,6 +466,9 @@
         <el-form-item label="堤基防渗形式" prop="bnbsAntp">
           <el-input v-model="form.bnbsAntp" placeholder="请输入堤基防渗形式" />
         </el-form-item>
+        <el-form-item label="堤身净高度" prop="bnbdHigh">
+          <el-input v-model="form.bnbdHigh" placeholder="请输入堤身净高度" />
+        </el-form-item>
         <el-form-item label="堤顶高程" prop="bntpeLev">
           <el-input v-model="form.bntpeLev" placeholder="请输入堤顶高程" />
         </el-form-item>
@@ -487,9 +490,9 @@
         <el-form-item label="背河坡坡比" prop="dwslSlrt">
           <el-input v-model="form.dwslSlrt" placeholder="请输入背河坡坡比" />
         </el-form-item>
-        <el-form-item label="迎河坡坡比" prop="upslSlrt">
+        <!-- <el-form-item label="迎河坡坡比" prop="upslSlrt">
           <el-input v-model="form.upslSlrt" placeholder="请输入迎河坡坡比" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="迎河坡护坡情况" prop="uspsIn">
           <el-input v-model="form.uspsIn" placeholder="请输入迎河坡护坡情况" />
         </el-form-item>
@@ -592,6 +595,7 @@ export default {
           bnbdAntp: null,
           bnbsGl: null,
           bnbsAntp: null,
+          bnbdHigh:null,
           bnbdHigh: null,
           bntpeLev: null,
           bntpFr: null,

src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue

@@ -118,9 +118,9 @@
         fixed
       />
       <el-table-column
-        label="堤防代码"
+        label="堤防名称"
         align="center"
-        prop="dikeCode"
+        prop="dikeName"
         min-width="120"
       />
       <el-table-column

src/views/dike/safetyManage/safetyAppraisal/list.vue

@@ -274,21 +274,31 @@
         </el-tab-pane>
       </el-tabs>
 
+      <div class="">
+        <el-input
+            v-model="remark"
+            placeholder="请输入意见"
+            type="textarea"
+             :rows="4"
+            style="margin-bottom: 10px"
+          ></el-input>
+      </div>
+
       <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="pass">通 过</el-button>
+        <el-button type="primary" @click="pass">通 过</el-button>
-        <el-button @click="noPass">不通过</el-button> -->
+        <el-button type="warning" @click="noPass">不通过</el-button>
 
         <!-- 注销审核通过 -->
-        <el-popconfirm
+        <!-- <el-popconfirm
           icon="el-icon-info"
           icon-color="green"
           title="确定通过吗，请核实对好数据"
           @confirm="pass"
         >
           <el-button slot="reference" type="primary">通 过</el-button>
-        </el-popconfirm>
+        </el-popconfirm> -->
         <!-- 注销审核不通过 -->
-        <el-popover
+        <!-- <el-popover
           placement="top"
           width="300"
           v-model="visible"
@@ -310,7 +320,7 @@
           </div>
 
           <el-button slot="reference" type="warning"> 不通过 </el-button>
-        </el-popover>
+        </el-popover> -->
       </div>
     </el-dialog>
   </div>