xuhuajiao
/
canvasScreen_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

eslint code

dev
xuhuajiao 4 years ago
parent
3d6876574c
commit
4d5f630dea
10 changed files with 222 additions and 183 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .env.development
  2. 74
      src/views/device/deviceConfig.vue
  3. 10
      src/views/publishContent/historyList/index.vue

3
.env.development
View File

@ -2,9 +2,12 @@ ENV = 'development'
# 本地接口地址
#VUE_APP_BASE_API = '/dev-api'
# 刘力-本地服地址
#VUE_APP_BASE_API = 'http://192.168.99.103:7000'
#VUE_APP_WS_API = 'ws://192.168.99.103:7000'
# 许镇-本地服地址
VUE_APP_BASE_API = 'http://192.168.99.84:7000'
VUE_APP_WS_API = 'ws://192.168.99.84:7000'

74
src/views/device/deviceConfig.vue
View File

@ -67,28 +67,45 @@
<div class="setting_cont">
<span>设置时间：</span>
<div>
<el-form-item prop="open_setting" :rules="[
<el-form-item
prop="open_setting"
:rules="[
{ required: true, message: '请选择开机时间', trigger: 'change' },
]" :class="{'no_margin': form.open_setting === 2}">
]"
:class="{'no_margin': form.open_setting === 2}"
>
<el-radio-group v-model="form.open_setting" @change="clearCheckbox()">
<el-radio :label="1" value="everyday">每天</el-radio>
<el-radio :label="2" value="weekly">每周</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.open_setting === 2" :class="{'weekly_margin': form.open_setting === 2}" prop="open_weekly" :rules="[
<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="selectOpenWeekly">
<el-checkbox v-for="item in weeklyList" :key="item.id" :label="item.id" :value="item.id" name="type">{{ item.name }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item prop="open_time" :rules="[
<el-form-item
prop="open_time"
:rules="[
{type: 'string', required: true, message: '请选择具体开机时间', trigger: 'change' },
]">
<el-time-picker v-model="form.open_time" :picker-options="{
]"
>
<el-time-picker
v-model="form.open_time"
:picker-options="{
selectableRange: '00:00:00 - 23:59:59'
}" placeholder="任意时间点" value-format="HH:mm:ss" />
}"
placeholder="任意时间点"
value-format="HH:mm:ss"
/>
</el-form-item>
</div>
</div>
@ -98,28 +115,45 @@
<div class="setting_cont">
<span>设置时间：</span>
<div>
<el-form-item prop="close_setting" :rules="[
<el-form-item
prop="close_setting"
:rules="[
{required: true, message: '请选择关机时间', trigger: 'change' },
]" :class="{'no_margin': form.close_setting === 2}">
]"
:class="{'no_margin': form.close_setting === 2}"
>
<el-radio-group v-model="form.close_setting" @change="clearCheckbox()">
<el-radio :label="1" value="everyday">每天</el-radio>
<el-radio :label="2" value="weekly">每周</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.close_setting === 2" :class="{'weekly_margin': form.close_setting === 2}" prop="close_weekly" :rules="[
<el-form-item
v-if="form.close_setting === 2"
:class="{'weekly_margin': form.close_setting === 2}"
prop="close_weekly"
:rules="[
{ required: true, message: '请选择每周关机时间', trigger: 'change' },
]">
]"
>
<el-checkbox-group v-model="selectCloseweekly">
<el-checkbox v-for="item in weeklyList" :key="item.id" :label="item.id" :value="item.id" name="type">{{ item.name }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item prop="close_time" :rules="[
<el-form-item
prop="close_time"
:rules="[
{type: 'string', required: true, message: '请选择具体关机时间', trigger: 'change' },
]">
<el-time-picker v-model="form.close_time" :picker-options="{
]"
>
<el-time-picker
v-model="form.close_time"
:picker-options="{
selectableRange: '00:00:00 - 23:59:59'
}" placeholder="任意时间点" value-format="HH:mm:ss" />
}"
placeholder="任意时间点"
value-format="HH:mm:ss"
/>
</el-form-item>
</div>
</div>
@ -128,9 +162,12 @@
<h4>设备方向</h4>
<div class="setting_cont">
<span>设备方向：</span>
<el-form-item prop="device_direction_name" :rules="[
<el-form-item
prop="device_direction_name"
:rules="[
{ required: true, message: '请选择具体设备方向', trigger: 'change' },
]">
]"
>
<el-select v-model="form.device_direction_name" size="small" class="filter-item" value-key="name" @change="selectDirection">
<el-option v-for="item in deviceData" :key="item.key" :label="item.name" :value="item" />
</el-select>
@ -302,7 +339,6 @@ export default {
},
// 每天/每周切换的情况下数据处理
clearCheckbox() {
if (this.form.open_setting === 1) {
this.open_weekly = []
this.form.open_weekly = null

10
src/views/publishContent/historyList/index.vue
View File

@ -56,7 +56,7 @@
<script>
import { parseTime } from '@/utils/index.js'
import { reqPublishHistory } from "@/api/publish/publishHistory";
import { reqPublishHistory } from '@/api/publish/publishHistory'
export default {
name: 'HistoryList',
filters: {
@ -80,7 +80,7 @@ export default {
publishHistoryList: [],
// 总条数
total: 0,
selectedList: [],
selectedList: []
}
},
@ -116,10 +116,10 @@ export default {
this.publishHistoryList = res.data.content
this.total = res.data.totalElements
this.publishHistoryList.forEach(item => {
item.release_start = parseTime(item.release_start).split("00:00:00")[0]
item.release_end = parseTime(item.release_end).split("00:00:00")[0]
item.release_start = parseTime(item.release_start).split('00:00:00')[0]
item.release_end = parseTime(item.release_end).split('00:00:00')[0]
if (item.binding_device) {
item.binding_device = item.binding_device.split(",")
item.binding_device = item.binding_device.split(',')
}
})

Write Preview
Loading…
Cancel
Save