diff --git a/src/api/publish/publishList.js b/src/api/publish/publishList.js
new file mode 100644
index 0000000..beb351d
--- /dev/null
+++ b/src/api/publish/publishList.js
@@ -0,0 +1,10 @@
+// 管理发布列表的接口
+import request from '@/utils/request'
+
+export function reqPublishList(parameter) {
+ return request({
+ url: 'api/release/getReleaseList',
+ method: 'get',
+ params: parameter
+ })
+}
\ No newline at end of file
diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue
index 758d0b6..c747999 100644
--- a/src/views/device/deviceConfig.vue
+++ b/src/views/device/deviceConfig.vue
@@ -82,29 +82,31 @@
每周
+
-
-
-
-
-
-
-
+ 周一
+ 周二
+ 周三
+ 周四
+ 周五
+ 周六
+ 周日
+
@@ -135,29 +137,31 @@
每周
+
-
-
-
-
-
-
-
-
+
+ 周一
+ 周二
+ 周三
+ 周四
+ 周五
+ 周六
+ 周日
+
@@ -250,11 +254,11 @@ export default {
open_time: '', // 具体的开机时间
close_time: '', // 具体的关机时间
startup_screen: '', // 启动画面的图片
- open_weekly: []
- // close_weekly: []
+ open_weekly: [],
+ close_weekly: []
},
open_weekly: [],
- closeweekly: [],
+ close_weekly: [],
addFromVisible: false,
selectedList: [],
clearBtnDisabled: true,
@@ -298,7 +302,8 @@ export default {
this.form.open_weekly = null
}
if (this.form.close_setting === 1) {
- this.closeweekly = []
+ this.close_weekly = []
+ this.form.close_weekly=null
}
},
resetForm(formName) {
@@ -307,7 +312,10 @@ export default {
},
submitForm(formName) {
if (this.form.open_setting === 2) {
- this.form.open_weekly = this.open_weekly
+ this.form.open_weekly = this.open_weekly.join(',')
+ }
+ if(this.form.close_setting ===2) {
+ this.form.close_weekly=this.close_weekly.join(',')
}
this.$refs[formName].validate(valid => {
if (valid) {
diff --git a/src/views/publishContent/publishList/index.vue b/src/views/publishContent/publishList/index.vue
index 5e11de5..bb2c328 100644
--- a/src/views/publishContent/publishList/index.vue
+++ b/src/views/publishContent/publishList/index.vue
@@ -2,9 +2,9 @@
+
@@ -250,28 +250,17 @@