|
|
@@ -1,7 +1,6 @@
|
|
|
<template>
|
|
|
<div class="innerMargin">
|
|
|
- <el-card class="box-card">
|
|
|
-
|
|
|
+ <!-- <el-card class="box-card"> -->
|
|
|
<div class="equipInfo">
|
|
|
<div class="equipMsg">
|
|
|
<span>设备ID：{{ id }}</span>
|
|
|
@@ -20,7 +19,7 @@
|
|
|
>
|
|
|
<el-button
|
|
|
type="blueInfo"
|
|
|
- v-if="!viewSwitch"
|
|
|
+ v-if="!viewSwitch"
|
|
|
@click="viewSwitchFun(true)"
|
|
|
size="mini"
|
|
|
>自动统计</el-button
|
|
|
@@ -74,21 +73,33 @@
|
|
|
</el-row>
|
|
|
</div>
|
|
|
<div class="dataTableSearch">
|
|
|
- <div> </div>
|
|
|
- <!-- <el-button type="blueInfo" size="mini" @click="deriveData()">导出</el-button> -->
|
|
|
+ <div class="sel_box">
|
|
|
+ <div class="img_box">
|
|
|
+ <img src="../../../../static/images/xiangzuo.png" alt="">
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ :class="dataSwitchType == 0 ? 'btn' : 'selectbtn'"
|
|
|
+ @click="dataSwitch(1)"
|
|
|
+ >
|
|
|
+ 详细信息
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ :class="dataSwitchType == 1 ? 'btn' : 'selectbtn'"
|
|
|
+ @click="dataSwitch(0)"
|
|
|
+ >
|
|
|
+ 统计信息
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<el-button
|
|
|
+ class="elbtn"
|
|
|
type="blueInfo"
|
|
|
size="mini"
|
|
|
- v-if="dataSwitchType == 0"
|
|
|
- @click="dataSwitch(1)"
|
|
|
- >详细信息</el-button
|
|
|
- >
|
|
|
- <el-button type="blueInfo" size="mini" v-else @click="dataSwitch(0)"
|
|
|
- >统计信息</el-button
|
|
|
+ @click="deriveData()"
|
|
|
+ >导出</el-button
|
|
|
>
|
|
|
</div>
|
|
|
<!-- 统计信息 -->
|
|
|
- <el-card class="box-card" v-if="dataSwitchType == 0">
|
|
|
+ <el-card class="box-card" style="margin-top: -2px;" v-if="dataSwitchType == 0">
|
|
|
<el-table :data="tableDataB" stripe style="width: 100%">
|
|
|
<el-table-column
|
|
|
v-for="(item, index) in tableHeadTxt"
|
|
|
@@ -134,7 +145,7 @@
|
|
|
</el-card>
|
|
|
|
|
|
<!-- 详细信息 -->
|
|
|
- <el-card class="box-card" v-else>
|
|
|
+ <el-card class="box-card" style="margin-top: -2px;" v-else>
|
|
|
<!-- <el-table :data="tableDataAll" stripe style="width: 100%"> -->
|
|
|
<el-table
|
|
|
:data="tableDataAllB"
|
|
|
@@ -232,7 +243,17 @@
|
|
|
</el-row>
|
|
|
</div>
|
|
|
<div class="dataTableSearch">
|
|
|
- <el-button type="blueInfo" size="mini" @click="deriveData()"
|
|
|
+ <div class="sel_box">
|
|
|
+ <div class="img_box">
|
|
|
+ <img src="../../../../static/images/xiangzuo.png" alt="">
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="btn"
|
|
|
+ >
|
|
|
+ 统计信息
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <el-button type="blueInfo" size="mini" @click="deriveData()" class="elbtn"
|
|
|
>导出</el-button
|
|
|
>
|
|
|
</div>
|
|
|
@@ -288,7 +309,7 @@
|
|
|
</el-card>
|
|
|
|
|
|
<!-- 导出对话框 -->
|
|
|
- <el-dialog title="导出信息" :visible.sync="dialogVisible" width="30%">
|
|
|
+ <el-dialog title="导出信息" :visible.sync="dialogVisible" width="30%" top="20%">
|
|
|
<!-- <span>这是一段信息</span> -->
|
|
|
|
|
|
<!-- 下拉框和输入框 -->
|
|
|
@@ -323,7 +344,9 @@
|
|
|
</div>
|
|
|
</li>
|
|
|
<li class="iptList" v-show="timeShow">
|
|
|
- <div class="iptTxt"><span style="color: red">*</span>时间段：</div>
|
|
|
+ <div class="iptTxt">
|
|
|
+ <span style="color: red">*</span>时间段：
|
|
|
+ </div>
|
|
|
<div class="iptBox">
|
|
|
<el-date-picker
|
|
|
v-model="value2"
|
|
|
@@ -347,20 +370,28 @@
|
|
|
</div>
|
|
|
|
|
|
<!-- 导出对话框 -->
|
|
|
- <el-dialog title="导出信息" :visible.sync="dialogVisible" width="30%">
|
|
|
+ <el-dialog title="导出信息" :visible.sync="dialogVisible" width="30%" top="20%">
|
|
|
<!-- <span>这是一段信息</span> -->
|
|
|
|
|
|
<!-- 下拉框和输入框 -->
|
|
|
<ul class="iptUl">
|
|
|
<li class="iptList">
|
|
|
- <div class="iptTxt"><span style="color: red">*</span>文件名称：</div>
|
|
|
+ <div class="iptTxt">
|
|
|
+ <span style="color: red">*</span>文件名称：
|
|
|
+ </div>
|
|
|
<div class="iptBox">
|
|
|
- <el-input placeholder="请输入文件的名称" v-model="value" clearable>
|
|
|
+ <el-input
|
|
|
+ placeholder="请输入文件的名称"
|
|
|
+ v-model="value"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</div>
|
|
|
</li>
|
|
|
<li class="iptList">
|
|
|
- <div class="iptTxt"><span style="color: red">*</span>下载类型：</div>
|
|
|
+ <div class="iptTxt">
|
|
|
+ <span style="color: red">*</span>下载类型：
|
|
|
+ </div>
|
|
|
<div class="iptBox">
|
|
|
<el-select v-model="value1" placeholder="请选择">
|
|
|
<el-option
|
|
|
@@ -494,7 +525,9 @@
|
|
|
|
|
|
<div>
|
|
|
<div
|
|
|
- :class="enlargementImg == false ? 'enlargementDiv' : 'discernResult'"
|
|
|
+ :class="
|
|
|
+ enlargementImg == false ? 'enlargementDiv' : 'discernResult'
|
|
|
+ "
|
|
|
>
|
|
|
<div class="name">
|
|
|
<i class="icon-zhuti_tiaosepan_o iconfont"></i>
|
|
|
@@ -547,7 +580,9 @@
|
|
|
<div>
|
|
|
<div
|
|
|
:class="
|
|
|
- enlargementImg == false ? 'enlargementDiv' : 'discernResult'
|
|
|
+ enlargementImg == false
|
|
|
+ ? 'enlargementDiv'
|
|
|
+ : 'discernResult'
|
|
|
"
|
|
|
>
|
|
|
<div class="name">
|
|
|
@@ -594,7 +629,7 @@
|
|
|
<!-- 网格 -->
|
|
|
<div id="reseau"></div>
|
|
|
<!-- 网格 -->
|
|
|
- </el-card>
|
|
|
+ <!-- </el-card> -->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -743,8 +778,8 @@ Viewer.setDefaults({
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- id:this.$store.state.cbd_pest_id,
|
|
|
- d_id:this.$store.state.cbd_pest_did,
|
|
|
+ id: this.$store.state.cbd_pest_id,
|
|
|
+ d_id: this.$store.state.cbd_pest_did,
|
|
|
btnSelected: "2",
|
|
|
allPest: [],
|
|
|
options: {},
|
|
|
@@ -1029,17 +1064,17 @@ export default {
|
|
|
},
|
|
|
series: [
|
|
|
{
|
|
|
- type: 'column',
|
|
|
+ type: "column",
|
|
|
name: ChartData[0].name,
|
|
|
data: ChartData[0].dat,
|
|
|
},
|
|
|
{
|
|
|
- type: 'column',
|
|
|
+ type: "column",
|
|
|
name: ChartData[1].name,
|
|
|
data: ChartData[1].dat,
|
|
|
},
|
|
|
{
|
|
|
- type: 'spline',
|
|
|
+ type: "spline",
|
|
|
name: ChartData[2].name,
|
|
|
data: ChartData[2].dat,
|
|
|
},
|
|
|
@@ -1089,7 +1124,7 @@ export default {
|
|
|
};
|
|
|
arr.push(o);
|
|
|
arrA.push([percentage[i].name_num, percentage[i].sum]);
|
|
|
- console.log(arrA)
|
|
|
+ console.log(arrA);
|
|
|
}
|
|
|
this.chartPieInit(arrA);
|
|
|
this.gainInsect(arr); //获取下拉框害虫种类
|
|
|
@@ -1288,8 +1323,7 @@ export default {
|
|
|
});
|
|
|
this.$axios({
|
|
|
method: "POST",
|
|
|
- url:
|
|
|
- "/api/api_gateway?method=forecast.worm_lamp.pest_statistics_list_old",
|
|
|
+ url: "/api/api_gateway?method=forecast.worm_lamp.pest_statistics_list_old",
|
|
|
data: this.qs.stringify({
|
|
|
device_id: this.d_id,
|
|
|
page: this.queryInfo.page,
|
|
|
@@ -1385,8 +1419,7 @@ export default {
|
|
|
that
|
|
|
.$axios({
|
|
|
method: "post",
|
|
|
- url:
|
|
|
- "/api/api_gateway?method=forecast.worm_lamp.pest_manual_statistics",
|
|
|
+ url: "/api/api_gateway?method=forecast.worm_lamp.pest_manual_statistics",
|
|
|
data: postData,
|
|
|
})
|
|
|
.then((res) => {
|
|
|
@@ -1527,8 +1560,7 @@ export default {
|
|
|
that
|
|
|
.$axios({
|
|
|
method: "post",
|
|
|
- url:
|
|
|
- "/api/api_gateway?method=forecast.worm_lamp.pest_manual_statistics",
|
|
|
+ url: "/api/api_gateway?method=forecast.worm_lamp.pest_manual_statistics",
|
|
|
data: postData,
|
|
|
})
|
|
|
.then((res) => {
|
|
|
@@ -1732,7 +1764,7 @@ export default {
|
|
|
this.imagepopShow = false;
|
|
|
this.currentImage = row.img;
|
|
|
this.$nextTick(() => {
|
|
|
- if(row.mark){
|
|
|
+ if (row.mark) {
|
|
|
this.renderData(JSON.parse(row.mark));
|
|
|
}
|
|
|
});
|
|
|
@@ -2085,10 +2117,44 @@ export default {
|
|
|
|
|
|
.dataTableSearch {
|
|
|
display: flex;
|
|
|
+ background-color: #f4f4f4;
|
|
|
justify-content: space-between;
|
|
|
- margin: 20px 0;
|
|
|
- .el-input__inner {
|
|
|
- width: 222px;
|
|
|
+ z-index: 9;
|
|
|
+ position: relative;
|
|
|
+ .sel_box {
|
|
|
+ display: flex;
|
|
|
+ height: 40px;
|
|
|
+ padding-top: 2px;
|
|
|
+ box-sizing: border-box;
|
|
|
+ .img_box{
|
|
|
+ height: 38px;
|
|
|
+ line-height: 38px;
|
|
|
+ width: 26px;
|
|
|
+ text-align: center;
|
|
|
+ }
|
|
|
+ .btn {
|
|
|
+ width: 100px;
|
|
|
+ height: 38px;
|
|
|
+ line-height: 38px;
|
|
|
+ text-align: center;
|
|
|
+ color: #7e7e7e;
|
|
|
+ }
|
|
|
+ .selectbtn {
|
|
|
+ width: 100px;
|
|
|
+ height: 38px;
|
|
|
+ line-height: 38px;
|
|
|
+ text-align: center;
|
|
|
+ color: #46b8f4;
|
|
|
+ background-color: #fff;
|
|
|
+ box-shadow: 0px -3px 5px #ececec;
|
|
|
+ border-top-left-radius: 5px;
|
|
|
+ border-top-right-radius: 5px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .elbtn{
|
|
|
+ height: 25px;
|
|
|
+ width: 50px;
|
|
|
+ margin: 10px 10px 0 0;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -2275,17 +2341,17 @@ export default {
|
|
|
|
|
|
|
|
|
<style lang="less">
|
|
|
-.el-table .warning-row {
|
|
|
- background: oldlace !important;
|
|
|
+.el-table .el-table__header-wrapper .has-gutter tr th{
|
|
|
+ background-color: #232733 !important;
|
|
|
}
|
|
|
|
|
|
-.el-table .success-row {
|
|
|
- background: #f0f9eb;
|
|
|
-}
|
|
|
+// .el-table .success-row {
|
|
|
+// background: #f0f9eb;
|
|
|
+// }
|
|
|
|
|
|
-.el-table--striped .el-table__body tr.el-table__row--striped td {
|
|
|
- background: 0 !important;
|
|
|
-}
|
|
|
+// .el-table--striped .el-table__body tr.el-table__row--striped td {
|
|
|
+// background: 0 !important;
|
|
|
+// }
|
|
|
|
|
|
// 修改手动标注弹框的鼠标样式
|
|
|
.vmr-ai-raw-image-mask {
|
