Merge remote-tracking branch 'origin/dev' into dev

packages/device/AppBroadcast/components/Detail.vue

@@ -11,8 +11,8 @@
           <template #content>
             <ai-wrapper
               label-width="120px">
-              <ai-info-item label="播发级别" v-if="info.taskType == 0">{{ $dict.getLabel('dlbMessageUrgency',info.messageLevel) }}</ai-info-item>
-              <ai-info-item label="播发级别" v-if="info.taskType == 1">{{ $dict.getLabel('dlbMessageUrgency',info.messageLevel) }} - {{ $dict.getLabel('dlbDyclingType', info.cyclingType) }}</ai-info-item>
+              <ai-info-item label="播发级别" v-show="info.taskType == 0">{{ $dict.getLabel('dlbMessageUrgency', info.messageLevel) }}</ai-info-item>
+              <ai-info-item label="播发级别" v-show="info.taskType == 1">{{ $dict.getLabel('dlbMessageUrgency', info.messageLevel) }} - {{ $dict.getLabel('dlbDyclingType', info.cyclingType) }}</ai-info-item>
               <ai-info-item label="播放方式" :value="info.taskType == 1? '定时播放':'立即播放'"></ai-info-item>
               <ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
               <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>

packages/device/AppBroadcast/components/List.vue

@@ -6,7 +6,7 @@
         <ai-search-bar bottomBorder>
           <template slot="left">
             <ai-select v-model="search.cyclingType" placeholder="媒资类型" clearable
-                       :selectList="$dict.getDict('dlbResourceType')"
+                       :selectList="$dict.getDict('dlbDyclingType')"
                        @change=";(page.current = 1), getList()"></ai-select>
             <ai-select v-model="search.messageLevel" placeholder="级别" clearable
                        :selectList="$dict.getDict('dlbMessageUrgency')"

packages/device/AppEquipmentManage/components/List.vue

@@ -5,9 +5,9 @@
       <template #content>
         <ai-search-bar bottomBorder>
           <template slot="right">
-            <el-input v-model="search.keyword" size="small" placeholder="设备名称/设备编号" clearable
+            <el-input v-model="search.name" size="small" placeholder="设备名称/设备编号" clearable
                       v-throttle="() => {page.current = 1, getList()}"
-                      @clear=";(page.current = 1), (search.keyword = ''), getList()" suffix-icon="iconfont iconSearch"/>
+                      @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
         <ai-search-bar class="ai-search-ba mar-t10">
@@ -23,7 +23,7 @@
             <template slot-scope="{ row }">
               <!-- <el-button type="text" @click="close(row.id)">停播</el-button> -->
               <el-button type="text" @click="toTaskList(row.deviceId)">任务列表</el-button>
-              <el-button type="text" @click="bind(row)">绑定行政区划</el-button>
+              <el-button type="text" @click="bind(row)" >绑定行政区划</el-button>
               <!-- <el-button type="text" @click="locate=true">地图标绘</el-button>-->
             </template>
           </el-table-column>
@@ -66,8 +66,7 @@ export default {
       },
       total: 0,
       search: {
-        bind: '',
-        keyword: '',
+        name: '',
       },
       id: '',
       ids: [],