【类 型】:fix 默认不显示电量值的bug

【原  因】:showTooltip 返回值 表达式里面 对比值不明确
【过  程】:明确 值是否为0
【影  响】:

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
This commit is contained in:
tk 2024-09-19 11:39:00 +08:00
parent 067a99282d
commit a308ab67c4
2 changed files with 22 additions and 20 deletions

View File

@ -73,7 +73,7 @@ export default {
}, },
// Tooltip // Tooltip
showTooltip () { showTooltip () {
return this.batteryRemainingPower || this.endurance return Number(this.batteryRemainingPower) !== 0 || Number(this.endurance) !== 0
}, },
// () // ()
batteryRemaining () { batteryRemaining () {

View File

@ -90,7 +90,8 @@
<el-input v-model="paramValue" placeholder="值" class="m-t-20"></el-input> <el-input v-model="paramValue" placeholder="值" class="m-t-20"></el-input>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="dialogVisible = false">关闭</el-button> <el-button size="medium" @click="dialogVisible = false">关闭</el-button>
<el-button size="medium" type="primary" @click="publishFun(`{'setParam':{'item':'${paramItem}','value':'${paramValue}'}}`)">写入</el-button> <el-button size="medium" type="primary"
@click="publishFun(`{'setParam':{'item':'${paramItem}','value':'${paramValue}'}}`)">写入</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -138,20 +139,21 @@
icon="f-s-14 iconfont icon-chakanzhihangrizhi" @click="checkQuest"> icon="f-s-14 iconfont icon-chakanzhihangrizhi" @click="checkQuest">
<font class="m-l-5">上传航点</font> <font class="m-l-5">上传航点</font>
</el-button> --> </el-button> -->
<el-button size="mini" class="f-s-14" v-if="Number(plane.planeState.questState) === 1 || Number(plane.planeState.questState) === 4" type="warning" <el-button size="mini" class="f-s-14"
icon="f-s-14 iconfont icon-jiesuo" @click="prepareQuest"> v-if="Number(plane.planeState.questState) === 1 || Number(plane.planeState.questState) === 4"
type="warning" icon="f-s-14 iconfont icon-chakanzhihangrizhi" @click="checkQuest">
<font class="m-l-5">准备任务</font> <font class="m-l-5">准备任务</font>
</el-button> </el-button>
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 2" key="wirteBut" <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 2"
type="info" :loading="true" disabled> key="wirteBut" type="info" :loading="true" disabled>
<font class="m-l-5">航点写入中···</font> <font class="m-l-5">航点写入中···</font>
</el-button> </el-button>
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 12" type="info" <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 12" type="info"
:loading="true" disabled> :loading="true" disabled>
<font class="m-l-5">解锁中...</font> <font class="m-l-5">解锁中...</font>
</el-button> </el-button>
<el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 20" type="success" <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 20"
icon="f-s-14 iconfont icon-yangshi_icon_tongyong_departure" type="success" icon="f-s-14 iconfont icon-yangshi_icon_tongyong_departure"
@click="publishFun('{setQuestState:{bit:5,state:1}}'); speakText('执行送餐任务')"> @click="publishFun('{setQuestState:{bit:5,state:1}}'); speakText('执行送餐任务')">
<font class="m-l-5">执行任务</font> <font class="m-l-5">执行任务</font>
</el-button> </el-button>
@ -642,16 +644,15 @@ export default {
console.log(error.message) // console.log(error.message) //
}) })
}, },
/** /** 等待上传完航点之后 解锁飞机 */
* @description: 准备任务 先检查合法性再从飞机反馈中 看有无写入航点 最后解锁飞机 watchUnlock () {
*/ // 使 Vue $watch planeState.questState
prepareQuest () { const unwatch = this.$watch(() => this.plane.planeState.questState, (newVal) => {
if (Number(this.plane.planeState.questState) === 1) { if (Number(newVal) === 4) { // questState 4
this.checkQuest()// this.publishFun('{unlock:1}') //
} unwatch() //
if (Number(this.plane.planeState.questState) === 4) { }
this.publishFun('{unlock:1}')// })
}
}, },
/** /**
* @description: 正在执行的任务 重新上传航线 * @description: 正在执行的任务 重新上传航线
@ -677,8 +678,8 @@ export default {
} }
}) })
routeData = JSON.stringify(routeData)// routeData = JSON.stringify(routeData)//
// this.publishFun(routeData) //
this.publishFun(routeData) this.watchUnlock()//
} catch (error) { } catch (error) {
this.$message.error('操作失败,航线异常') this.$message.error('操作失败,航线异常')
} }
@ -743,6 +744,7 @@ export default {
}) })
if (res.data.status === 1) { if (res.data.status === 1) {
this.publishFun(routeData)// this.publishFun(routeData)//
this.watchUnlock()//
} }
}, },
/** /**