From 41fce29257b4185f57d43b1223554135ddffb7c4 Mon Sep 17 00:00:00 2001
From: wz_shi <737816277@qq.com>
Date: Mon, 21 Mar 2022 20:32:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/publish/publishList.js                | 10 +++
 src/views/device/deviceConfig.vue             | 74 ++++++++++---------
 .../publishContent/publishList/index.vue      | 47 ++++++------
 3 files changed, 75 insertions(+), 56 deletions(-)
 create mode 100644 src/api/publish/publishList.js

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 @@
                     <el-radio :label="2" value="weekly">每周</el-radio>
                   </el-radio-group>
                 </el-form-item>
+                <!--  :rules="[
+                    { required: true, message: '请选择每周开机时间', trigger: 'change' },
+                  ]" -->
                 <el-form-item
                   v-if="form.open_setting === 2"
                   :class="{'weekly_margin': form.open_setting === 2}"
                   prop="open_weekly"
-                  :rules="[
-                    { required: true, message: '请选择每周开机时间', trigger: 'change' },
-                  ]"
+                 
                 >
                   <el-checkbox-group v-model="open_weekly">
-                    <el-checkbox label="周一" name="open_weekly" />
-                    <el-checkbox label="周二" name="open_weekly" />
-                    <el-checkbox label="周三" name="open_weekly" />
-                    <el-checkbox label="周四" name="open_weekly" />
-                    <el-checkbox label="周五" name="open_weekly" />
-                    <el-checkbox label="周六" name="open_weekly" />
-                    <el-checkbox label="周日" name="open_weekly" />
+                    <el-checkbox :label="1" name="open_weekly">周一</el-checkbox>
+                    <el-checkbox :label="2" name="open_weekly" >周二</el-checkbox>
+                    <el-checkbox :label="3" name="open_weekly" >周三</el-checkbox>
+                    <el-checkbox :label="4" name="open_weekly" >周四</el-checkbox>
+                    <el-checkbox :label="5" name="open_weekly" >周五</el-checkbox>
+                    <el-checkbox :label="6" name="open_weekly" >周六</el-checkbox>
+                    <el-checkbox :label="7" name="open_weekly" >周日</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
+               
                 <el-form-item
                   prop="open_time"
                   :rules="[
                     {type: 'string', required: true, message: '请选择具体开机时间', trigger: 'change' },
-                  ]"
+                  ]" 
                 >
                   <el-time-picker
                     v-model="form.open_time"
@@ -112,7 +114,7 @@
                       selectableRange: '00:00:00 - 23:59:59'
                     }"
                     placeholder="任意时间点"
-                    value-format="hh:mm:ss"
+                    value-format="HH:mm:ss"
                   />
                 </el-form-item>
               </div>
@@ -135,29 +137,31 @@
                     <el-radio :label="2" value="weekly">每周</el-radio>
                   </el-radio-group>
                 </el-form-item>
+               <!--  :rules="[
+                    {  required: true, message: '请选择每周关机时间', trigger: 'change' },
+                  ]" -->
                 <el-form-item
                   v-if="form.close_setting === 2"
                   :class="{'weekly_margin': form.close_setting === 2}"
-                  prop="closeweekly"
-                  :rules="[
-                    { type: 'array', required: true, message: '请选择每周关机时间', trigger: 'change' },
-                  ]"
+                  prop="close_weekly"
+                 
                 >
-                  <el-checkbox-group v-model="closeweekly">
-                    <el-checkbox label="周一" name="closeweekly" />
-                    <el-checkbox label="周二" name="closeweekly" />
-                    <el-checkbox label="周三" name="closeweekly" />
-                    <el-checkbox label="周四" name="closeweekly" />
-                    <el-checkbox label="周五" name="closeweekly" />
-                    <el-checkbox label="周六" name="closeweekly" />
-                    <el-checkbox label="周日" name="closeweekly" />
+                  <el-checkbox-group v-model="close_weekly">
+                    <el-checkbox :label="1" name="close_weekly">周一</el-checkbox>
+                    <el-checkbox :label="2" name="close_weekly" >周二</el-checkbox>
+                    <el-checkbox :label="3" name="close_weekly" >周三</el-checkbox>
+                    <el-checkbox :label="4" name="close_weekly" >周四</el-checkbox>
+                    <el-checkbox :label="5" name="close_weekly" >周五</el-checkbox>
+                    <el-checkbox :label="6" name="close_weekly" >周六</el-checkbox>
+                    <el-checkbox :label="7" name="close_weekly" >周日</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
+                 
                 <el-form-item
                   prop="close_time"
-                  :rules="[
-                    { required: true, message: '请选择具体关机时间', trigger: 'change' },
-                  ]"
+                 :rules="[
+                    {type: 'string', required: true, message: '请选择具体关机时间', trigger: 'change' },
+                  ]" 
                 >
                   <el-time-picker
                     v-model="form.close_time"
@@ -165,7 +169,7 @@
                       selectableRange: '00:00:00 - 23:59:59'
                     }"
                     placeholder="任意时间点"
-                    value-format="hh:mm:ss"
+                    value-format="HH:mm:ss"
                   />
                 </el-form-item>
               </div>
@@ -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 @@
   <div class="list_warp">
     <el-row :gutter="15">
       <el-col>
+        <!--     v-loading="crud.loading" -->
         <el-table
           ref="table"
-          v-loading="crud.loading"
           :data="tableData"
           :header-cell-style="{ background: '#3a8aeb', color: '#fff' }"
           class="publish_table"
@@ -215,11 +215,11 @@
           </div>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button
-            :loading="crud.status.cu === 2"
+          <!--    :loading="crud.status.cu === 2" 
+          @click="crud.submitCU"-->
+          <el-button       
             type="primary"
-            round
-            @click="crud.submitCU"
+            round         
           >保存</el-button>
           <el-button round @click="publishVisible=false">关闭</el-button>
         </div>
@@ -250,28 +250,17 @@
 </template>
 
 <script>
-import crudDept from '@/api/system/dept'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import pagination from '@crud/Pagination'
-const defaultForm = {
-  name: '',
-  date: null,
-  deviceSelect: '',
-  file: ''
-}
+import {reqPublishList} from '@/api/publish/publishList'
 export default {
   name: 'PublishList',
-  components: { pagination },
-  cruds() {
-    return CRUD({
-      title: '部门',
-      url: 'api/dept',
-      crudMethod: { ...crudDept }
-    })
-  },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
     return {
+      queryInfo:{
+        release_name:'',
+        orga_id:'',
+        page:1,
+        size:3,
+      },
       selectedList: [],
       publishVisible: false,
       messageVisible: false,
@@ -307,7 +296,19 @@ export default {
       deviceTags: []
     }
   },
+  mounted(){
+   this.getPublishList()
+  },
   methods: {
+    // 获取发布列表的数据
+    getPublishList(){
+      const params=this.queryInfo
+      reqPublishList(params).then(res=>{
+      if(res.code==200) {
+        this.publishList=res.data.content
+      }
+      })
+    },
     isTophandle(index, row) {
       row.isTop = !row.isTop
     },