weiz
/
suyuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新细节

This commit is contained in:
yaooo 2023-12-02 10:11:20 +08:00
parent 524749f36f
commit 6d5610db5e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/config/index.ts
View File

@ -2,8 +2,8 @@ const config = {
terminal: 1, //终端 terminal: 1, //终端
title: '后台管理系统', //网站默认标题 title: '后台管理系统', //网站默认标题
version: '1.6.0', //版本号 version: '1.6.0', //版本号
baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名 // baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名
// baseUrl: 'http://127.0.0.1:30005/', baseUrl: 'http://127.0.0.1:30005/',
urlPrefix: 'adminapi', //请求默认前缀 urlPrefix: 'adminapi', //请求默认前缀
timeout: 10 * 1000 //请求超时时长 timeout: 10 * 1000 //请求超时时长
} }

8
admin/src/views/land/index.vue
View File

@ -54,7 +54,7 @@
<el-table-column label="剩余面积" prop="residual_area" show-overflow-tooltip /> <el-table-column label="剩余面积" prop="residual_area" show-overflow-tooltip />
<el-table-column label="土地负责人" prop="master_name" show-overflow-tooltip /> <el-table-column label="土地负责人" prop="master_name" show-overflow-tooltip />
<el-table-column label="负责人电话" prop="master_phone" show-overflow-tooltip /> <el-table-column label="负责人电话" prop="master_phone" show-overflow-tooltip />
<el-table-column label="操作" width="400" align="center" fixed="right"> <el-table-column label="操作" width="360" align="center" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
v-perms="['land.land/edit']" v-perms="['land.land/edit']"
@ -64,14 +64,14 @@
> >
编辑 编辑
</el-button> </el-button>
<el-button <!-- <el-button
v-perms="['land.land/bind']" v-perms="['land.land/bind']"
type="primary" type="primary"
link link
@click="handleBind(row)" @click="handleBind(row)"
> >
绑定产品 绑定产品
</el-button> </el-button> -->
<el-button <el-button
v-perms="['land.product/lists']" v-perms="['land.product/lists']"
type="primary" type="primary"
@ -85,7 +85,7 @@
} }
}" }"
> >
产品信息 产品管理
</router-link> </router-link>
</el-button> </el-button>
<el-button type="primary" link @click="handleDetail(row)" <el-button type="primary" link @click="handleDetail(row)"

2
admin/src/views/product/edit.vue
View File

@ -123,7 +123,7 @@ const queryLand = async (query: string) => {
loading.value = false loading.value = false
if (landList.count > 0) { if (landList.count > 0) {
landOptions.value = landList.lists.map((land: any) => { landOptions.value = landList.lists.map((land: any) => {
return { value: `${land.id}`, label: `ID: ${land.id} / 土地名称: ${land.title}` } return { value: `${land.id}`, label: `ID: ${land.id} / 名称: ${land.title}` }
}) })
} else { } else {
landOptions.value = [] landOptions.value = []

8
admin/src/views/product/index.vue
View File

@ -84,7 +84,7 @@
<span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span> <span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="260" align="center" fixed="right"> <el-table-column label="操作" width="220" align="center" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
v-perms="['land.product/edit']" v-perms="['land.product/edit']"
@ -94,14 +94,14 @@
> >
编辑 编辑
</el-button> </el-button>
<el-button <!-- <el-button
v-perms="['land.product/bind']" v-perms="['land.product/bind']"
type="primary" type="primary"
link link
@click="handleBind(row)" @click="handleBind(row)"
> >
绑定设备 绑定设备
</el-button> </el-button> -->
<el-button v-perms="['device.device/lists']" type="primary" link > <el-button v-perms="['device.device/lists']" type="primary" link >
<router-link <router-link
:to="{ :to="{
@ -111,7 +111,7 @@
} }
}" }"
> >
设备信息 设备管理
</router-link> </router-link>
</el-button> </el-button>
<el-button <el-button