From f27bbdc3cf6fa5d12ccb59cc94326ffab8bf5731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Thu, 16 Feb 2023 15:39:28 +0800
Subject: [PATCH] up

---
 src/views/other/components/addSite.vue | 83 +++++++++++++++++++-------
 src/views/other/siteManage.vue         | 15 +++--
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/src/views/other/components/addSite.vue b/src/views/other/components/addSite.vue
index 25bf0a0..c6fcce9 100644
--- a/src/views/other/components/addSite.vue
+++ b/src/views/other/components/addSite.vue
@@ -21,8 +21,8 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>网址
           </div>
           <div class="xy-table-item-content">
-            <el-input type="textarea" clearable placeholder="请输入网址" v-model="detail.url" style="width: 300px;" />
-            需要添加http或者https
+            <el-input type="textarea" clearable placeholder="请输入网址" v-model="detail.url" style="width: 300px;" />
+            <div>需要添加http://或者https://</div>
           </div>
         </div>
       </template>
@@ -37,8 +37,8 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>时间范围
           </div>
           <div class="xy-table-item-content">
-            <el-date-picker v-model="detail.datetimerange" type="datetimerange" :picker-options="pickerOptions"
-              range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期"
+            <el-date-picker v-model="detail.datetimerange" type="daterange" :picker-options="pickerOptions"
+              range-separator="至" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期"
               align="right">
             </el-date-picker>
           </div>
@@ -53,12 +53,29 @@
           <div class="xy-table-item-label">短信接收人
           </div>
           <div class="xy-table-item-content">
-            <el-input type="textarea" clearable placeholder="请填写短信接收人手机号英文逗号隔开" v-model="detail.mobile" style="width: 300px;" /> 短信接收人手机号英文逗号隔开
+            <el-input type="textarea" clearable placeholder="请填写短信接收人手机号英文逗号隔开" v-model="detail.mobile"
+              style="width: 300px;" />
+            <div>短信接收人手机号英文逗号隔开</div>
           </div>
         </div>
       </template>
 
 
+
+      <template v-slot:email>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">邮件接收人
+          </div>
+          <div class="xy-table-item-content">
+            <el-input type="textarea" clearable placeholder="请填写邮件接收人英文逗号隔开" v-model="detail.email"
+              style="width: 300px;" />
+            <div>邮件接收人英文逗号隔开</div>
+          </div>
+        </div>
+      </template>
+
+
+
       <template v-slot:status>
         <div class="xy-table-item">
           <div class="xy-table-item-label">状态
@@ -124,8 +141,9 @@
           mobile: "",
           status: 1,
           start_time: "",
-          end_time: "",
-          datetimerange:[]
+          end_time: "",
+          datetimerange: [],
+          email: 'zhoucl@langye.net,wangqp@longyears.cn'
         },
         rules: {
           name: [{
@@ -148,8 +166,12 @@
           }
         } else {
           this.id = ''
-          this.type = ''
-          this.$refs['addActivity'].reset()
+          this.type = '';
+          this.detail.url = '';
+          this.detail.mobile = '';
+          this.detail.email = 'zhoucl@langye.net,wangqp@longyears.cn'
+          this.$refs['addActivity'].reset();
+
         }
       }
     },
@@ -160,17 +182,28 @@
           id: this.id
         })
         Object.assign(this.detail, res);
-        this.detail.datetimerange.push(this.$moment(res.start_time).format("YYYY-MM-DD HH:mm:ss"));
-        this.detail.datetimerange.push(this.$moment(res.end_time).format("YYYY-MM-DD HH:mm:ss"));
-
-        this.detail.mobile=res.mobile.join(',')
-        this.detail.url=res.url.join(',')
+        let range = [];
+        range.push(this.$moment(res.start_time).format("YYYY-MM-DD"));
+        range.push(this.$moment(res.end_time).format("YYYY-MM-DD"));
+
+        this.$set(this.detail, 'datetimerange', range)
+        if (this.detail.mobile)
+          this.detail.mobile = res.mobile.join(',')
+        if (this.detail.url)
+          this.detail.url = res.url.join(',')
+        if (this.detail.email)
+          this.detail.email = res.email.join(',')
       },
-      editor() {
+      editor() {
         this.detail.start_time = this.detail.datetimerange[0];
-        this.detail.end_time = this.detail.datetimerange[1];
-        this.detail.mobile=this.detail.mobile.split(',')
-        this.detail.url=this.detail.url.split(',')
+        this.detail.end_time = this.detail.datetimerange[1];
+        if (this.detail.mobile != '' && this.detail.mobile)
+          this.detail.mobile = this.detail.mobile.split(',')
+        if (this.detail.url != '' && this.detail.url)
+          this.detail.url = this.detail.url.split(',')
+        if (this.detail.email != '' && this.detail.email)
+          this.detail.email = this.detail.email.split(',')
+
         save(this.detail).then(res => {
           this.isShow = false
           this.$Message.success("操作成功");
@@ -182,8 +215,16 @@
     computed: {
 
     },
-    mounted() {
-      let that = this;
+    mounted() {},
+    created() {
+      if (this.type != 'editor') {
+
+        let sdate = this.$moment().format("YYYY-MM-DD");
+        let edate = this.$moment().add(5, 'years').format("YYYY-MM-DD");
+
+        let range = [sdate, edate];
+        this.$set(this.detail, 'datetimerange', range)
+      }
     }
   }
 </script>
@@ -245,4 +286,4 @@
       z-index: 2;
     }
   }
-</style>
+</style>
diff --git a/src/views/other/siteManage.vue b/src/views/other/siteManage.vue
index 2ef0a91..2bc6eee 100644
--- a/src/views/other/siteManage.vue
+++ b/src/views/other/siteManage.vue
@@ -21,7 +21,8 @@
     </lx-header>
 
 
-    <xy-table :list="list" :table-item="table" :total="total" @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange">
+    <xy-table :list="list" :table-item="table" :total="total" @pageSizeChange="pageSizeChange"
+      @pageIndexChange="pageChange">
       <template v-slot:btns>
         <el-table-column fixed="right" header-align="center" align="center" label="操作" width="300">
           <template slot-scope="scope">
@@ -69,14 +70,15 @@
             align: 'left',
             fixed: 'left',
 
-          },{
+          }, {
             prop: 'url',
             label: '网址',
             align: 'left',
             width: 280,
             fixed: 'left',
             formatter: (v1, v2, value) => {
-              return value.join(',');
+              if (value)
+                return value.join(',');
             }
 
           }, {
@@ -86,7 +88,8 @@
             width: 180,
             fixed: 'left',
             formatter: (v1, v2, value) => {
-              return value.join(',');
+              if (value)
+                return value.join(',');
             }
 
           }, {
@@ -143,7 +146,7 @@
         this.$refs['addActivity'].isShow = true;
         this.$refs['addActivity'].type = 'editor'
       },
-      config(row){
+      config(row) {
         this.$refs['addActivityConfig'].id = row.id;
         this.$refs['addActivityConfig'].isShow = true;
         this.$refs['addActivityConfig'].type = 'editor'
@@ -172,4 +175,4 @@
       margin-bottom: 6px;
     }
   }
-</style>
+</style>