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. 4
      src/api/theme/theme.js
  3. 102
      src/views/device/deviceConfig.vue
  4. 24
      src/views/device/index.vue
  5. 30
      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'

4
src/api/theme/theme.js
View File

@ -1,4 +1,4 @@
//主题库接口
// 主题库接口
import request from '@/utils/request'
// 获取主题库列表
@ -10,7 +10,7 @@ export function reqThemeGallery(parameter) {
})
}
//根据机构id查询主题列表
// 根据机构id查询主题列表
export function reqHeaderList(parameter) {
return request({
url: 'api/themeclass/get_theme_list',

102
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>
@ -164,11 +201,11 @@ export default {
name: 'DeviceConfig',
components: { UploadCover },
filters: {
parseTime (time, cFormat) {
parseTime(time, cFormat) {
return parseTime(time, cFormat)
}
},
data () {
data() {
return {
query: {
blurry: ''
@ -237,7 +274,7 @@ export default {
},
computed: {
// 将字符串渲染成汉字显示到页面
setWeekly () {
setWeekly() {
const a = {
1: '一',
2: '二',
@ -247,7 +284,7 @@ export default {
6: '六',
7: '七'
}
return function (str) {
return function(str) {
if (str) {
return str.split(',').map(i => a[i]).join('/')
}
@ -256,12 +293,12 @@ export default {
},
watch: {},
mounted () {
mounted() {
this.getStartUpList()
},
methods: {
// 获取开关机列表
getStartUpList () {
getStartUpList() {
// this.queryInfo.page = pager
const params = this.queryInfo
reqStartUpList(params).then(res => {
@ -275,7 +312,7 @@ export default {
})
},
// 编辑开关机
editFormData (row) {
editFormData(row) {
this.addFromVisible = true
this.form.device_id = row.device_id
this.form.open_setting = row.open_setting
@ -301,8 +338,7 @@ export default {
})
},
// 每天/每周切换的情况下数据处理
clearCheckbox () {
clearCheckbox() {
if (this.form.open_setting === 1) {
this.open_weekly = []
this.form.open_weekly = null
@ -313,18 +349,18 @@ export default {
}
},
// 选择设备方向处理
selectDirection (selVal) {
selectDirection(selVal) {
console.log(selVal)
this.form.device_direction = selVal.key
this.form.device_direction_name = selVal.name
},
// 重置表单数据
resetForm (formName) {
resetForm(formName) {
this.addFromVisible = false
this.$refs[formName].resetFields()
},
// 提交表单数据
submitForm (formName) {
submitForm(formName) {
this.form.startup_screen = this.$refs.childUpload.imageUrl
if (this.form.open_setting === 2) {
this.form.open_weekly = this.selectOpenWeekly.join(',')
@ -364,7 +400,7 @@ export default {
},
// 列表多选操作 - 清空btn状态
// 单选单个复选框
handleSelectionChange (sels) {
handleSelectionChange(sels) {
this.sels = sels
if (sels.length > 0) {
this.clearBtnDisabled = false
@ -373,7 +409,7 @@ export default {
}
},
// 清空
removeStartUp (rows) {
removeStartUp(rows) {
const ids = []
rows.forEach(item => {
ids.push(item.device_id)
@ -405,7 +441,7 @@ export default {
})
},
// 每条显示数据改变时的事件
handleSizeChange (size) {
handleSizeChange(size) {
// 整理参数
this.queryInfo.size = size
this.getStartUpList()

24
src/views/device/index.vue
View File

@ -147,11 +147,11 @@ import { parseTime } from '@/utils/index.js'
export default {
name: 'Device',
filters: {
parseTime (time, cFormat) {
parseTime(time, cFormat) {
return parseTime(time, cFormat)
}
},
data () {
data() {
return {
queryInfo: {
device_id: '',
@ -190,12 +190,12 @@ export default {
}
},
watch: {},
mounted () {
mounted() {
this.getDevice()
},
methods: {
// 获取设备列表的数据
getDevice () {
getDevice() {
// this.queryInfo.page = pager
const params = this.queryInfo
ReqDeviceList(params).then(res => {
@ -210,7 +210,7 @@ export default {
})
},
// 编辑
editFormData (row) {
editFormData(row) {
this.addFromVisible = true
this.form.account = row.device_account
this.form.name = row.device_name
@ -219,13 +219,13 @@ export default {
this.form.device_id = row.device_id
},
// 选择设备方向处理
selectDirection (selVal) {
selectDirection(selVal) {
console.log(selVal)
this.form.orientation = selVal.key
this.form.orientation_name = selVal.name
},
// 解绑
removeDevice (row) {
removeDevice(row) {
// console.log(row.device_id)
this.$confirm(`你确定解绑${row.device_name}?`, '提示', {
confirmButtonText: '确定',
@ -252,16 +252,16 @@ export default {
})
})
},
recordData (index, row) {
recordData(index, row) {
this.recordVisible = true
},
// 查看
handleClick (row) {
handleClick(row) {
// console.log(row)
this.contentVisible = true
},
// 修改设备信息并提交
submitForm (formName) {
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
const params = {
@ -289,7 +289,7 @@ export default {
})
},
// 查询设备
queryDevice (id) {
queryDevice(id) {
const params = {
device_id: id
}
@ -301,7 +301,7 @@ export default {
})
},
// 每条显示数据改变时的事件
handleSizeChange (size) {
handleSizeChange(size) {
// 整理参数
this.queryInfo.size = size
this.getDevice()

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

@ -16,12 +16,12 @@
<el-table-column label="发布时间" align="center" prop="date">
<template slot-scope="scope">
<div v-if="scope.row.release_type==0">{{ scope.row.release_start }}</div>
<div v-else>{{scope.row.release_start+" 至 "+scope.row.release_end}}</div>
<div v-else>{{ scope.row.release_start+" 至 "+scope.row.release_end }}</div>
</template>
</el-table-column>
<el-table-column label="发布周期" align="center" prop="cycle">
<template slot-scope="scope">
{{scope.row.release_cycle==0?(''):((scope.row.release_cycle==1?'每天':'每周'+setWeekly(row.release_weekly)))}}
{{ scope.row.release_cycle==0?(''):((scope.row.release_cycle==1?'每天':'每周'+setWeekly(row.release_weekly))) }}
</template>
</el-table-column>
<el-table-column label="发布类型" align="center" prop="type">
@ -56,16 +56,16 @@
<script>
import { parseTime } from '@/utils/index.js'
import { reqPublishHistory } from "@/api/publish/publishHistory";
import { reqPublishHistory } from '@/api/publish/publishHistory'
export default {
name: 'HistoryList',
filters: {
parseTime (time, cFormat) {
parseTime(time, cFormat) {
return parseTime(time, cFormat)
}
},
data () {
data() {
return {
form: {
@ -76,17 +76,17 @@ export default {
page: 1,
size: 3
},
//发布历史列表
// 发布历史列表
publishHistoryList: [],
// 总条数
total: 0,
selectedList: [],
selectedList: []
}
},
computed: {
// 将字符串渲染成汉字显示到页面
setWeekly () {
setWeekly() {
const a = {
1: '一',
2: '二',
@ -96,7 +96,7 @@ export default {
6: '六',
7: '七'
}
return function (str) {
return function(str) {
if (str) {
return str.split(',').map(i => a[i]).join('/')
}
@ -104,22 +104,22 @@ export default {
}
},
mounted () {
mounted() {
this.getPublishHistory()
},
methods: {
// 获取发布历史列表
getPublishHistory () {
getPublishHistory() {
const params = this.queryInfo
reqPublishHistory(params).then(res => {
if (res.code == 200) {
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(',')
}
})
@ -127,7 +127,7 @@ export default {
}
})
},
handleSelectionChange (val) {
handleSelectionChange(val) {
this.selectedList = val
if (val.length > 0) {
this.clearBtnDisabled = false

Write Preview
Loading…
Cancel
Save