kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

撤回 - 30158

Browse Source
This commit is contained in:
shijingjing
2022-06-13 14:50:39 +08:00
parent 2c2bc040ca
commit 55be902080
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/device/AppBroadcast/components/List.vue
View File

@@ -33,7 +33,7 @@
<!-- <el-button type="text" @click="onAdd(row.id)">复制</el-button> --> <!-- <el-button type="text" @click="onAdd(row.id)">复制</el-button> -->
<el-button type="text" @click="toDetail(row.id)">详情</el-button> <el-button type="text" @click="toDetail(row.id)">详情</el-button>
<el-button type="text" @click="reset(row.id)" <el-button type="text" @click="reset(row.id)"
v-if="row.taskType == 1">撤回 v-if="row.taskType == 1 && (row.broadcastStatus == 0 || row.broadcastStatus == 1 || row.broadcastStatus == 2 )">撤回
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

2
packages/device/AppEquipmentManage/components/taskList.vue
View File

@@ -14,7 +14,7 @@
:current.sync="page.current" :size.sync="page.size" @getList="getList" :current.sync="page.current" :size.sync="page.size" @getList="getList"
@selection-change="(v) => (ids = v.map((e) => e.id))"> @selection-change="(v) => (ids = v.map((e) => e.id))">
<el-table-column slot="options" label="操作" align="center" width="280" fixed="right"> <el-table-column slot="options" label="操作" align="center" width="280" fixed="right">
<template slot-scope="{ row }" v-if="row.taskType == 1"> <template slot-scope="{ row }" v-if="row.taskType == 1 && (row.broadcastStatus == 0 || row.broadcastStatus == 1 || row.broadcastStatus == 2 )">
<el-button type="text" @click="reset(row.id)">撤回任务</el-button> <el-button type="text" @click="reset(row.id)">撤回任务</el-button>
</template> </template>
</el-table-column> </el-table-column>

7
packages/device/AppMediaManage/components/Play.vue
View File

@@ -59,7 +59,7 @@
value-format="HH:mm:ss"></el-time-picker> value-format="HH:mm:ss"></el-time-picker>
</el-form-item> </el-form-item>
<el-form-item label="播放设备" v-if="areaId" prop="serialNo" style="width: 100%;"> <el-form-item label="播放设备" v-if="areaId" prop="serialNo" style="width: 100%;">
<ai-table-select nodeName="name" :instance="instance" extra="serialNo" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`" <ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
@select="v => formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/> @select="v => formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -183,10 +183,7 @@ export default {
newDate() { newDate() {
var myDate = new Date(); var myDate = new Date();
return myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds() return myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
}, }
// areaRoot() {
// return this.areaRootId = [this.user.info.areaId.substr(0,6),'000000'].join("")
// }
}, },
watch: { watch: {