巡更列表实现不显示问题,景点改成有详情的

main
Tuzki 2 years ago
parent 917919355b
commit 48037fd758
  1. 4
      ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/tour-detail.vue
  2. 4
      ruoyi-ui/src/views/picture/resource-monitoring/resoure-dialog.vue
  3. 8
      ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue

@ -229,7 +229,7 @@
</div>
</div>
<!-- form-item -->
<div class="d-form-item">
<div class="d-form-item" v-if="dataType!='spot'">
<div class="d-form-label">
官网地址
</div>
@ -238,7 +238,7 @@
</div>
</div>
<!-- form-item -->
<div class="d-form-item">
<div class="d-form-item" v-if="dataType!='spot'">
<div class="d-form-label">
二维码
</div>

@ -3,7 +3,7 @@
<!-- 旅游场所 ----------------------------------------------------- -->
<!-- 景区 scenic 娱乐 fun-->
<tourList v-if="type == 'sceniclist' || type == 'funlist' || type == 'hotellist' || type == 'rurallist' || type == 'homestaylist' || type == 'foodlist' || type == 'shoppinglist' || type == 'travellist'|| type == 'buslist'|| type == 'carlist'" :listData="propsData" :total="total" :dataType="dataType" :interfacePath="interfacePath"></tourList>
<tourDetail v-if="type=='traveldetail'||type == 'scenicdetail' || type == 'ruraldetail' || type == 'fundetail' || type == 'hoteldetail' || type == 'homestaydetail' || type == 'fooddetail' || type == 'shoppingdetail' " :detailData="propsData" :code="code" :id="id" :dataType="dataType" :interfacePath="interfacePath"></tourDetail>
<tourDetail v-if="type == 'spotdetail' || type=='traveldetail'||type == 'scenicdetail' || type == 'ruraldetail' || type == 'fundetail' || type == 'hoteldetail' || type == 'homestaydetail' || type == 'fooddetail' || type == 'shoppingdetail' " :detailData="propsData" :code="code" :id="id" :dataType="dataType" :interfacePath="interfacePath"></tourDetail>
<!--文化场馆列表-->
<venueList v-if="typep-resoure-dialog == 'museumlist' || type == 'artgallerylist' || type == 'culturallist' || type == 'memorialhalllist' || type == 'librarylist' || type == 'technologylist' || type == 'gymnasiumlist'" :listData="propsData" :total="total" :dataType="dataType" :interfacePath="interfacePath"></venueList>
@ -33,7 +33,7 @@
<guideDetail v-if="type == 'guidedetail'" :detailData="propsData" :dataType="dataType" :interfacePath="interfacePath"></guideDetail>
<!-- 游玩景点 spot -->
<!-- <spotList v-if="type == 'spotlist'" :listData="propsData" :total="total" :dataType="dataType" :interfacePath="interfacePath"></spotList>-->
<spotDetail v-if="type == 'spotdetail' || type == 'bustopdetail' || type == 'railstationdetail' || type == 'airportdetail' || type == 'chargingdetail' || type == 'gastationdetail' || type == 'trafficdetail' || type == 'wharfdetail' || type == 'tourservicedetail' || type == 'entrepotdetail' || type == 'ticketdetail' || type == 'inletexitdetail' || type == 'cablewaydetail' || type == 'placedetail' || type == 'buildingdetail' || type == 'otherdetail' || type == 'flowerdetail' || type == 'halldetail' || type == 'exhibitdetail' || type == 'collectiondetail' || type == 'emergmangedetail' || type == 'medicaladetail' || type == 'firecodetail' || type == 'takerefugedetail' || type == 'armeddetail' || type == 'busdetail' || type == 'cardetail'" :code="code" :detailData="propsData" :dataType="dataType" :interfacePath="interfacePath"></spotDetail>
<spotDetail v-if="type == 'bustopdetail' || type == 'railstationdetail' || type == 'airportdetail' || type == 'chargingdetail' || type == 'gastationdetail' || type == 'trafficdetail' || type == 'wharfdetail' || type == 'tourservicedetail' || type == 'entrepotdetail' || type == 'ticketdetail' || type == 'inletexitdetail' || type == 'cablewaydetail' || type == 'placedetail' || type == 'buildingdetail' || type == 'otherdetail' || type == 'flowerdetail' || type == 'halldetail' || type == 'exhibitdetail' || type == 'collectiondetail' || type == 'emergmangedetail' || type == 'medicaladetail' || type == 'firecodetail' || type == 'takerefugedetail' || type == 'armeddetail' || type == 'busdetail' || type == 'cardetail'" :code="code" :detailData="propsData" :dataType="dataType" :interfacePath="interfacePath"></spotDetail>
<!-- name type -->
</div>

@ -83,11 +83,9 @@
<el-table-column align="center" label="巡更任务名称" prop="patrolTaskName"/>
<el-table-column align="center" label="排序编码" prop="sort"/>
<el-table-column align="center" label="巡更日期" prop="patrolCustomizeDate" width="180">
<template v-if="scope.row.patrolType ==2" slot-scope="scope">
<span>{{ parseTime(scope.row.patrolCustomizeDate, '{y}-{m}-{d}') }}</span>
</template>
<template v-if="scope.row.patrolType ==1" slot-scope="scope">
<span> 按排班日期</span>
<template slot-scope="scope">
<span v-if="scope.row.patrolType ==2">{{ parseTime(scope.row.patrolCustomizeDate, '{y}-{m}-{d}') }}</span>
<span v-else> 按排班日期</span>
</template>
</el-table-column>

Loading…
Cancel
Save