Web/digital-agriculture-admin
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.109.205.240:3000/Web/digital-agriculture-admin

Browse Source
This commit is contained in:
李想 2025-04-17 14:08:36 +08:00
commit ea3c35afb8
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintrc.js
View File

@ -48,7 +48,7 @@ module.exports = {
'camelcase': [0, {
'properties': 'always'
}],
'comma-dangle': [2, 'never'],
'comma-dangle': [2, 'off'],
'comma-spacing': [2, {
'before': false,
'after': true
@ -183,7 +183,7 @@ module.exports = {
'after': true
}],
'space-before-blocks': [2, 'always'],
'space-before-function-paren': [2, 'never'],
'space-before-function-paren': [2, 'off'],
'space-in-parens': [2, 'never'],
'space-infix-ops': 2,
'space-unary-ops': [2, {

2
src/views/dataV/pageFour/Tree.vue
View File

@ -158,7 +158,7 @@ export default {
//排除掉摄像头
const { rows } = await listDevice({ baseId: this.baseId, isCamera: 0 });
//将设备中包含的产品整理出来
let p = rows.map((item) => ({ ...item, imgUrl: this.$baseUrl + item.productImgUrl.split(',')[1] }));
let p = rows.map((item) => ({ ...item, imgUrl: item.productImgUrl.split(',')[1] }));
this.productList = this._.uniqBy(p, 'productId');
},

2
src/views/iot/device/components/DeviceViewTab/index.vue
View File

@ -2,7 +2,7 @@
<div>
<div class="header">
<div class="left">
<img class="img" :src="$baseUrl + device.imgUrl.split(',')[0]" alt="" />
<img class="img" :src="device.imgUrl.split(',')[0]" alt="" />
</div>
<div class="right">
<div class="name">{{ device && device.deviceName }}</div>

4
src/views/iot/device/index.vue
View File

@ -184,8 +184,8 @@
<el-image
class="height-30"
lazy
:preview-src-list="[baseUrl + row.imgUrl.split(',')[0]]"
:src="baseUrl + row.imgUrl.split(',')[0]"
:preview-src-list="[row.imgUrl.split(',')[0]]"
:src="row.imgUrl.split(',')[0]"
fit="cover"
v-if="row.imgUrl != null && row.imgUrl != ''"
></el-image>

4
src/views/iot/product/index.vue
View File

@ -93,8 +93,8 @@
<el-image
style="height: 100px; border-radius: 10px"
lazy
:preview-src-list="[baseUrl + item.imgUrl.split(',')[0]]"
:src="baseUrl + item.imgUrl.split(',')[0]"
:preview-src-list="[item.imgUrl.split(',')[0]]"
:src="item.imgUrl.split(',')[0]"
fit="cover"
v-if="item.imgUrl != null && item.imgUrl != ''"
></el-image>

2
src/views/trace/sellpro/index.vue
View File

@ -77,7 +77,7 @@
<span class="font-size-20 font-color-main">{{ item.sellproName }}</span>
<span class="font-size-13 font-color-secondary">{{ item.remark }}</span>
</div>
<img :src="image.baseUrl + item.sellproImg" class="width-80 height-80 border-radius-10" alt="" />
<img :src="item.sellproImg" class="width-80 height-80 border-radius-10" alt="" />
</div>
<div class="flex jcsb padding-tb-12 border-bottom-eee">
<span class="font-size-13 font-color-main">产地</span>

4
src/views/trace/shop/index.vue
View File

@ -30,8 +30,8 @@
</el-table-column>
<el-table-column label="店铺图片" align="center" prop="shopImg" width="180">
<template v-slot:default="{ row }">
<div class="image" @click="previewImage(`${image.baseUrl + row.shopImg}`, row)">
<img style="width: 50px; height: 50px" :src="`${image.baseUrl + row.shopImg}`" />
<div class="image" @click="previewImage(row.shopImg, row)">
<img style="width: 50px; height: 50px" :src="row.shopImg" />
</div>
</template>
</el-table-column>