update

src/api/economic/index.js

@@ -503,6 +503,28 @@ const analysisplusCommit = (data) => {
         data: data
     });
 };
+//安措内容分类
+const safetyMeasure = (data) => {
+    return request({
+        url: `consumer/knowledge/workGuideKnowledge/safetyMeasure?pageNum=${data.pageNum}&pageSize=${data.pageSize}&content=${data.content}&rsnum=${data.rsnum}`,
+        method: "get",
+    });
+};
+//危险点内容
+const dangerContent = (data) => {
+    return request({
+        url: `consumer/knowledge/workGuideKnowledge/dangerContent?pageNum=${data.pageNum}&pageSize=${data.pageSize}&content=${data.content}&rsnum=${data.rsnum}`,
+        method: "get",
+    });
+};
+//危险点内容
+const energyDaily = (data) => {
+    return request({
+        url: `/consumer/analysisplus/energyDaily?theday=${data.theday}`,
+        method: "get",
+    });
+};
+
 
 
 export default {
@@ -574,5 +596,8 @@ export default {
     statisticAnalysis,
     analysisplusTjfxlist,
     analysisplusBdzlist,
-    analysisplusCommit
+    analysisplusCommit,
+    safetyMeasure,
+    dangerContent,
+    energyDaily
 }

src/router/index.js

@@ -939,6 +939,19 @@ const routes = [{
 			import('../views/Knowledge/Knowledge4.vue'),
 	},
 	{
+		path: '/others/knowledge/knowledge4/AC', //安措内容分类
+		name: 'knowledgeA',
+		component: () =>
+			import('../views/Knowledge/safety.vue'),
+	},
+	{
+		path: '/others/knowledge/knowledge4/WX', //危险地点内容
+		name: 'knowledgeW',
+		component: () =>
+			import('../views/Knowledge/risk .vue'),
+	},
+
+	{
 		path: '/others/knowledge/knowledge5', //特征参数
 		name: 'knowledge5',
 		component: () =>

src/views/Knowledge/Knowledge4.vue

@@ -13,68 +13,106 @@
         <button class="btn green" @click="onClickSearch">搜索</button>
       </div>
     </div>
-    <div>
-      <ComTable :data="tableData" height="85vh"></ComTable>
+    <div class="K-table">
+      <!-- 表格 -->
+      <el-table
+        stripe
+        :header-cell-style="{
+          height: '40px',
+          background: 'rgba(83, 98, 104, 0.2)',
+          color: '#b2bdc0',
+          'border-bottom': '0px solid red',
+        }"
+        :cell-style="{
+          height: '40px',
+          'border-bottom': 'solid 0px #242424',
+        }"
+        :data="tableData"
+        max-height="90vh"
+        style="width: 100%; margin-bottom: 10px; overflow-y: auto"
+      >
+        <el-table-column
+          align="center"
+          prop="station"
+          label="所属类型"
+          width="180"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="location"
+          label="位置"
+          width="200"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="content"
+          label="工作内容"
+          width="330"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="describe" label="描述">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="addtime"
+          label="添加时间"
+          width="180"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="state" label="状态" width="180">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="operation"
+          label="操作"
+          width="280"
+        >
+          <template #default="scope">
+            <button @click="handleClickAC(scope.row)" class="btn">
+              安措内容分类
+            </button>
+            <button class="btn" @click="handleClickWX(scope.row)">
+              危险地点内容
+            </button>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
   </div>
 </template>
 
 <script>
-import ComTable from "@com/coms/table/table.vue";
 import api from "@api/maintenance/expertKnowledge/index.js";
 
 export default {
-  components: { ComTable },
   data() {
     return {
       content: "",
-      tableData: {
-        column: [
-          {
-            name: "所属类型",
-            field: "station",
-            is_num: true,
-            is_light: false,
-          },
-          {
-            name: "位置",
-            field: "location",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "工作内容",
-            field: "content",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "描述",
-            field: "describe",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "添加时间",
-            field: "addtime",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "状态",
-            field: "state",
-            is_num: false,
-            is_light: false,
-          },
-        ],
-        data: [],
-      },
+      tableData: [],
     };
   },
   created() {
     this.requestSafeList();
   },
   methods: {
+    handleClickAC(row) {
+      this.$router.push({
+        path: "/others/knowledge/knowledge4/AC",
+        query: {
+          rsnum: row.rsnum,
+        },
+      });
+    },
+    handleClickWX(row) {
+      this.$router.push({
+        path: "/others/knowledge/knowledge4/WX",
+        query: {
+          rsnum: row.rsnum,
+        },
+      });
+    },
     // 搜索按钮
     onClickSearch() {
       this.requestSafeList();
@@ -88,35 +126,15 @@ export default {
         })
         .then((res) => {
           if (res.code == 200) {
-            this.tableData.data = [];
+            this.tableData = [];
             res.data.forEach((item) => {
               item.addtime = new Date(item.addtime).formatDate(
                 "yyyy-MM-dd hh:mm:ss"
               );
-              this.tableData.data.push(item);
+              this.tableData.push(item);
             });
           }
         });
-      // let that = this;
-      // this.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.155.32.4:8034/",
-      //   subUrl: "/experienceBase/zyzdzs",
-      //   data: {
-      //     name: that.content,
-      //     pageNum: 1,
-      //     pageSize: 1000,
-      //   }, // 请求所携带参数，默认为空，可缺省
-      //   success(res) {
-      //     if (res.code == 200) {
-      //       that.tableData.data = [];
-      //        res.data.forEach((item) => {
-      //         item.addtime = new Date(item.addtime).formatDate("yyyy-MM-dd hh:mm:ss")
-      //         that.tableData.data.push(item);
-      //       });
-      //     }
-      //   },
-      // });
     },
   },
 };
