Browse Source

Merge branch 'wangmq' of gitadmin/tuoheng_lc_web into develop

tags/v1.1.0^2
wangmengqi 1 year ago
parent
commit
f5eccf0b66
2 changed files with 20 additions and 7 deletions
  1. +19
    -6
      src/views/dashboard/components/OneMap.vue
  2. +1
    -1
      src/views/task-manage/all-task/index.vue

+ 19
- 6
src/views/dashboard/components/OneMap.vue View File

{{ item.date }}  {{ item.taskName }} {{ item.date }}  {{ item.taskName }}
</div> </div>
<div style="margin-right: 30px">{{ item.statusInfo }}</div> <div style="margin-right: 30px">{{ item.statusInfo }}</div>
<div v-if="item.status == 1" style="float: left;width:56px">
<div v-if="item.status == 1" style="float: left; width: 56px">
<n-popconfirm <n-popconfirm
@positive-click="handlePositiveClick(item)" @positive-click="handlePositiveClick(item)"
@negative-click="handleNegativeClick" @negative-click="handleNegativeClick"
</n-popconfirm> </n-popconfirm>
</div> </div>


<div v-else style="color: #1890ff;float:left;width:56px" @click="liveShow(item)">直播</div>
<div
v-else
style="color: #1890ff; float: left; width: 56px"
@click="liveShow(item)"
>
直播
</div>
</li> </li>
</ul> </ul>
<n-pagination <n-pagination
} }
// 添加问题图层 // 添加问题图层
const addproblemLayer = (narr) => { const addproblemLayer = (narr) => {
console.log(narr, '问题图层数据')
// 如果存在问题图层,就将问题图层给删掉
if (data.problemlayer !== null) { if (data.problemlayer !== null) {
console.log('有图层')
data.map.removeLayer(data.problemlayer) data.map.removeLayer(data.problemlayer)
} }
data.problemOverlay = new Overlay({ data.problemOverlay = new Overlay({
// autoPan: true, // autoPan: true,
offset: [10, 10] offset: [10, 10]
}) })
data.problemLayerList = []
narr.map((item) => { narr.map((item) => {
const Features = [] const Features = []
data.problemLayerList = []
if (item.fraction.length > 0) { if (item.fraction.length > 0) {
item.fraction.map((iitem) => { item.fraction.map((iitem) => {
const problem = iitem const problem = iitem
switch (item.status) { switch (item.status) {
case 1: case 1:
item.statusInfo = '待执行' item.statusInfo = '待执行'
item.toIndexRoute = false
break break
case 2: case 2:
item.statusInfo = '执行中' item.statusInfo = '执行中'
item.toIndexRoute = true
break break
} }
}) })
*/ */
const liveShow = (rowInfo) => { const liveShow = (rowInfo) => {
rowInfo = JSON.stringify(rowInfo) rowInfo = JSON.stringify(rowInfo)
rowInfo.toIndexRoute = true
router.push({ router.push({
path: '/taskManage/all', path: '/taskManage/all',
query: { rowInfo: rowInfo } query: { rowInfo: rowInfo }
}) })
}, },
handlePositiveClick(row) { handlePositiveClick(row) {
console.log(row, '该行数据')
$message.info('机场设备开始自检,请稍等') $message.info('机场设备开始自检,请稍等')
implement(row.id).then((res) => { implement(row.id).then((res) => {
if (res.code === 0) { if (res.code === 0) {
margin-bottom: 3px; margin-bottom: 3px;
div { div {
float: left; float: left;
height:100%;
height:30px;
height: 100%;
height: 30px;
} }
} }
} }

+ 1
- 1
src/views/task-manage/all-task/index.vue View File

onMounted(() => { onMounted(() => {
if (rowInfo) { if (rowInfo) {
data.rowData = JSON.parse(rowInfo) data.rowData = JSON.parse(rowInfo)
data.liveDrawer = true data.liveDrawer = true
} }
}) })

Loading…
Cancel
Save