Merge remote-tracking branch 'origin/master'

src/views/dike/managementGuarantee/standardizationConstruction/dataCharts.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="content">
-    暂无数据
+<!--    暂无数据-->
     <!-- <div ref="pieEle" style="width: 30%; height: 100%"></div> -->
     <!-- <div ref="barEle" style="width: 100%; height: 100%"></div> -->
+    <div ref="barEle" style="width: 100%; height: 100%"></div>
   </div>
 </template>
 <script>
@@ -13,10 +14,11 @@ export default {
     return {
       pieChartData: [],
       barChartData: [],
+
     };
   },
   created() {
-    // this.getData();
+    this.getData();
   },
   methods: {
     async getData() {
@@ -26,7 +28,13 @@ export default {
       //   this.pieChartData.push({ value: res1[0][key], name: key });
       // }
 
-      this.barChartData = res2;
+      this.barChartData = {
+        "汕头市": {0: "1", 1: "1",2: '1',3:'1'},
+        "佛山市": {0: "1", 1: "1",2: '1',3:'1'},
+        "珠海市": {0: "1", 1: "1",2: '1',3:'1'},
+        "广州市": {0: "1", 1: "1",2: '1',3:'1'},
+        "中山市": {0: "1", 1: "1",2: '1',3:'1'},
+      };
       // this.pieInit();
       this.barInit();
       // console.log("pieChartData", this.pieChartData);
@@ -100,7 +108,7 @@ export default {
         title: {
           // text: "World Population",
         },
-        color: ["#38A0FF", "#4CCA73", "#FBD437"],
+        color: ["#38A0FF", "#4CCA73", "#FBD437","#7e1439"],
         tooltip: {
           trigger: "axis",
           axisPointer: {
@@ -155,23 +163,29 @@ export default {
 
         series: [
           {
-            name: "政府部门责任人",
+            name: "江(河)堤",
             type: "bar",
             data: Object.values(this.barChartData).map((res) => res["0"]),
             barMaxWidth: "10%",
           },
           {
-            name: "主管部门责任人",
+            name: "湖堤",
             type: "bar",
             data: Object.values(this.barChartData).map((res) => res["1"]),
             barMaxWidth: "10%",
           },
           {
-            name: "管理单位责任人",
+            name: "海堤",
             type: "bar",
             data: Object.values(this.barChartData).map((res) => res["2"]),
             barMaxWidth: "10%",
           },
+          {
+            name: "围(圩，圈)堤",
+            type: "bar",
+            data: Object.values(this.barChartData).map((res) => res["3"]),
+            barMaxWidth: "10%",
+          },
         ],
       };
       // }

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

@@ -10,7 +10,7 @@
         {{ item.routeName }}
       </el-breadcrumb-item>
     </el-breadcrumb>
-<!--    <dataCharts ref="dataCharts" />-->
+    <dataCharts ref="dataCharts" />
     <listPage :chartEleGetData="chartEleGetData" />
   </div>
 </template>

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

@@ -71,6 +71,15 @@
           >删除</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleIncentive"
+          >奖惩管理</el-button
+        >
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -130,6 +139,15 @@
         :formatter="$formatAdcd"
         min-width="120"
       />
+      <el-table-column
+        label="等级"
+        align="center"
+        prop="adcd"
+        min-width="120"
+      >
+        <template slot-scope="scope">
+        </template>
+      </el-table-column>
 
       <el-table-column
         label="操作"
@@ -248,6 +266,7 @@
       </el-form>
       <div class="listTitle">
         <span>评价表</span>
+        <span>总分：100</span>
         <!-- <span class="addBtn" @click="handleAddList('0')">
             <i class="el-icon-plus"></i>
             添加
@@ -639,6 +658,50 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!--奖惩管理-->
+    <el-dialog
+      title="考核标准与等级划分管理"
+      :visible="dialogVisible"
+      width="600px"
+      center
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <div class="score-dialog-content">
+        <!-- 广东省司价标准 -->
+        <div class="score-table">
+          <div class="score-header">广东省司价标准</div>
+          <div class="score-content">
+            (一: 900 分以上, 前四类 85%; 二: 800 分以上,前四类 75%; 三: 700 分以上,前四类 65%;
+            不达标 700 分以下, 前四类 65%)
+          </div>
+        </div>
+
+        <!-- 奖惩措施管理 -->
+        <div class="score-table">
+          <div class="score-header">奖惩措施管理</div>
+          <div class="score-content">
+            <!-- Empty content as per the example -->
+          </div>
+        </div>
+
+        <!-- 奖励机制和惩处措施表格 -->
+        <div class="score-table-grid">
+          <div class="grid-header">奖励机制</div>
+          <div class="grid-content">111</div>
+          <div class="grid-header">惩处措施</div>
+          <div class="grid-content"></div>
+        </div>
+      </div>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" class="submit-btn" @click="dialogVisible = false">提交</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -737,6 +800,7 @@ export default {
         3: "审核通过",
         4: "已备案",
       },
+      dialogVisible: false,
     };
   },
   computed: {},
@@ -756,6 +820,11 @@ export default {
     });
   },
   methods: {
+    handleIncentive(){
+      console.log(111)
+      this.dialogVisible = true;
+    },
+
     diffScore(name, value) {
       // console.log("value", name, value);
       var rep = new RegExp("^[0-9]*[1-9][0-9]*$");
@@ -1136,4 +1205,70 @@ export default {
     }
   }
 }
+.score-dialog-content {
+  padding: 5px;
+}
+
+.score-table {
+  border: 1px solid #dcdfe6;
+  margin-bottom: 20px;
+}
+
+.score-header {
+  font-weight: bold;
+  padding: 10px;
+  border-bottom: 1px solid #dcdfe6;
+  background-color: #f5f7fa;
+}
+
+.score-content {
+  padding: 10px;
+  min-height: 30px;
+}
+
+.score-table-grid {
+  display: grid;
+  grid-template-columns: 100px 1fr;
+  border: 1px solid #dcdfe6;
+}
+
+.grid-header {
+  padding: 10px;
+  font-weight: bold;
+  border-bottom: 1px solid #dcdfe6;
+  border-right: 1px solid #dcdfe6;
+  background-color: #f5f7fa;
+}
+
+.grid-header:last-of-type {
+  border-top: 1px solid #dcdfe6;
+}
+
+.grid-content {
+  padding: 10px;
+  min-height: 30px;
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.grid-content:last-of-type {
+  border-top: 1px solid #dcdfe6;
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.submit-btn {
+  background-color: #ffeb3b;
+  border-color: #ffeb3b;
+  color: black;
+}
+
+.submit-btn:hover {
+  background-color: #ffe500;
+  border-color: #ffe500;
+  color: black;
+}
+
 </style>

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

@@ -9,7 +9,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="闸门数量" prop="holesNumber">
-            <el-input v-model="form.holesNumber" placeholder="请输入闸门数量" />
+            <el-input v-model="form.holesNumber" placeholder="请输入闸门数量" :disabled="detailDsable"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -17,6 +17,7 @@
             <el-input
               v-model="form.hoistNumber"
               placeholder="请输入启闭机数量"
+              :disabled="detailDsable"
             />
           </el-form-item>
         </el-col>
@@ -25,6 +26,7 @@
             <el-select
               v-model="form.gateType"
               placeholder="请选择闸门型式"
+              :disabled="detailDsable"
               style="width: 100%"
             >
               <el-option
@@ -41,6 +43,7 @@
             <el-select
               v-model="form.hoistType"
               placeholder="请选择启闭机型式"
+              :disabled="detailDsable"
               style="width: 100%"
             >
               <el-option
@@ -57,6 +60,7 @@
             <el-input
               v-model="form.evaluate"
               placeholder="请输入闸门和启闭机安全评价"
+              :disabled="detailDsable"
               type="textarea"
             />
           </el-form-item>
@@ -97,6 +101,7 @@
             /> -->
             <el-upload
               class="upload-demo"
+              :disabled="detailDsable"
               :action="uploadUrl"
               :headers="headers"
               :on-preview="handlePreview"
@@ -140,7 +145,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "Aqjc",
-  props: ["dikeName", "dfrwId"],
+  props: ["dikeName", "dfrwId", "detailDsable"],
   data() {
     return {
       // 遮罩层

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

@@ -173,6 +173,12 @@
         fixed="right"
       >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDetial(scope.row)"
+          >查看报告</el-button>
           <el-button
             size="mini"
             type="text"
@@ -215,6 +221,22 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <el-dialog
+      title="查看报告"
+      :visible.sync="openDetial"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+      @close="close"
+    >
+      <listSafetyDetection
+        :dfrwId="dfrwId"
+        :dikeName="dikeName"
+        :detailDsable="detailDsable"
+        @closeParentTabs="closeTabs"
+        @cancelParent="cancel"
+      />
+    </el-dialog>
 
     <!-- 添加或修改堤防鉴定任务关联对话框 -->
     <el-dialog
@@ -379,6 +401,8 @@ export default {
       emTitle: "",
       // 是否显示弹出层
       open: false,
+      openDetial: false,
+      detailDsable: false,
       emOpen: false,
       // 堤防类型字典
       sluiceTypeOptions: [],
@@ -413,6 +437,7 @@ export default {
       // 表单校验
       rules: {},
       dfrwId: "",
+      dikeName:'',
       visible: false,
       remark: "",
     };
@@ -482,6 +507,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openDetial = false;
       // this.reset();
     },
     // 表单重置
@@ -556,6 +582,13 @@ export default {
       this.emOpen = true;
       this.emTitle = "审核安全鉴定信息";
     },
+    handleDetial(row){
+      this.openDetial = true;
+      this.dfrwId = row.id;
+      this.dikeName = row.dikeName;
+      this.detailDsable = true;
+
+    },
   },
 };
 </script>

src/views/sluice/managementGuarantee/standardizationConstruction/dataCharts.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="content">
-    暂无数据
+<!--    暂无数据-->
     <!-- <div ref="pieEle" style="width: 30%; height: 100%"></div> -->
     <!-- <div ref="barEle" style="width: 100%; height: 100%"></div> -->
+    <div ref="barEle" style="width: 100%; height: 100%"></div>
   </div>
 </template>
 <script>
@@ -16,7 +17,7 @@ export default {
     };
   },
   created() {
-    // this.getData();
+    this.getData();
   },
   methods: {
     async getData() {
@@ -26,7 +27,13 @@ export default {
       //   this.pieChartData.push({ value: res1[0][key], name: key });
       // }
 
-      this.barChartData = res2;
+      this.barChartData = {
+        "汕头市": {0: "1", 1: "1",2: '1',3:'1',4:"1",5:'1',6:'1',7:'1'},
+        "佛山市": {0: "1", 1: "1",2: '1',3:'1',4:"1",5:'1',6:'1',7:'1'},
+        "珠海市": {0: "1", 1: "1",2: '1',3:'1',4:"1",5:'1',6:'1',7:'1'},
+        "广州市": {0: "1", 1: "1",2: '1',3:'1',4:"1",5:'1',6:'1',7:'1'},
+        "中山市": {0: "1", 1: "1",2: '1',3:'1',4:"1",5:'1',6:'1',7:'1'},
+      };
       // this.pieInit();
       this.barInit();
       // console.log("pieChartData", this.pieChartData);
@@ -98,9 +105,17 @@ export default {
       // } else {
       option = {
         title: {
-          // text: "World Population",
+          // text: "World Population",38A0FF
         },
-        color: ["#38A0FF", "#4CCA73", "#FBD437"],
+        color: [
+          "#38A0FF",
+          "#4CCA73",
+          "#FBD437",
+          "#e15145",
+          "#da8282",
+          "#bfc4ad",
+          "#8ec996",
+          "#c412bb"],
         tooltip: {
           trigger: "axis",
           axisPointer: {
@@ -155,23 +170,58 @@ export default {
 
         series: [
           {
-            name: "政府部门责任人",
+            name: "节制闸",
             type: "bar",
             data: Object.values(this.barChartData).map((res) => res["0"]),
             barMaxWidth: "10%",
           },
           {
-            name: "主管部门责任人",
+            name: "分(泄)洪闸",
             type: "bar",
             data: Object.values(this.barChartData).map((res) => res["1"]),
             barMaxWidth: "10%",
           },
           {
-            name: "管理单位责任人",
+            name: "排(退)水闸",
             type: "bar",
             data: Object.values(this.barChartData).map((res) => res["2"]),
             barMaxWidth: "10%",
           },
+          {
+            name: "引(进)水闸",
+            type: "bar",
+            data: Object.values(this.barChartData).map((res) => res["3"]),
+            barMaxWidth: "10%",
+          },
+          {
+            name: "橡胶坝",
+            type: "bar",
+            data: Object.values(this.barChartData).map((res) => res["4"]),
+            barMaxWidth: "10%",
+          },
+          {
+            name: "档潮闸",
+            type: "bar",
+            data: Object.values(this.barChartData).map((res) => res["5"]),
+            barMaxWidth: "10%",
+          }, {
+            name: "档潮闸",
+            type: "bar",
+            data: Object.values(this.barChartData).map((res) => res["5"]),
+            barMaxWidth: "10%",
+          },
+          {
+            name: "排(冲)沙闸",
+            type: "bar",
+            data: Object.values(this.barChartData).map((res) => res["6"]),
+            barMaxWidth: "10%",
+          },
+          {
+            name: "船闸",
+            type: "bar",
+            data: Object.values(this.barChartData).map((res) => res["7"]),
+            barMaxWidth: "10%",
+          },
         ],
       };
       // }

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

@@ -10,7 +10,7 @@
         {{ item.routeName }}
       </el-breadcrumb-item>
     </el-breadcrumb>
-<!--    <dataCharts ref="dataCharts" />-->
+    <dataCharts ref="dataCharts" />
     <listPage :chartEleGetData="chartEleGetData" />
   </div>
 </template>