@@ -133,5 +151,8 @@ export default {
   .el-input {
     width: 200px;
   }
+  .K-table {
+    margin: 20px 20px 0 20px;
+  }
 }
 </style>

src/views/Knowledge/risk .vue

@@ -0,0 +1,122 @@
+<template>
+  <div class="risk">
+    <div class="top">
+      <span class="spa">内容：</span>
+      <el-input v-model="input" class="ipt"></el-input>
+      <button class="btn btn1" @click="search">查询</button>
+      <button class="btn btn2" @click="back">返回</button>
+    </div>
+    <div class="safety-table">
+      <span class="spa1">按错内容分类：</span>
+      <el-table
+        :data="tableData"
+        :header-cell-style="{
+          height: '40px',
+          background: 'rgba(83, 98, 104, 0.2)',
+          color: '#b2bdc0',
+          'border-bottom': '0px solid red',
+        }"
+        :cell-style="{
+          height: '40px',
+          'border-bottom': 'solid 0px #242424',
+        }"
+        style="overflow-y: auto"
+      >
+        <el-table-column type="index" width="100" label="序号" align="center">
+        </el-table-column>
+        <el-table-column prop="title" label="标题" align="center" width="300">
+        </el-table-column>
+        <el-table-column
+          prop="describe"
+          label="描述"
+          align="center"
+          width="500"
+        >
+        </el-table-column>
+        <el-table-column prop="addTime" label="添加时间" align="center">
+        </el-table-column>
+        <el-table-column prop="name" label="负责人" align="center" width="240">
+        </el-table-column>
+        <el-table-column prop="execute " label="内容" align="content">
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import api from "@api/economic/index.js";
+export default {
+  data() {
+    return {
+      tableData: [],
+      input: "",
+    };
+  },
+  created() {
+    this.getList("");
+  },
+  methods: {
+    getList: function (msg) {
+      api
+        .dangerContent({
+          pageNum: 1,
+          pageSize: 200,
+          content: msg,
+          rsnum: this.$route.query.rsnum,
+        })
+        .then((res) => {
+          this.tableData = res.data;
+        });
+    },
+    //查询目标
+    search() {
+      // console.log();
+      this.getList(this.input);
+    },
+    // 返回
+    back() {
+      this.$router.push({
+        path: "/others/knowledge/knowledge4",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.risk {
+  .top {
+    position: relative;
+    margin-top: 30px;
+    .spa {
+      float: left;
+      display: inline-block;
+      margin-top: 10px;
+    }
+    .ipt {
+      float: left;
+      width: 400px;
+      margin-left: 30px;
+    }
+    .btn1,
+    .btn2 {
+      float: left;
+      margin-left: 10px;
+      margin-top: 3px;
+    }
+    .btn1 {
+      margin-left: 60px;
+    }
+  }
+  .safety-table {
+    width: 100%;
+    position: absolute;
+    top: 190px;
+    // margin:20px;
+  }
+  .spa1 {
+    font-size: 20px;
+  }
+}
+</style>

src/views/Knowledge/safety.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="safety">
+    <div class="top">
+      <span class="spa">内容：</span>
+      <el-input v-model="input" class="ipt"></el-input>
+      <button class="btn btn1" @click="search">查询</button>
+      <button class="btn btn2" @click="back">返回</button>
+    </div>
+    <div class="safety-table">
+      <span class="spa1">危险点内容</span>
+      <el-table
+        :data="tableData"
+        :header-cell-style="{
+          height: '40px',
+          background: 'rgba(83, 98, 104, 0.2)',
+          color: '#b2bdc0',
+          'border-bottom': '0px solid red',
+        }"
+        :cell-style="{
+          height: '40px',
+          'border-bottom': 'solid 0px #242424',
+        }"
+        style="overflow-y: auto"
+      >
+        <el-table-column type="index" width="100" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="safecontent"
+          label="安措内容"
+          align="center"
+          width="340"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="describe"
+          label="描述"
+          align="center"
+          width="340"
+        >
+        </el-table-column>
+        <el-table-column prop="sign" label="标记" align="center">
+        </el-table-column>
+        <el-table-column prop="addTime" label="添加时间" align="center">
+        </el-table-column>
+        <el-table-column prop="condition" label="完成情况" align="center">
+        </el-table-column>
+        <el-table-column prop="execute " label="是否执行" align="center">
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import api from "@api/economic/index.js";
+export default {
+  data() {
+    return {
+      input: "",
+      tableData: [],
+    };
+  },
+  created() {
+    this.getList("");
+  },
+  methods: {
+    getList: function (msg) {
+      api
+        .safetyMeasure({
+          pageNum: 1,
+          pageSize: 200,
+          content: msg,
+          rsnum: this.$route.query.rsnum,
+        })
+        .then((res) => {
+          this.tableData = res.data;
+        });
+    },
+    //查询目标
+    search() {
+      // console.log();
+      this.getList(this.input);
+    },
+    // 返回
+    back() {
+      this.$router.push({
+        path: "/others/knowledge/knowledge4",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.safety {
+  .top {
+    position: relative;
+    margin-top: 30px;
+    .spa {
+      float: left;
+      display: inline-block;
+      margin-top: 10px;
+    }
+    .ipt {
+      float: left;
+      width: 400px;
+      margin-left: 30px;
+    }
+    .btn1,
+    .btn2 {
+      float: left;
+      margin-left: 10px;
+      margin-top: 3px;
+    }
+    .btn1 {
+      margin-left: 60px;
+    }
+  }
+  .safety-table {
+    width: 100%;
+    position: absolute;
+    top: 190px;
+    // margin:20px;
+  }
+  .spa1 {
+    font-size: 20px;
+  }
+}
+</style>

src/views/NewPages/daily.vue

@@ -1,63 +1,220 @@
 <template>
   <div class="daily">
-      <h1 class="tit">国电电力河北新能源日报</h1>
-      <div class="daily-table">
-           <el-table
-      :data="tableData"
-      style="width: 100%">
-      <el-table-column
-        prop="date"
-        label="日期"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="姓名"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="address"
-        label="地址">
-      </el-table-column>
-    </el-table>
-      </div>
+    <h1 class="tit">国电电力河北新能源日报</h1>
+    <div class="daily-table">
+      <el-table
+        :header-cell-style="{
+          height: '40px',
+          background: 'rgba(100, 100, 130, 0.2)',
+          color: '#b2bdc0',
+          'border-bottom': '0px solid red',
+        }"
+        :cell-style="{
+          height: '40px',
+          'border-bottom': 'solid 0px #242424',
+        }"
+        :data="tableData"
+        :row-class-name="tableRowClassName"
+      >
+        <el-table-column
+          prop="foreignkeyname"
+          align="center"
+          label="风场名称"
+          width="100"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="speed"
+          align="center"
+          label="平均风速(m/s)"
+          width="91"
+        >
+        </el-table-column>
+        <el-table-column prop="rfdl" align="center" label="日发电量(万KWh)">
+        </el-table-column>
+        <el-table-column
+          prop="yljfdl"
+          align="center"
+          label="月累计发电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="nljfdl"
+          align="center"
+          label="年累计发电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column prop="rswdl" align="center" label="日上网电量(万KWh)">
+        </el-table-column>
+        <el-table-column
+          prop="yljswdl"
+          align="center"
+          label="月上累计网电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="nljswdl"
+          align="center"
+          label="年上累计网电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="zhcydl"
+          align="center"
+          label="综合厂用电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="yljzhcydl"
+          align="center"
+          label="月累计综合厂用电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="scadarfdl"
+          align="center"
+          label="SCADA日发电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="scadayljfdl"
+          align="center"
+          label="SCADA月累计发电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="scadanljfdl"
+          align="center"
+          label="SCADA年累计发电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="scadazhcydl"
+          align="center"
+          label="SCADA综合厂用电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="scadayljzhcydl"
+          align="center"
+          label="SCADA月累计综合厂用电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="scadazhcydl"
+          align="center"
+          label="SCADA综合厂用电率(%)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="rxdssdl"
+          align="center"
+          label="日限电损失电量(KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="yljxdssdl"
+          align="center"
+          label="月累计限电损失电量(万KWh)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="nljxdssdl"
+          align="center"
+          label="年累计限电损失电量(万KWh)"
+        >
+        </el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 
 <script>
+import api from "@api/economic/index.js";
+import { number } from "echarts";
 export default {
-      data() {
-        return {
-          tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }]
-        }
+  data() {
+    return {
+      dateArea: [
+        this.fmtDate(
+          new Date(
+            new Date().setTime(new Date().getTime() - 60 * 60 * 24 * 1000)
+          )
+        ),
+      ],
+      tableData: [],
+    };
+  },
+  created() {
+    // console.log(this.dateArea);
+    this.getList();
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.isWind == 1) {
+        return "warning-row";
       }
-    }
+      return "";
+    },
+    getList: function () {
+      api
+        .energyDaily({
+          theday: this.dateArea[0],
+        })
+        .then((res) => {
+          let newArr = [];
+          for (let key in res.data) {
+            newArr.push(...res.data[key]);
+          }
+          for (let i = 0; i < newArr.length; i++) {
+            if (newArr[i].isWind != "0") {
+              newArr[i].foreignkeyname = newArr[i].foreignkeyname + "（合计）";
+            }
+            for (let key in newArr[i]) {
+              if (typeof newArr[i][key] == "number") {
+                newArr[i][key] = newArr[i][key].toFixed(2);
+              }
+            }
+          }
+          this.tableData = newArr;
+        });
+    },
+    // 格式化日期
+    fmtDate(date) {
+      let curDate = date || new Date();
+      let year = curDate.getFullYear();
+      let mouth = curDate.getUTCMonth() + 1;
+      let day = curDate.getDate();
+      return (
+        year +
+        "-" +
+        (mouth < 10 ? "0" + mouth : mouth) +
+        "-" +
+        (day < 10 ? "0" + day : day)
+      );
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
-.daily{
-.tit{
+/deep/.el-table .warning-row {
+  background: rgb(34, 34, 33);
+}
+
+// /deep/.el-table .success-row {
+//   background: #f0f9eb;
+// }
+.daily {
+  .tit {
     text-align: center;
     color: rgb(131, 121, 121);
-}
-.daily-table{
-     margin: 20px 20px 0 20px;
-}
+  }
+  .daily-table {
+    margin: 20px 20px 0 20px;
+  }
+  .active {
+    background-color: beige;
+  }
 }
 </style>