Skip to content

dev / trimble-admin-pro

Go to a project
Toggle navigation
Toggle navigation pinning
db447616 by qingxiao
Options

公开课时间调整

1 parent 56eb8457
Inline Side-by-side
Showing 3 changed files with 44 additions and 11 deletions
...@@ -19,7 +19,7 @@ let requestDomain = "https://ow.go.qudone.com"; ...@@ -19,7 +19,7 @@ let requestDomain = "https://ow.go.qudone.com";
19 if (location.href.indexOf("://k.wxpai.cn") > 0 || location.href.indexOf("://h5.k.wxpai.cn") > 0) { 19 if (location.href.indexOf("://k.wxpai.cn") > 0 || location.href.indexOf("://h5.k.wxpai.cn") > 0) {
20 requestDomain = "https://api.k.wxpai.cn/bizproxy"; 20 requestDomain = "https://api.k.wxpai.cn/bizproxy";
21 } 21 }
22 22 //requestDomain = 'http://localhost:3111'
23 /** 23 /**
24 * header不加session的白名单 24 * header不加session的白名单
25 */ 25 */
......
...@@ -8,8 +8,14 @@ ...@@ -8,8 +8,14 @@
8 <el-form-item label="标题：" prop="title"> 8 <el-form-item label="标题：" prop="title">
9 <el-input v-model="publicForm.title" maxlength="50" show-word-limit></el-input> 9 <el-input v-model="publicForm.title" maxlength="50" show-word-limit></el-input>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item label="开始日期：" prop="startDate"> 11 <el-form-item label="开始时间：" prop="startT">
12 <el-date-picker 12 <el-date-picker
13 v-model="publicForm.startT"
14 type="datetime"
15 value-format="timestamp"
16 placeholder="选择日期时间">
17 </el-date-picker>
18 <!-- <el-date-picker
13 v-model="publicForm.startDate" 19 v-model="publicForm.startDate"
14 type="date" 20 type="date"
15 placeholder="选择日期（必填）" 21 placeholder="选择日期（必填）"
...@@ -22,10 +28,16 @@ ...@@ -22,10 +28,16 @@
22 format="HH:mm:ss" 28 format="HH:mm:ss"
23 value-format="HH:mm:ss" 29 value-format="HH:mm:ss"
24 placeholder="选择时间"> 30 placeholder="选择时间">
25 </el-time-picker> 31 </el-time-picker>-->
26 </el-form-item> 32 </el-form-item>
27 <el-form-item label="结束时间：" prop="endDate"> 33 <el-form-item label="结束时间：" prop="endT">
28 <el-date-picker 34 <el-date-picker
35 v-model="publicForm.endT"
36 type="datetime"
37 value-format="timestamp"
38 placeholder="选择日期时间">
39 </el-date-picker>
40 <!-- <el-date-picker
29 v-model="publicForm.endDate" 41 v-model="publicForm.endDate"
30 type="date" 42 type="date"
31 placeholder="选择日期（必填）" 43 placeholder="选择日期（必填）"
...@@ -39,7 +51,7 @@ ...@@ -39,7 +51,7 @@
39 format="HH:mm:ss" 51 format="HH:mm:ss"
40 value-format="HH:mm:ss" 52 value-format="HH:mm:ss"
41 placeholder="选择时间"> 53 placeholder="选择时间">
42 </el-time-picker> 54 </el-time-picker>-->
43 </el-form-item> 55 </el-form-item>
44 <el-form-item label="地点：" prop="city"> 56 <el-form-item label="地点：" prop="city">
45 <el-input v-model="publicForm.city" maxlength="100" 57 <el-input v-model="publicForm.city" maxlength="100"
...@@ -76,10 +88,14 @@ ...@@ -76,10 +88,14 @@
76 </el-col> 88 </el-col>
77 </el-row>--> 89 </el-row>-->
78 </el-form-item> 90 </el-form-item>
79 <el-form-item label="报名：" prop="enroll"> 91 <el-form-item label="注册/回放：" prop="enroll">
80 <el-input v-model="publicForm.enroll" maxlength="200" 92 <el-input v-model="publicForm.enroll" maxlength="200"
81 show-word-limit></el-input> 93 show-word-limit></el-input>
82 </el-form-item> 94 </el-form-item>
95 <el-form-item label="团队：" prop="team">
96 <el-input v-model="publicForm.team" maxlength="100"
97 show-word-limit></el-input>
98 </el-form-item>
83 <el-form-item label="内容：" prop="content"> 99 <el-form-item label="内容：" prop="content">
84 <el-input v-model="publicForm.content" type="textarea" maxlength="500" 100 <el-input v-model="publicForm.content" type="textarea" maxlength="500"
85 show-word-limit></el-input> 101 show-word-limit></el-input>
...@@ -109,11 +125,12 @@ ...@@ -109,11 +125,12 @@
109 publicForm: {}, 125 publicForm: {},
110 publicRules: { 126 publicRules: {
111 title: [{required: true, message: '请输入标题', trigger: 'blur'}], 127 title: [{required: true, message: '请输入标题', trigger: 'blur'}],
112 startDate: [{required: true, message: '请选择开始时间', trigger: 'blur'}], 128 startT: [{required: true, message: '请选择开始时间', trigger: 'blur'}],
113 endDate: [{required: false, message: '请选择结束时间', trigger: 'blur'}], 129 endT: [{required: true, message: '请选择结束时间', trigger: 'blur'}],
114 enroll: [{required: true, message: '请填写报名', trigger: 'blur'}], 130 enroll: [{required: true, message: '请填写报名', trigger: 'blur'}],
115 city: [{required: true, message: '请选择省市', trigger: 'blur'}], 131 city: [{required: true, message: '请选择省市', trigger: 'blur'}],
116 content: [{required: true, message: '请输入内容', trigger: 'blur'}], 132 content: [{required: true, message: '请输入内容', trigger: 'blur'}],
133 team: [{required: true, message: '请输入团队', trigger: 'blur'}],
117 }, 134 },
118 provinceList: [], 135 provinceList: [],
119 cityList: [], 136 cityList: [],
......
...@@ -14,15 +14,18 @@ ...@@ -14,15 +14,18 @@
14 <el-table-column label="活动标题" prop="title"></el-table-column> 14 <el-table-column label="活动标题" prop="title"></el-table-column>
15 <el-table-column label="地点" prop="city"> 15 <el-table-column label="地点" prop="city">
16 </el-table-column> 16 </el-table-column>
17 <el-table-column label="报名" prop="enroll"></el-table-column> 17 <el-table-column label="注册/回放" prop="enroll"></el-table-column>
18 <el-table-column label="团队" prop="team"></el-table-column>
18 <el-table-column label="开始时间"> 19 <el-table-column label="开始时间">
19 <template slot-scope="scope"> 20 <template slot-scope="scope">
20 {{scope.row.startDate}} &nbsp; {{scope.row.startTime}} 21 <!--{{scope.row.startDate}} &nbsp; {{scope.row.startTime}}-->
22 {{timestampToTime(scope.row.startT)}}
21 </template> 23 </template>
22 </el-table-column> 24 </el-table-column>
23 <el-table-column label="结束时间"> 25 <el-table-column label="结束时间">
24 <template slot-scope="scope"> 26 <template slot-scope="scope">
25 {{scope.row.endDate}} &nbsp; {{scope.row.endTime}} 27 <!--{{scope.row.endDate}} &nbsp; {{scope.row.endTime}}-->
28 {{timestampToTime(scope.row.endT)}}
26 </template> 29 </template>
27 </el-table-column> 30 </el-table-column>
28 <el-table-column label="直播内容" prop="content"></el-table-column> 31 <el-table-column label="直播内容" prop="content"></el-table-column>
...@@ -145,6 +148,19 @@ ...@@ -145,6 +148,19 @@
145 this.queryForm.page = val 148 this.queryForm.page = val
146 this.initPublic() 149 this.initPublic()
147 }, 150 },
151 timestampToTime(row) {
152 if (row === 0) {
153 return ''
154 }
155 var date = new Date(row)
156 var Y = date.getFullYear() + '-'
157 var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
158 var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
159 var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'
160 var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':'
161 var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
162 return Y + M + D + h + m + s
163 },
148 }, 164 },
149 created() { 165 created() {
150 this.initPublic() 166 this.initPublic()
......