App/app-govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试bug修改

Browse Source
This commit is contained in:
仲么了
2023-08-17 09:24:59 +08:00
parent 792e1ce7d7
commit 6bc28e4f44
33 changed files with 1066 additions and 826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/project/detail.vue
View File

@@ -23,7 +23,7 @@
<view v-show="navMenuActive == 0">
<uni-card
:title="item.equipmentName"
sub-title="创建时间"
:sub-title="'创建时间：' + item.createTime"
v-for="item in store.data"
:key="item.equipmentId"
@click="goDevice(item)"

6
pages/project/list.vue
View File

@@ -18,11 +18,11 @@
<view class="term-list-bottom">
<view class="term-list-bottom-item">
<view>设备个数</view>
<view>3</view>
<view>{{item.devNum}}</view>
</view>
<view class="term-list-bottom-item">
<view>用户个数</view>
<view>1</view>
<view>创建时间</view>
<view>{{item.createTime}}</view>
</view>
</view>
</uni-card>

84
pages/project/new.vue
View File

@@ -13,7 +13,7 @@
/>
</uni-forms-item>
<uni-forms-item label="项目名称">
<uni-easyinput v-model="formData.name" placeholder="请输入项目名称" />
<uni-easyinput v-model="formData.name" placeholder="请输入项目名称"/>
</uni-forms-item>
<uni-forms-item label="区域">
<view style="display: flex">
@@ -51,7 +51,7 @@
mode="aspectFill"
/>
<view class="temp-choose-content-item-close" @click="deleteImg(index)">
<uni-icons style="font-size: 18px" type="closeempty" color="#fff" size="20" />
<uni-icons style="font-size: 18px" type="closeempty" color="#fff" size="20"/>
</view>
</view>
<view class="temp-choose-content-item" @click="openTemp">
@@ -63,12 +63,13 @@
v-model="formData.files"
title="从本地上传拓扑图"
:sourceType="['album']"
:before-remove="beforeRemove"
@select="select"
></uni-file-picker>
</uni-forms>
</view>
<view class="btn-wrap">
<view class="btn-wrap-item" @click="submit"> 提交 </view>
<view class="btn-wrap-item" @click="submit"> 提交</view>
</view>
<uni-drawer ref="showRight" mode="right" :mask-click="false">
<uni-indexed-list
@@ -81,7 +82,7 @@
<view class="popup-header">
<view class="popup-header-title">模版库</view>
<view class="popup-header-close" @click="closeTemp">
<uni-icons type="closeempty" color="#111" size="20" />
<uni-icons type="closeempty" color="#111" size="20"/>
</view>
</view>
<view class="temp-list">
@@ -89,13 +90,13 @@
class="temp-list-item"
:class="{
'temp-list-item-active': formData.tempFiles.some(
(item2) => item2.id === item.id || item2.topoId === item.id,
(item2) => item2.id === item.id || item2.topoId === item.id,
),
}"
v-for="(item, index) in tempList"
@click="chooseTempItem(item)"
>
<image class="temp-list-item-img" :src="item.filePath" mode="aspectFill" />
<image class="temp-list-item-img" :src="item.filePath" mode="aspectFill"/>
<view class="temp-list-item-name">{{ item.name }}</view>
</view>
</view>
@@ -105,10 +106,11 @@
</Cn-page>
</template>
<script>
import { pinyin } from 'pinyin-pro'
import { addAppProject, updateAppProject } from '../../common/api/project'
import { getTopoTemplate } from '../../common/api/device'
import { queryEngineering } from '@/common/api/engineering.js'
import {pinyin} from 'pinyin-pro'
import {addAppProject, updateAppProject, checkCanDelete} from '../../common/api/project'
import {getTopoTemplate} from '../../common/api/device'
import {queryEngineering} from '@/common/api/engineering.js'
export default {
data() {
return {
@@ -134,7 +136,7 @@ export default {
engineeringListFilter() {
let result = []
this.engineeringList.forEach((item) => {
let arr = pinyin(item.name[0], { toneType: 'none', type: 'array' })
let arr = pinyin(item.name[0], {toneType: 'none', type: 'array'})
let letter = arr[0][0].toUpperCase()
console.log(letter)
let index = result.findIndex((item) => item.letter === letter)
@@ -198,14 +200,38 @@ export default {
})
},
methods: {
deleteImg(index) {
beforeRemove(e) {
console.log(e)
if (!e.tempFile.id) {
return true
}
return new Promise((resolve, reject) => {
checkCanDelete(e.tempFile.id).then((res) => {
console.log(res)
if (res.data) {
resolve(true)
} else {
reject()
}
})
})
},
async deleteImg(index) {
await this.beforeRemove({
tempFile: this.formData.tempFiles[index],
})
this.formData.tempFiles.splice(index, 1)
},
chooseTempItem(item) {
if (this.formData.tempFiles.some((item2) => item2.id === item.id || item2.topoId === item.id)) {
this.formData.tempFiles = this.formData.tempFiles.filter(
(item2) => item2.id !== item.id && item2.topoId !== item.id,
)
async chooseTempItem(item) {
console.log(item)
console.log(this.formData.tempFiles)
// 编辑的时候，如果已经存在就要验证topoId
let index = this.formData.tempFiles.findIndex((item2) => item2.id === item.id || item2.topoId === item.id)
if (index > -1) {
await this.beforeRemove({
tempFile: this.formData.tempFiles[index],
})
this.formData.tempFiles.splice(index, 1)
} else {
this.formData.tempFiles.push(item)
}
@@ -227,8 +253,8 @@ export default {
},
select(e) {
console.log(e)
this.formData.files.push(...e.tempFiles)
console.log(this.formData.files)
this.formData.files = this.formData.files.concat(e.tempFiles)
},
chooseLocation() {
uni.chooseLocation({
@@ -266,19 +292,28 @@ export default {
let item = this.formData.files[i]
console.log(item)
arr.push({
...item,
name: 'files',
uri: item.url,
})
}
this.formData.topoIds = this.formData.tempFiles.map((item) => (item.topoId ? item.topoId : item.id))
console.log(arr)
this.formData.topoIds = this.formData.tempFiles.map((item) => (item.topoId))
let data = JSON.parse(JSON.stringify(this.formData))
delete data.files
let res = {}
console.warn(data, arr)
if (this.project) {
data.id = this.project.id
data.newTopoIds = data.files.filter(item => item.id).map((item) => item.id)
data.newTopoIds.push(...data.tempFiles.filter(item => item.id && item.topoId).map((item) => item.id))
data.topoIds = data.tempFiles.filter(item => item.id && !item.topoId).map((item) => item.id)
delete data.tempFiles
delete data.files
arr = arr.filter(item => !item.id)
res = await updateAppProject(data, arr)
} else {
delete data.tempFiles
delete data.files
res = await addAppProject(data, arr)
}
let result = {}
@@ -341,17 +376,21 @@ export default {
border-radius: 12rpx;
}
}
.temp-choose {
margin-bottom: 44rpx;
.temp-choose-title {
font-size: 14px;
color: #333;
}
.temp-choose-content {
margin-top: 20rpx;
display: grid;
grid-template-columns: repeat(3, 198rpx);
grid-gap: 10rpx;
.temp-choose-content-item {
box-sizing: border-box;
border: 1px #eee solid;
@@ -360,12 +399,14 @@ export default {
align-items: center;
justify-content: center;
height: 198rpx;
.temp-choose-content-item-img {
height: 100%;
width: 100%;
background: skyblue;
display: block;
}
.temp-choose-content-item-close {
display: flex;
align-items: center;
@@ -398,10 +439,12 @@ export default {
position: relative;
box-sizing: border-box;
border: 4px solid #f1f1f1;
.temp-list-item-img {
height: 280rpx;
width: 100%;
}
.temp-list-item-name {
position: absolute;
right: 0;
@@ -409,6 +452,7 @@ export default {
background: #fff;
padding: 4rpx 8rpx;
}
&-active {
border: 4rpx solid $uni-theme-color;
}