4.3任务提交

src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue

@@ -457,6 +457,7 @@
                   扣
                   <!-- oninput="if ( value  > sub.children[0] ? sub.children[0].score:0)  value  = sub.children[0] ? sub.children[0].score:0; value = value .replace(/^0|[^0-9]/g,'')" -->
                   <el-input
+                    :disabled="form.status!=0&&form.status!=2"
                     v-model.number="
                       evalForm.score[`${sub.orderBy + '-' + 'S1'}`]
                     "
@@ -479,6 +480,8 @@
                 >
                   <!-- <span>空</span> -->
                   <el-input
+                    :disabled="form.status!=0&&form.status!=2"
+
                     v-model="evalForm.reason[`${sub.orderBy + '-' + 'R1'}`]"
                     placeholder="扣分原因"
                     style="width: 90%"
@@ -562,6 +565,8 @@
                     <!-- <span>空</span> -->
                     扣
                     <el-input
+                      :disabled="form.status!=0&&form.status!=2"
+
                       v-model.number="
                         evalForm.score[
                           `${sub.orderBy + '-' + 'S' + (index + 1)}`
@@ -586,6 +591,8 @@
                   >
                     <!-- <span>空</span> -->
                     <el-input
+                      :disabled="form.status!=0&&form.status!=2"
+
                       v-model="
                         evalForm.reason[
                           `${sub.orderBy + '-' + 'R' + (index + 1)}`

src/views/dike/safetyManage/floodControlManagement/components/powerList.vue

@@ -385,6 +385,8 @@ export default {
                 this.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
+                this.$emit('parentMethod','')
+
               }
             });
           }

src/views/dike/safetyManage/floodControlManagement/power.vue

@@ -257,7 +257,7 @@
     >
       <el-tabs v-model="activeName" style="margin-bottom: 20px" v-if="addOpen">
         <el-tab-pane label="备用电源信息" name="powerList" :lazy="true">
-          <powerList ref="powerList" :prowerTypeId="prowerTypeId" />
+          <powerList ref="powerList" :prowerTypeId="prowerTypeId" @parentMethod="getList"/>
         </el-tab-pane>
         <el-tab-pane label="试运行记录" name="powerRecords" :lazy="true">
           <powerRecords

src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="15">
       <el-form ref="form" :model="form" :rules="rules" label-width="152px">
         <el-col :span="24">
-          <el-form-item label="堤防名称1">
+          <el-form-item label="堤防名称">
             <el-input v-model="dikeName" disabled />
           </el-form-item>
         </el-col>

src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue

@@ -12,7 +12,7 @@
       :contentStyle="{ minWidth: '350px' }"
     >
       <el-descriptions-item>
-        <template slot="label"> 堤防名称1 </template>
+        <template slot="label"> 堤防名称 </template>
         {{ this.dikeName }}
       </el-descriptions-item>
       <el-descriptions-item>

src/views/dike/safetyManage/safetyAppraisal/components/statisticsOne.vue

@@ -53,7 +53,11 @@
         align="center"
         prop="rate"
         min-width="120"
-      />
+      >
+        <template slot-scope="scope">
+          {{scope.row.rate*100+'%'}}
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
@@ -87,7 +91,7 @@ export default {
         // console.log(11, response);
         this.statisticsList = response.data;
         this.barChartData.name = response.data?.map((res) => res.adcdName);
-        this.barChartData.value = response.data?.map((res) => res.rate);
+        this.barChartData.value = response.data?.map((res) => res.rate*100);
         this.loading = false;
         this.barInit();
       });
@@ -148,7 +152,7 @@ export default {
           },
           minInterval: 1, //设置成1保证坐标轴分割刻度显示成整数。
           max: function (value) {
-            return value.max + Math.ceil(0.2 * value.max);
+            return 100;
           },
           // boundaryGap: [0, 1],
         },

src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue

@@ -27,19 +27,19 @@
         min-width="120"
       />
       <el-table-column
-        label="一级堤防"
+        label="一类堤防"
         align="center"
         prop="one"
         min-width="120"
       />
       <el-table-column
-        label="二级堤防"
+        label="二类堤防"
         align="center"
         prop="two"
         min-width="120"
       />
       <el-table-column
-        label="三级堤防"
+        label="三类堤防"
         align="center"
         prop="three"
         min-width="120"
