|
|
@@ -1,10 +1,6 @@
|
|
|
<template>
|
|
|
<div>
|
|
|
- <MapList
|
|
|
- :list-data="data_yzc"
|
|
|
- @itemClick="handlePickYzc"
|
|
|
- @open="detailShow = false"
|
|
|
- />
|
|
|
+ <MapList :list-data="data_yzc" @itemClick="handlePickYzc" @open="detailShow = false" />
|
|
|
<div class="c-left">
|
|
|
<div>
|
|
|
<span class="box-title1">动物出入栏情况</span>
|
|
|
@@ -12,19 +8,18 @@
|
|
|
</div>
|
|
|
<div class="cl-b1">
|
|
|
<div class="l1-row1">
|
|
|
-<!-- <span>{{ data_clb1.total }}</span>-->
|
|
|
+ <!-- <span>{{ data_clb1.total }}</span>-->
|
|
|
<span>{{ data_yzc_total.length }}</span>
|
|
|
<span class="text-28">家</span>
|
|
|
</div>
|
|
|
<ul class="l1-row2">
|
|
|
-<!-- <li v-for="item in data_clb1.list" :key="item.name" @click="changeDwfyType(item)">-->
|
|
|
+ <!-- <li v-for="item in data_clb1.list" :key="item.name" @click="changeDwfyType(item)">-->
|
|
|
<li v-for="item in data_clb1.list" :key="item.name">
|
|
|
- <img :src="currentDwfyType===item.name?item.pic2:item.pic" alt="" />
|
|
|
+ <img :src="currentDwfyType === item.name ? item.pic2 : item.pic" alt="" />
|
|
|
<div>
|
|
|
<span class="text-28">{{ item.name }}</span>
|
|
|
<div>
|
|
|
- <span class="text-emp-36">{{ item.count }}</span
|
|
|
- ><span class="text-28">家</span>
|
|
|
+ <span class="text-emp-36">{{ item.count }}</span><span class="text-28">家</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</li>
|
|
|
@@ -33,25 +28,19 @@
|
|
|
<span class="box-title2">经营主体分析</span>
|
|
|
<div class="cl-b2">
|
|
|
<ul>
|
|
|
- <li
|
|
|
- v-for="item in data_clb2"
|
|
|
- :class="{ 'highlight-tr': currentOrg.orgid === item.orgid }"
|
|
|
- :key="item.orgid"
|
|
|
- @click="openDetail(item)"
|
|
|
- >
|
|
|
+ <li v-for="item in data_clb2" :class="{ 'highlight-tr': currentOrg.orgid === item.orgid }" :key="item.orgid"
|
|
|
+ @click="openDetail(item)">
|
|
|
<div class="l2-row1">
|
|
|
<span :title="item.orgname">{{ item.orgname }}</span>
|
|
|
<div>
|
|
|
- <span>当前存栏：</span
|
|
|
- ><span class="text-emp-36" :title="item.num">{{
|
|
|
- item.num
|
|
|
- }}</span>
|
|
|
-<!-- <span>只/头</span>-->
|
|
|
+ <span>当前存栏：</span><span class="text-emp-36" :title="item.num">{{
|
|
|
+ item.num
|
|
|
+ }}</span>
|
|
|
+ <!-- <span>只/头</span>-->
|
|
|
</div>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <span>地址：</span
|
|
|
- ><span :title="item.address">{{ item.address }}</span>
|
|
|
+ <span>地址：</span><span :title="item.address">{{ item.address }}</span>
|
|
|
</div>
|
|
|
</li>
|
|
|
</ul>
|
|
|
@@ -65,35 +54,26 @@
|
|
|
<div class="t2-row1">
|
|
|
<span class="text-28">{{ item.name + item.append + ")" }}</span>
|
|
|
<div>
|
|
|
- <span class="text-emp-36">{{ item.current }}</span
|
|
|
- ><span class="text-emp-36">/{{ item.total }}</span
|
|
|
- ><span class="text-28">万头</span>
|
|
|
+ <span class="text-emp-36">{{ item.current }}</span><span class="text-emp-36">/{{ item.total
|
|
|
+ }}</span><span class="text-28">万头</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="t2-row2">
|
|
|
<img src="@/assets/imgs/deck/page_znfx/bell-green.png" alt="" />
|
|
|
<div class="percent-bar">
|
|
|
<div class="pb-bg">
|
|
|
- <div
|
|
|
- class="pb-value"
|
|
|
- :style="
|
|
|
- 'width:' +
|
|
|
- Math.round((item.current / item.total) * 100) +
|
|
|
- '%;'
|
|
|
- "
|
|
|
- ></div>
|
|
|
+ <div class="pb-value" :style="'width:' +
|
|
|
+ Math.round((item.current / item.total) * 100) +
|
|
|
+ '%;'
|
|
|
+ "></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div
|
|
|
- class="cll-percent"
|
|
|
- :class="{
|
|
|
- red: Math.round((item.current / item.total) * 100) < 95,
|
|
|
- }"
|
|
|
- >
|
|
|
+ <div class="cll-percent" :class="{
|
|
|
+ red: Math.round((item.current / item.total) * 100) < 95,
|
|
|
+ }">
|
|
|
<span class="text-emp-36">{{
|
|
|
- Math.round((item.current / item.total) * 100)
|
|
|
- }}</span
|
|
|
- ><span class="text-emp-18">%</span>
|
|
|
+ Math.round((item.current / item.total) * 100)
|
|
|
+ }}</span><span class="text-emp-18">%</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</li>
|
|
|
@@ -109,14 +89,9 @@
|
|
|
</ul>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div
|
|
|
- v-if="detailShow"
|
|
|
- class="jyzt-detail panel-default"
|
|
|
- :class="{ 'l-1740': true }"
|
|
|
- >
|
|
|
+ <div v-if="detailShow" class="jyzt-detail panel-default" :class="{ 'l-1740': true }">
|
|
|
<header>
|
|
|
- <span>{{ currentOrg.orgname }}</span
|
|
|
- ><i @click="closeDetail"></i>
|
|
|
+ <span>{{ currentOrg.orgname }}</span><i @click="closeDetail"></i>
|
|
|
</header>
|
|
|
<main>
|
|
|
<el-row>
|
|
|
@@ -132,7 +107,7 @@
|
|
|
<span class="text-28">当前存栏</span>
|
|
|
<div class="l1-row1">
|
|
|
<span class="text-emp-36">{{ currentOrg.num }}</span>
|
|
|
- <span class="text-28">{{currentJyztUnit}}</span>
|
|
|
+ <span class="text-28">{{ currentJyztUnit }}</span>
|
|
|
</div>
|
|
|
<ul>
|
|
|
<li v-for="item in detailData.dqcl" :key="item.small_type_name">
|
|
|
@@ -175,11 +150,7 @@
|
|
|
<span class="lr-date">{{ item.declare_time }}</span>
|
|
|
<span>{{ `${item.name}(${item.house_name})` }}</span>
|
|
|
</div>
|
|
|
- <span
|
|
|
- class="lr-state"
|
|
|
- :class="{ warning: item.state === '未受理' }"
|
|
|
- >{{ item.state }}</span
|
|
|
- >
|
|
|
+ <span class="lr-state" :class="{ warning: item.state === '未受理' }">{{ item.state }}</span>
|
|
|
</div>
|
|
|
<div class="li-row">
|
|
|
<span>批号：{{ item.batch_num }}</span>
|
|
|
@@ -198,7 +169,7 @@
|
|
|
<span class="lr-state">{{ item.period }}</span>
|
|
|
</div>
|
|
|
<div class="li-row">
|
|
|
- <span>免疫数量：{{ item.immune_num + currentJyztUnit}}</span>
|
|
|
+ <span>免疫数量：{{ item.immune_num + currentJyztUnit }}</span>
|
|
|
<div class="lr-ym">
|
|
|
<span :title="item.ym_name">{{ item.ym_name }}</span>
|
|
|
<span>{{ item.using_dose + item.unit }}</span>
|
|
|
@@ -228,19 +199,9 @@
|
|
|
<!-- popper-class="select-default-popper">-->
|
|
|
<!-- <el-option v-for="item in yearArr" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
|
|
|
<!-- </el-select>-->
|
|
|
- <el-select
|
|
|
- v-model="month_id"
|
|
|
- @change="getTopInfoAnimal"
|
|
|
- placeholder="月份"
|
|
|
- class="select-default"
|
|
|
- popper-class="select-default-popper"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in yearArr"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="month_id" @change="getTopInfoAnimal" placeholder="月份" class="select-default"
|
|
|
+ popper-class="select-default-popper">
|
|
|
+ <el-option v-for="item in yearArr" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
<div class="cr-b2">
|
|
|
@@ -249,30 +210,23 @@
|
|
|
<ul class="s-wrapper" id="scroll-dwjy">
|
|
|
<template v-for="item in listData_crb2">
|
|
|
<li :key="item.name" v-if="item.value">
|
|
|
- <img :src="item.img" alt=""><div class="text-28">{{ item.name }}</div>
|
|
|
+ <img :src="item.img" alt="">
|
|
|
+ <div class="text-28">{{ item.name }}</div>
|
|
|
<div class="text-emp-36">当月:{{ item.value }}</div>
|
|
|
-<!-- <div class="text-emp-36">累计:{{ item.value }}</div>-->
|
|
|
+ <!-- <div class="text-emp-36">累计:{{ item.value }}</div>-->
|
|
|
</li>
|
|
|
</template>
|
|
|
</ul>
|
|
|
</div>
|
|
|
<span class="box-title2">主体免疫记录</span>
|
|
|
<div class="filter-div">
|
|
|
- <span class="button-default" @click="isDialogIsShow = true"
|
|
|
- >查看全部</span
|
|
|
- >
|
|
|
+ <span class="button-default" @click="isDialogIsShow = true">查看全部</span>
|
|
|
</div>
|
|
|
<ul class="cr-b3">
|
|
|
- <li
|
|
|
- v-for="(item, index) in filterlistData_crb3"
|
|
|
- :key="index"
|
|
|
- class="text-28"
|
|
|
- @click="ztmyjlHighlight(item)"
|
|
|
- :class="{ 'highlight-tr': currentOrgRight === item }"
|
|
|
- >
|
|
|
+ <li v-for="(item, index) in filterlistData_crb3" :key="index" class="text-28" @click="ztmyjlHighlight(item)"
|
|
|
+ :class="{ 'highlight-tr': currentOrgRight === item }">
|
|
|
<div>
|
|
|
- <span :title="item.orgname">{{ item.orgname }}</span
|
|
|
- ><span>{{ item.register_time }}</span>
|
|
|
+ <span :title="item.orgname">{{ item.orgname }}</span><span>{{ item.register_time }}</span>
|
|
|
</div>
|
|
|
<div>
|
|
|
<span>畜种：{{ item.xz_name }}</span>
|
|
|
@@ -281,8 +235,8 @@
|
|
|
<span>数量：</span>
|
|
|
<span class="text-emp-36">{{ item.immune_num }}</span>
|
|
|
<span>{{ (item.xz_name.indexOf('猪') !== -1 || item.xz_name.indexOf('牛') !== -1) ? "头" :
|
|
|
- (item.xz_name.indexOf('鸡') !== -1 || item.xz_name.indexOf('鸽') !== -1) ? "羽" :
|
|
|
- item.xz_name.indexOf('羊') !== -1 ? "只" : ""
|
|
|
+ (item.xz_name.indexOf('鸡') !== -1 || item.xz_name.indexOf('鸽') !== -1) ? "羽" :
|
|
|
+ item.xz_name.indexOf('羊') !== -1 ? "只" : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -297,7 +251,7 @@
|
|
|
// import {setWhhcl } from '@/echarts/options'
|
|
|
import MapList from "@/components/MapList.vue";
|
|
|
import { getLayerByName } from "@/utils/data/all-layer-info";
|
|
|
-import {addLayer, layerControlNew, layerQueryGet, positionByPoint} from "@/utils/map/AddLayer";
|
|
|
+import { addLayer, layerControlNew, layerQueryGet, positionByPoint } from "@/utils/map/AddLayer";
|
|
|
import { myBridge } from "@/utils/map/map";
|
|
|
import {
|
|
|
GetNfmzcll,
|
|
|
@@ -313,10 +267,10 @@ import {
|
|
|
getAnimalFyJg,
|
|
|
} from "@/services/znfx";
|
|
|
import { setDecimal } from "@/utils/math";
|
|
|
-import {loginAnimal} from "@/services/user";
|
|
|
+import { loginAnimal } from "@/services/user";
|
|
|
import DwmyqdDialog from "@/views/deck/pages/zhcj_sub/DwmyqdDialog.vue";
|
|
|
-import {mapState} from "vuex";
|
|
|
-import {formatDateFun} from "@/utils/date";
|
|
|
+import { mapState } from "vuex";
|
|
|
+import { formatDateFun } from "@/utils/date";
|
|
|
// import {setCookie} from "@/utils/cookie";
|
|
|
|
|
|
let listen;
|
|
|
@@ -394,16 +348,16 @@ export default {
|
|
|
],
|
|
|
chartData_crb1: [],
|
|
|
listData_crb2: [
|
|
|
- { name: '猪(头)',name2:'猪', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-zhu.png')},
|
|
|
- { name: '牛(头)',name2:'牛', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-niu.png')},
|
|
|
- { name: '羊(只)',name2:'羊', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-yang.png')},
|
|
|
- { name: '鸡(羽)',name2:'鸡', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-ji.png')},
|
|
|
- { name: '鸽(羽)',name2:'鸽', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-ge.png')},
|
|
|
- { name: '鸭(羽)',name2:'鸭', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-ya.png')},
|
|
|
- { name: '鹅(羽)',name2:'鹅', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-e.png')},
|
|
|
- { name: '马(匹)',name2:'马', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-ma.png')},
|
|
|
- { name: '兔(只)',name2:'兔', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-tu.png')},
|
|
|
- { name: '犬(只)',name2:'犬', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-quan.png')},
|
|
|
+ { name: '猪(头)', name2: '猪', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-zhu.png') },
|
|
|
+ { name: '牛(头)', name2: '牛', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-niu.png') },
|
|
|
+ { name: '羊(只)', name2: '羊', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-yang.png') },
|
|
|
+ { name: '鸡(羽)', name2: '鸡', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-ji.png') },
|
|
|
+ { name: '鸽(羽)', name2: '鸽', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-ge.png') },
|
|
|
+ { name: '鸭(羽)', name2: '鸭', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-ya.png') },
|
|
|
+ { name: '鹅(羽)', name2: '鹅', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-e.png') },
|
|
|
+ { name: '马(匹)', name2: '马', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-ma.png') },
|
|
|
+ { name: '兔(只)', name2: '兔', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-tu.png') },
|
|
|
+ { name: '犬(只)', name2: '犬', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-quan.png') },
|
|
|
// { name: '猫(只)',name2:'猫', value: 0, img: require('@/assets/imgs/deck/page_znfx/animal-jy-mao.png')},
|
|
|
],
|
|
|
listData_crb3: [],
|
|
|
@@ -428,14 +382,15 @@ export default {
|
|
|
currentOrg: {},
|
|
|
currentOrgRight: null,
|
|
|
currentDwfyType: "",
|
|
|
- currentJyztUnit: ""
|
|
|
+ currentJyztUnit: "",
|
|
|
+ flag:false
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
...mapState({
|
|
|
- allTownArr:'allTownArr'
|
|
|
+ allTownArr: 'allTownArr'
|
|
|
}),
|
|
|
- filterlistData_crb3(){
|
|
|
+ filterlistData_crb3() {
|
|
|
return this.listData_crb3.filter(item => {
|
|
|
// return item.orgname && this.data_yzc.find(i => i.name.includes(item.orgname))
|
|
|
// return item.regionname.includes('崇明区')
|
|
|
@@ -448,9 +403,10 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.getLastSixMonth();
|
|
|
-
|
|
|
+ // this.$bus.$emit('allAni',this.data_legend[this.current].isOnAll)
|
|
|
+
|
|
|
this.initMap();
|
|
|
-
|
|
|
+console.log(999999999999999,this.data_yzc)
|
|
|
// this.data_clb1.list.forEach((i) => {
|
|
|
// getJyztslfxDw(i.name).then((res) => {
|
|
|
// i.count = res.obj?.list?.length || 0;
|
|
|
@@ -458,6 +414,7 @@ export default {
|
|
|
// console.log("经营主体", res);
|
|
|
// });
|
|
|
// });
|
|
|
+ this.flag =true
|
|
|
|
|
|
loginAnimal().then(() => {
|
|
|
this.getChartTzl();
|
|
|
@@ -467,7 +424,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
methods: {
|
|
|
- ztmyjlHighlight(item){
|
|
|
+ ztmyjlHighlight(item) {
|
|
|
this.currentOrgRight = item
|
|
|
const target = this.data_yzc_total.find((i) => i.name === item.orgname);
|
|
|
positionByPoint(target.x, target.y, true);
|
|
|
@@ -513,8 +470,10 @@ export default {
|
|
|
// this.data_yzc = temp;
|
|
|
this.data_yzc_total = temp;
|
|
|
this.data_yzc = this.data_yzc_total.filter(item => this.dwfyChecked.includes(item.animal_type))
|
|
|
- // console.log(this.data_yzc);
|
|
|
- for(let item of this.data_clb1.list){
|
|
|
+ // if(this.flag){
|
|
|
+ // this.getData_clb2()
|
|
|
+ // }
|
|
|
+ for (let item of this.data_clb1.list) {
|
|
|
item.count = this.data_yzc_total.filter(i => i.animal_type === item.name).length
|
|
|
}
|
|
|
}
|
|
|
@@ -579,7 +538,7 @@ export default {
|
|
|
},
|
|
|
]
|
|
|
}
|
|
|
- addLayer(this.layer_yzc,true,1,'map','1=1',render);
|
|
|
+ addLayer(this.layer_yzc, true, 1, 'map', '1=1', render);
|
|
|
// addLayer(this.layer_yzc,true,1,'map','1=1');
|
|
|
layerQueryGet(
|
|
|
this.layer_yzc.url,
|
|
|
@@ -639,18 +598,18 @@ export default {
|
|
|
let nowMonth = new Date()
|
|
|
let lastMonth = new Date()
|
|
|
lastMonth.setDate(1)
|
|
|
- let time = [formatDateFun(nowMonth,'yyyy-MM-dd'),formatDateFun(lastMonth,'yyyy-MM-dd')]
|
|
|
+ let time = [formatDateFun(nowMonth, 'yyyy-MM-dd'), formatDateFun(lastMonth, 'yyyy-MM-dd')]
|
|
|
getDxfYlIST({
|
|
|
pageIndex: 1,
|
|
|
pageSize: 20000,
|
|
|
- startTime:time[1],
|
|
|
- nowMonth:time[0],
|
|
|
+ startTime: time[1],
|
|
|
+ nowMonth: time[0],
|
|
|
|
|
|
}).then((res) => {
|
|
|
- // .filter(i =>{
|
|
|
- // console.log(i.regionname,'regionname')
|
|
|
- // return i.regionname.includes('崇明区')
|
|
|
- // });
|
|
|
+ // .filter(i =>{
|
|
|
+ // console.log(i.regionname,'regionname')
|
|
|
+ // return i.regionname.includes('崇明区')
|
|
|
+ // });
|
|
|
this.listData_crb3 = res.obj.list
|
|
|
console.log("懂啊撒", res);
|
|
|
});
|
|
|
@@ -677,7 +636,7 @@ export default {
|
|
|
});
|
|
|
let type = res.obj[0].name
|
|
|
this.currentJyztUnit = (type.indexOf('猪') !== -1 || type.indexOf('牛') !== -1) ? "头" :
|
|
|
- (type.indexOf('鸡') !== -1 || type.indexOf('鸽') !== -1) ? "羽" : type.indexOf('羊') !== -1 ? "只" : ""
|
|
|
+ (type.indexOf('鸡') !== -1 || type.indexOf('鸽') !== -1) ? "羽" : type.indexOf('羊') !== -1 ? "只" : ""
|
|
|
}
|
|
|
);
|
|
|
GetDwfyZtStorage(item.orgid).then((res) => {
|
|
|
@@ -688,12 +647,11 @@ export default {
|
|
|
}, 300);
|
|
|
},
|
|
|
handlePickYzc(item) {
|
|
|
- console.log(item);
|
|
|
let pointSearchData = {
|
|
|
data: item,
|
|
|
title: "规模化养殖场"
|
|
|
}
|
|
|
- this.$store.commit('map/changePointSearchInfo',pointSearchData)
|
|
|
+ this.$store.commit('map/changePointSearchInfo', pointSearchData)
|
|
|
positionByPoint(item.x, item.y, true);
|
|
|
},
|
|
|
closeDetail() {
|
|
|
@@ -701,18 +659,29 @@ export default {
|
|
|
},
|
|
|
getData_clb2() {
|
|
|
GetDwfyZtlist(this.currentDwfyType).then((res) => {
|
|
|
- // console.log(res)
|
|
|
- this.data_clb2 = res.obj.list || [];
|
|
|
+ let resList = res.obj.list
|
|
|
+ let orgnameList = []
|
|
|
+ let dataList = []
|
|
|
+ this.data_yzc.forEach((item) => {
|
|
|
+ orgnameList.push(item.name)
|
|
|
+ })
|
|
|
+ resList.filter((i) => {
|
|
|
+ orgnameList.forEach((info) => {
|
|
|
+ if (i.orgname === info) {
|
|
|
+ dataList.push(i)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.data_clb2 = dataList || [];
|
|
|
console.log(res);
|
|
|
});
|
|
|
},
|
|
|
- changeDwfyType(item){
|
|
|
- console.log(item);
|
|
|
+ changeDwfyType(item) {
|
|
|
this.currentDwfyType = this.currentDwfyType === item.name ? "" : item.name
|
|
|
console.log(this.currentDwfyType);
|
|
|
- layerControlNew("gmhyzc",true,1,this.currentDwfyType===""?"1=1":"animal_type = '" + this.currentDwfyType + "'")
|
|
|
+ layerControlNew("gmhyzc", true, 1, this.currentDwfyType === "" ? "1=1" : "animal_type = '" + this.currentDwfyType + "'")
|
|
|
|
|
|
- this.data_yzc = this.currentDwfyType===""?this.data_yzc_total:this.data_yzc_total.filter(item => item.animal_type === this.currentDwfyType)
|
|
|
+ this.data_yzc = this.currentDwfyType === "" ? this.data_yzc_total : this.data_yzc_total.filter(item => item.animal_type === this.currentDwfyType)
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -749,6 +718,23 @@ export default {
|
|
|
},
|
|
|
dwfyChecked() {
|
|
|
this.data_yzc = this.data_yzc_total.filter(item => this.dwfyChecked.includes(item.animal_type))
|
|
|
+ let orgNameList = []
|
|
|
+ let newArr = []
|
|
|
+ this.data_yzc.forEach((item) => {
|
|
|
+ orgNameList.push(item.name)
|
|
|
+ })
|
|
|
+ this.getData_clb2()
|
|
|
+ this.data_clb2.forEach((i) => {
|
|
|
+ orgNameList.forEach((item) => {
|
|
|
+ console.log(i, item)
|
|
|
+ if (i.orgname === item) {
|
|
|
+
|
|
|
+ newArr.push(i)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.data_clb2 = newArr
|
|
|
+ console.log(this.data_clb2, 555555555555)
|
|
|
}
|
|
|
},
|
|
|
beforeDestroy() {
|
|
|
@@ -761,6 +747,16 @@ export default {
|
|
|
// }
|
|
|
// console.log('动物token',res.data.accessToken)
|
|
|
// })
|
|
|
+ },
|
|
|
+ created() {
|
|
|
+ this.$bus.$on('allAni', newData => {
|
|
|
+ // this.data = newData;
|
|
|
+ if (newData) {
|
|
|
+ this.getData_clb2()
|
|
|
+ } else {
|
|
|
+ this.data_clb2 = []
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
};
|
|
|
</script>
|
|
|
@@ -769,22 +765,27 @@ export default {
|
|
|
.c-left {
|
|
|
left: 260px;
|
|
|
}
|
|
|
+
|
|
|
.filter-bt-year {
|
|
|
margin-bottom: 20px;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
+
|
|
|
.select-default {
|
|
|
width: 48%;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.filter-div {
|
|
|
text-align: right;
|
|
|
margin-top: -40px;
|
|
|
+
|
|
|
.button-default {
|
|
|
margin-left: auto;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+
|
|
|
.l1-row1 {
|
|
|
width: 408px;
|
|
|
height: 77px;
|
|
|
@@ -794,6 +795,7 @@ export default {
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
align-items: center;
|
|
|
+
|
|
|
span:first-child {
|
|
|
font-size: 44px;
|
|
|
line-height: 28px;
|
|
|
@@ -802,27 +804,33 @@ export default {
|
|
|
margin-right: 7px;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.cl-b1 {
|
|
|
.l1-row2 {
|
|
|
display: flex;
|
|
|
//justify-content: space-between;
|
|
|
flex-wrap: wrap;
|
|
|
+
|
|
|
li {
|
|
|
width: 33.3%;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
+
|
|
|
//cursor: pointer;
|
|
|
img {
|
|
|
width: 100px;
|
|
|
height: 100px;
|
|
|
}
|
|
|
- & > div {
|
|
|
+
|
|
|
+ &>div {
|
|
|
margin-left: -40px;
|
|
|
- & > span {
|
|
|
+
|
|
|
+ &>span {
|
|
|
display: block;
|
|
|
margin-left: 35px;
|
|
|
}
|
|
|
- & > div {
|
|
|
+
|
|
|
+ &>div {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
width: 160px;
|
|
|
@@ -832,6 +840,7 @@ export default {
|
|
|
margin-top: 14px;
|
|
|
background: url("@/assets/imgs/deck/page_znfx/bg-count.png");
|
|
|
background-size: 100% 100%;
|
|
|
+
|
|
|
.text-emp-36 {
|
|
|
flex: 1;
|
|
|
}
|
|
|
@@ -843,34 +852,40 @@ export default {
|
|
|
|
|
|
.cl-b2 {
|
|
|
margin-bottom: 1vh;
|
|
|
+
|
|
|
ul {
|
|
|
height: 48vh;
|
|
|
width: calc(100% + 20px);
|
|
|
overflow-y: auto;
|
|
|
+
|
|
|
li {
|
|
|
height: 120px;
|
|
|
margin-right: 13px;
|
|
|
box-sizing: border-box;
|
|
|
padding: 16px 18px 16px 28px;
|
|
|
margin-bottom: 15px;
|
|
|
- background: rgba(0,255,213,0.18);
|
|
|
+ background: rgba(0, 255, 213, 0.18);
|
|
|
color: #fff;
|
|
|
font-size: 28px;
|
|
|
line-height: 28px;
|
|
|
cursor: pointer;
|
|
|
+
|
|
|
&:hover {
|
|
|
background: rgba(0, 255, 213, 0.3);
|
|
|
}
|
|
|
+
|
|
|
.l2-row1 {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
margin-bottom: 20px;
|
|
|
- & > div {
|
|
|
+
|
|
|
+ &>div {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
}
|
|
|
- & > span {
|
|
|
+
|
|
|
+ &>span {
|
|
|
width: 60%;
|
|
|
overflow: hidden;
|
|
|
white-space: nowrap;
|
|
|
@@ -886,18 +901,21 @@ export default {
|
|
|
height: 17vh;
|
|
|
width: 100%;
|
|
|
}
|
|
|
-.cl-b2 {
|
|
|
-}
|
|
|
+
|
|
|
+.cl-b2 {}
|
|
|
+
|
|
|
.cl-b4 {
|
|
|
// height: 12vh;
|
|
|
width: calc(100% + 20px);
|
|
|
box-sizing: border-box;
|
|
|
overflow-y: auto;
|
|
|
padding: 0 15px 0 9px;
|
|
|
+
|
|
|
ul {
|
|
|
border-left: 1px solid #03a187;
|
|
|
padding-left: 21px;
|
|
|
}
|
|
|
+
|
|
|
li {
|
|
|
position: relative;
|
|
|
box-sizing: border-box;
|
|
|
@@ -907,6 +925,7 @@ export default {
|
|
|
flex-direction: column;
|
|
|
justify-content: space-between;
|
|
|
padding: 18px 18px 18px 27px;
|
|
|
+
|
|
|
.t2-row1,
|
|
|
.t2-row2,
|
|
|
.o-row1,
|
|
|
@@ -915,11 +934,13 @@ export default {
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
}
|
|
|
+
|
|
|
img {
|
|
|
width: 30px;
|
|
|
height: 30px;
|
|
|
margin-right: 13px;
|
|
|
}
|
|
|
+
|
|
|
&::before {
|
|
|
content: "";
|
|
|
position: absolute;
|
|
|
@@ -931,19 +952,23 @@ export default {
|
|
|
background-color: #03a187;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.top2 {
|
|
|
height: 120px;
|
|
|
+
|
|
|
.t2-row1 {
|
|
|
- & > span {
|
|
|
+ &>span {
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
- & > div {
|
|
|
+
|
|
|
+ &>div {
|
|
|
span:nth-child(2) {
|
|
|
color: #8cff8c;
|
|
|
margin-right: 5px;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.t2-row2 {
|
|
|
.cll-percent {
|
|
|
&.red {
|
|
|
@@ -952,24 +977,26 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.percent-bar {
|
|
|
flex: 1;
|
|
|
box-sizing: border-box;
|
|
|
padding: 8px;
|
|
|
height: 28px;
|
|
|
border: 1px solid rgba($color: #fff, $alpha: 0.3);
|
|
|
+
|
|
|
.pb-bg {
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
background: rgba(105, 191, 170, 0.4);
|
|
|
+
|
|
|
.pb-value {
|
|
|
position: relative;
|
|
|
height: 100%;
|
|
|
- background: linear-gradient(
|
|
|
- 90deg,
|
|
|
- rgba(31, 255, 244, 0.9),
|
|
|
- #a8ff7a
|
|
|
- );
|
|
|
+ background: linear-gradient(90deg,
|
|
|
+ rgba(31, 255, 244, 0.9),
|
|
|
+ #a8ff7a);
|
|
|
+
|
|
|
&::after {
|
|
|
content: "";
|
|
|
position: absolute;
|
|
|
@@ -983,19 +1010,23 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- & > div:last-child {
|
|
|
+
|
|
|
+ &>div:last-child {
|
|
|
width: 93px;
|
|
|
text-align: right;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.others {
|
|
|
height: 110px;
|
|
|
+
|
|
|
.o-row1 {
|
|
|
- & > span:first-child {
|
|
|
+ &>span:first-child {
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.o-row2 {
|
|
|
justify-content: flex-start;
|
|
|
}
|
|
|
@@ -1006,6 +1037,7 @@ export default {
|
|
|
&.l-1740 {
|
|
|
left: 1730px;
|
|
|
}
|
|
|
+
|
|
|
left: 1100px;
|
|
|
top: 330px;
|
|
|
width: 1310px;
|
|
|
@@ -1014,6 +1046,7 @@ export default {
|
|
|
.jd-dqcl {
|
|
|
padding: 30px 0 0 20px;
|
|
|
text-align: center;
|
|
|
+
|
|
|
.l1-row1 {
|
|
|
margin: 20px auto;
|
|
|
}
|
|
|
@@ -1023,6 +1056,7 @@ export default {
|
|
|
overflow-y: auto;
|
|
|
display: flex;
|
|
|
flex-wrap: wrap;
|
|
|
+
|
|
|
li {
|
|
|
height: 50%;
|
|
|
display: flex;
|
|
|
@@ -1030,6 +1064,7 @@ export default {
|
|
|
justify-content: center;
|
|
|
align-items: center;
|
|
|
width: 33%;
|
|
|
+
|
|
|
.text-28 {
|
|
|
margin-bottom: 10px;
|
|
|
}
|
|
|
@@ -1039,12 +1074,14 @@ export default {
|
|
|
|
|
|
.tab-content {
|
|
|
height: 15vh;
|
|
|
+
|
|
|
ul {
|
|
|
box-sizing: border-box;
|
|
|
height: 100%;
|
|
|
overflow-y: auto;
|
|
|
padding-right: 20px;
|
|
|
}
|
|
|
+
|
|
|
li {
|
|
|
height: 160px;
|
|
|
box-sizing: border-box;
|
|
|
@@ -1053,6 +1090,7 @@ export default {
|
|
|
flex-direction: column;
|
|
|
justify-content: space-between;
|
|
|
border-bottom: 1px dashed rgba($color: #00ffd5, $alpha: 0.3);
|
|
|
+
|
|
|
.li-row {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
@@ -1060,6 +1098,7 @@ export default {
|
|
|
font-size: 28px;
|
|
|
color: #fff;
|
|
|
}
|
|
|
+
|
|
|
.lr-date {
|
|
|
display: inline-block;
|
|
|
width: 206px;
|
|
|
@@ -1069,6 +1108,7 @@ export default {
|
|
|
line-height: 54px;
|
|
|
margin-right: 20px;
|
|
|
}
|
|
|
+
|
|
|
.lr-state {
|
|
|
width: 180px;
|
|
|
height: 54px;
|
|
|
@@ -1077,11 +1117,13 @@ export default {
|
|
|
line-height: 54px;
|
|
|
color: #00ffd5;
|
|
|
text-align: center;
|
|
|
+
|
|
|
&.warning {
|
|
|
background: rgba($color: #ffbf00, $alpha: 0.2);
|
|
|
color: #ffbf00;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.lr-ym {
|
|
|
height: 54px;
|
|
|
box-sizing: border-box;
|
|
|
@@ -1089,6 +1131,7 @@ export default {
|
|
|
background: rgba($color: #000000, $alpha: 0.2);
|
|
|
line-height: 54px;
|
|
|
display: flex;
|
|
|
+
|
|
|
span:first-child {
|
|
|
max-width: 500px;
|
|
|
margin-right: 30px;
|
|
|
@@ -1111,40 +1154,49 @@ export default {
|
|
|
.cr-b2 {
|
|
|
margin-bottom: 20px;
|
|
|
position: relative;
|
|
|
+
|
|
|
.s-wrapper {
|
|
|
- .text-emp-36{
|
|
|
+ .text-emp-36 {
|
|
|
font-size: 28px;
|
|
|
}
|
|
|
+
|
|
|
flex-wrap: wrap;
|
|
|
//width: calc(100% - 104px);
|
|
|
margin: 0 auto;
|
|
|
overflow-x: auto;
|
|
|
display: flex;
|
|
|
+
|
|
|
&::-webkit-scrollbar {
|
|
|
display: none;
|
|
|
}
|
|
|
+
|
|
|
li {
|
|
|
flex-shrink: 0;
|
|
|
width: 25%;
|
|
|
text-align: center;
|
|
|
+
|
|
|
img {
|
|
|
width: 125px;
|
|
|
height: 125px;
|
|
|
margin-bottom: -22px;
|
|
|
}
|
|
|
+
|
|
|
.text-28 {
|
|
|
margin-bottom: 7px;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.prev {
|
|
|
left: 0;
|
|
|
background: url("@/assets/imgs/deck/page_znfx/arrow-left.png") no-repeat;
|
|
|
}
|
|
|
+
|
|
|
.next {
|
|
|
right: 0;
|
|
|
background: url("@/assets/imgs/deck/page_znfx/arrow-right.png") no-repeat;
|
|
|
}
|
|
|
+
|
|
|
.prev,
|
|
|
.next {
|
|
|
position: absolute;
|
|
|
@@ -1175,10 +1227,12 @@ export default {
|
|
|
justify-content: space-between;
|
|
|
background: rgba(0, 255, 213, 0.18);
|
|
|
margin-bottom: 20px;
|
|
|
- & > div {
|
|
|
+
|
|
|
+ &>div {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
align-items: center;
|
|
|
+
|
|
|
&:first-child {
|
|
|
span:first-child {
|
|
|
width: 18em;
|
|
|
@@ -1188,6 +1242,7 @@ export default {
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
&:last-child {
|
|
|
div {
|
|
|
display: flex;
|
|
|
@@ -1196,7 +1251,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- .text-emp-36{
|
|
|
+ .text-emp-36 {
|
|
|
margin-right: 5px;
|
|
|
}
|
|
|
}
|
haha_sir