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

packages/bigscreen/designer/components/List.vue

@@ -7,14 +7,14 @@
             v-model="search.status"
             @change="search.current = 1, getList()"
             placeholder="发布状态"
-            :selectList="dict.getDict('questionnaireStatus')">
+            :selectList="dict.getDict('cwpStatus')">
           </ai-select>
           <el-button type="primary" @click="toEdit('')">添加大屏</el-button>
           <el-button type="primary" @click="toAddData">数据源管理</el-button>
         </template>
         <template #right>
           <el-input
-            v-model="search.title"
+            v-model="search.name"
             size="small"
             placeholder="请输入模板名称或创建人"
             clearable
@@ -61,13 +61,13 @@
           current: 1,
           status: '',
           size: 10,
-          title: ''
+          name: ''
         },
         colConfigs: [
           { prop: 'name', label: '模板名称' },
           { prop: 'createUserName', align: 'center', label: '创建人' },
           { prop: 'description', align: 'center', label: '描述' },
-          { prop: 'status', align: 'center', label: '状态', formart: v => v === '1' ? '已开启' : '未开启' },
+          { prop: 'status', align: 'center', label: '状态', formart: v => this.dict.getLabel('cwpStatus', v) },
           { prop: 'createTime', align: 'center', label: '创建时间' }
         ],
         tableData: [],
@@ -78,7 +78,7 @@
 
     created () {
       
-      this.dict.load('questionnaireStatus').then(() => {
+      this.dict.load('cwpStatus').then(() => {
         this.getList()
       })
     },