@@ -151,19 +151,19 @@ export default {
 
         series: [
           {
-            name: "一级堤防",
+            name: "一类堤防",
             type: "bar",
             data: this.barChartData.value1,
             barMaxWidth: "10%",
           },
           {
-            name: "二级堤防",
+            name: "二类堤防",
             type: "bar",
             data: this.barChartData.value2,
             barMaxWidth: "10%",
           },
           {
-            name: "三级堤防",
+            name: "三类堤防",
             type: "bar",
             data: this.barChartData.value3,
             barMaxWidth: "10%",

src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue

@@ -509,6 +509,7 @@
                   扣
                   <!-- oninput="if ( value  > sub.children[0] ? sub.children[0].score:0)  value  = sub.children[0] ? sub.children[0].score:0; value = value .replace(/^0|[^0-9]/g,'')" -->
                   <el-input
+                    :disabled="form.status!=0&&form.status!=2"
                     v-model.number="
                       evalForm.score[`${sub.orderBy + '-' + 'S1'}`]
                     "
@@ -531,6 +532,7 @@
                 >
                   <!-- <span>空</span> -->
                   <el-input
+                    :disabled="form.status!=0&&form.status!=2"
                     v-model="evalForm.reason[`${sub.orderBy + '-' + 'R1'}`]"
                     placeholder="扣分原因"
                     style="width: 90%"
@@ -614,6 +616,7 @@
                     <!-- <span>空</span> -->
                     扣
                     <el-input
+                      :disabled="form.status!=0&&form.status!=2"
                       v-model.number="
                         evalForm.score[
                           `${sub.orderBy + '-' + 'S' + (index + 1)}`
@@ -638,6 +641,7 @@
                   >
                     <!-- <span>空</span> -->
                     <el-input
+                      :disabled="form.status!=0&&form.status!=2"
                       v-model="
                         evalForm.reason[
                           `${sub.orderBy + '-' + 'R' + (index + 1)}`

src/views/sluice/safetyManage/floodControlManagement/components/powerList.vue

@@ -383,6 +383,7 @@ export default {
                 this.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
+                this.$emit('parentMethod','')
               }
             });
           } else {
@@ -392,6 +393,7 @@ export default {
                 this.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
+                this.$emit('parentMethod','')
               }
             });
           }

src/views/sluice/safetyManage/floodControlManagement/power.vue

@@ -257,7 +257,7 @@
     >
       <el-tabs v-model="activeName" style="margin-bottom: 20px" v-if="addOpen">
         <el-tab-pane label="备用电源信息" name="powerList" :lazy="true">
-          <powerList ref="powerList" :prowerTypeId="prowerTypeId" />
+          <powerList ref="powerList" :prowerTypeId="prowerTypeId" @parentMethod="getList"/>
         </el-tab-pane>
         <el-tab-pane label="试运行记录" name="powerRecords" :lazy="true">
           <powerRecords

src/views/sluice/safetyManage/safetyAppraisal/components/statisticsOne.vue

@@ -53,7 +53,11 @@
         align="center"
         prop="rate"
         min-width="120"
-      />
+      >
+        <template slot-scope="scope">
+        {{scope.row.rate*100+'%'}}
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
@@ -87,7 +91,7 @@ export default {
         // console.log(11, response);
         this.statisticsList = response.data;
         this.barChartData.name = response.data?.map((res) => res.adcdName);
-        this.barChartData.value = response.data?.map((res) => res.rate);
+        this.barChartData.value = response.data?.map((res) => res.rate*100);
         this.loading = false;
         this.barInit();
       });
@@ -148,7 +152,7 @@ export default {
           },
           minInterval: 1, //设置成1保证坐标轴分割刻度显示成整数。
           max: function (value) {
-            return value.max + Math.ceil(0.2 * value.max);
+            return 100;
           },
           // boundaryGap: [0, 1],
         },

src/views/sluice/safetyManage/safetyAppraisal/components/statisticsThree.vue

@@ -26,23 +26,30 @@
         min-width="120"
       />
       <el-table-column
-        label="一级水闸"
+        label="一类水闸"
         align="center"
         prop="one"
         min-width="120"
       />
       <el-table-column
-        label="二级水闸"
+        label="二类水闸"
         align="center"
         prop="two"
         min-width="120"
       />
       <el-table-column
-        label="三级水闸"
+        label="三类水闸"
         align="center"
         prop="three"
         min-width="120"
       />
+
+      <el-table-column
+        label="四类水闸"
+        align="center"
+        prop="four"
+        min-width="120"
+      />
     </el-table>
   </div>
 </template>
@@ -60,6 +67,7 @@ export default {
         value1: [],
         value2: [],
         value3: [],
+        value4:[]
       },
     };
   },
@@ -81,6 +89,7 @@ export default {
         this.barChartData.value1 = response.data?.map((res) => res.one);
         this.barChartData.value2 = response.data?.map((res) => res.two);
         this.barChartData.value3 = response.data?.map((res) => res.three);
+        this.barChartData.value4 = response.data?.map((res) => res.four);
         this.loading = false;
         this.barInit();
       });
@@ -92,7 +101,7 @@ export default {
         title: {
           // text: "World Population",
         },
-        color: ["#38A0FF", "#4CCA73", "#FBD437"],
+        color: ["#0f89ec", "#4CCA73", "#FBD437","#4E6B83FF"],
         tooltip: {
           trigger: "axis",
           axisPointer: {
@@ -150,23 +159,29 @@ export default {
 
         series: [
           {
-            name: "一级水闸",
+            name: "一类水闸",
             type: "bar",
             data: this.barChartData.value1,
             barMaxWidth: "10%",
           },
           {
-            name: "二级水闸",
+            name: "二类水闸",
             type: "bar",
             data: this.barChartData.value2,
             barMaxWidth: "10%",
           },
           {
-            name: "三级水闸",
+            name: "三类水闸",
             type: "bar",
             data: this.barChartData.value3,
             barMaxWidth: "10%",
           },
+          {
+            name: "四类水闸",
+            type: "bar",
+            data: this.barChartData.value4,
+            barMaxWidth: "10%",
+          },
         ],
       };