Tony/god-ytr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature_day_1026' into 'main'

Browse Source 
生物多样性修改、视频地址不显示

See merge request likehai/ytr-god!17
This commit is contained in:
王燕 2023-10-26 17:15:29 +08:00
commit f0ac99b95b
4 changed files with 17 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
god-ui/src/views/forest/identify/index.vue
View File

@ -121,7 +121,7 @@
<span>{{ parseTime(scope.row.settingTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="视频地址" align="center" prop="fileUrl" />
<!-- <el-table-column label="视频地址" align="center" prop="fileUrl" />-->
<el-table-column label="设备名称" align="center" prop="equipName" />
<el-table-column label="设备位置" align="center" prop="address" />

2
god-ui/src/views/forest/video/index.vue
View File

@ -122,7 +122,7 @@
<span>{{ parseTime(scope.row.settingTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="视频地址" align="center" prop="fileUrl" />
<!-- <el-table-column label="视频地址" align="center" prop="fileUrl" />-->
<el-table-column label="抓拍图片" align="center" prop="phoneInfo" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.phoneInfo" :width="50" :height="50"/>

72
god-ui/src/views/species/diversity/index.vue
View File

@ -25,38 +25,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="丰富度指数" prop="environment">
<el-input
v-model="queryParams.environment"
placeholder="请输入丰富度指数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="生活习性" prop="habits">-->
<!-- <el-input-->
<!-- v-model="queryParams.habits"-->
<!-- placeholder="请输入生活习性"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="香农多样性指数" prop="levelInfo">-->
<!-- <el-input-->
<!-- v-model="queryParams.levelInfo"-->
<!-- placeholder="请输入香农多样性指数"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="身长大小" prop="height">-->
<!-- <el-input-->
<!-- v-model="queryParams.height"-->
<!-- placeholder="请输入身长大小"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="繁殖方式" prop="reproduction">-->
<!-- <el-input-->
<!-- v-model="queryParams.reproduction"-->
@ -120,16 +88,6 @@
v-hasPermi="['species:info:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['species:info:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -138,9 +96,9 @@
<el-table-column label="物种名称" align="center" prop="speciesName" />
<el-table-column label="物种分类" align="center" prop="classification" />
<el-table-column label="物种数量" align="center" prop="distribution" :show-overflow-tooltip="true"/>
<el-table-column label="丰富度指数" align="center" prop="environment" />
<el-table-column label="辛普森多样性指数" align="center" prop="habits" :show-overflow-tooltip="true"/>
<el-table-column label="香农多样性指数" align="center" prop="levelInfo" />
<el-table-column label="多样性指数" align="center" prop="environment" />
<!-- <el-table-column label="常见类群" align="center" prop="habits" :show-overflow-tooltip="true"/>-->
<!-- <el-table-column label="稀有类群" align="center" prop="levelInfo" />-->
<!-- <el-table-column label="身长大小" align="center" prop="height" :show-overflow-tooltip="true"/>-->
<!-- <el-table-column label="繁殖方式" align="center" prop="reproduction" />-->
<el-table-column label="生物环境质量评估" align="center" prop="remark" :show-overflow-tooltip="true"/>
@ -191,15 +149,15 @@
<el-form-item label="物种数量" prop="distribution">
<el-input v-model="form.distribution" placeholder="请输入物种数量" />
</el-form-item>
<el-form-item label="丰富度指数" prop="environment">
<el-input v-model="form.environment" placeholder="请输入丰富度指数" />
</el-form-item>
<el-form-item label="辛普森多样性指数" prop="habits">
<el-input v-model="form.habits" placeholder="请输入辛普森多样性指数" />
</el-form-item>
<el-form-item label="香农多样性指数" prop="levelInfo">
<el-input v-model="form.levelInfo" placeholder="请输入香农多样性指数" />
<el-form-item label="多样性指数" prop="environment">
<el-input v-model="form.environment" placeholder="请输入多样性指数" type="textarea"/>
</el-form-item>
<!-- <el-form-item label="常见类群" prop="habits">-->
<!-- <el-input v-model="form.habits" placeholder="请输入辛普森多样性指数" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="稀有类群" prop="levelInfo">-->
<!-- <el-input v-model="form.levelInfo" placeholder="请输入香农多样性指数" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="身长大小" prop="height">-->
<!-- <el-input v-model="form.height" placeholder="请输入身长大小" />-->
<!-- </el-form-item>-->
@ -207,11 +165,11 @@
<!-- <el-input v-model="form.reproduction" placeholder="请输入繁殖方式" />-->
<!-- </el-form-item>-->
<el-form-item label="生物环境质量评估" prop="remark">
<el-input v-model="form.remark" placeholder="请输入生物环境质量评估" />
</el-form-item>
<el-form-item label="数据类型" prop="dataType">
<el-input v-model="form.dataType" placeholder="请输入数据类型" />
<el-input v-model="form.remark" placeholder="请输入生物环境质量评估" type="textarea"/>
</el-form-item>
<!-- <el-form-item label="数据类型" prop="dataType">-->
<!-- <el-input v-model="form.dataType" placeholder="请输入数据类型" />-->
<!-- </el-form-item>-->
<el-form-item label="添加时间" prop="addTime">
<el-date-picker clearable
v-model="form.addTime"

3
god-ui/src/views/species/migration/index.vue
View File

@ -206,9 +206,6 @@
<el-form-item label="迁徙特点" prop="remark">
<el-input v-model="form.remark" placeholder="请输入迁徙特点" />
</el-form-item>
<el-form-item label="数据类型" prop="dataType">
<el-input v-model="form.dataType" placeholder="请输入数据类型" />
</el-form-item>
<el-form-item label="添加时间" prop="addTime">
<el-date-picker clearable
v-model="form.addTime"