Browse Source

eslint code

dev
xuhuajiao 3 years ago
parent
commit
4d5f630dea
  1. 3
      .env.development
  2. 40
      src/api/device/deviceList.js
  3. 30
      src/api/device/startUpList.js
  4. 80
      src/api/login.js
  5. 10
      src/api/publish/publishHistory.js
  6. 40
      src/api/publish/urgentMessage.js
  7. 34
      src/api/theme/theme.js
  8. 102
      src/views/device/deviceConfig.vue
  9. 24
      src/views/device/index.vue
  10. 30
      src/views/publishContent/historyList/index.vue

3
.env.development

@ -2,9 +2,12 @@ ENV = 'development'
# 本地接口地址 # 本地接口地址
#VUE_APP_BASE_API = '/dev-api' #VUE_APP_BASE_API = '/dev-api'
# 刘力-本地服地址
#VUE_APP_BASE_API = 'http://192.168.99.103:7000' #VUE_APP_BASE_API = 'http://192.168.99.103:7000'
#VUE_APP_WS_API = 'ws://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_BASE_API = 'http://192.168.99.84:7000'
VUE_APP_WS_API = 'ws://192.168.99.84:7000' VUE_APP_WS_API = 'ws://192.168.99.84:7000'

40
src/api/device/deviceList.js

@ -2,37 +2,37 @@
import request from '@/utils/request' import request from '@/utils/request'
// 获取设备列表 // 获取设备列表
export function ReqDeviceList(parameter) { export function ReqDeviceList(parameter) {
return request({
url: 'api/device/list',
method: 'get',
params: parameter
})
return request({
url: 'api/device/list',
method: 'get',
params: parameter
})
} }
// &device_id=${device_id} // &device_id=${device_id}
// 编辑设备发起请求 // 编辑设备发起请求
export function ReqDeviceEdit(parameter) { export function ReqDeviceEdit(parameter) {
return request({
url: '/api/device/save',
method: 'post',
data: parameter
})
return request({
url: '/api/device/save',
method: 'post',
data: parameter
})
} }
// 根据id查询设备 // 根据id查询设备
export function ReqQueryDevice(parameter) { export function ReqQueryDevice(parameter) {
return request({
url: 'api/device/findById',
method: 'get',
params: parameter
})
return request({
url: 'api/device/findById',
method: 'get',
params: parameter
})
} }
// 根据id解绑 // 根据id解绑
export function ReqRemoveDevice(parameter) { export function ReqRemoveDevice(parameter) {
return request({
url: 'api/device/delete',
method: 'post',
data: parameter
})
return request({
url: 'api/device/delete',
method: 'post',
data: parameter
})
} }

30
src/api/device/startUpList.js

@ -2,27 +2,27 @@
import request from '@/utils/request' import request from '@/utils/request'
export function reqStartUpList(parameter) { export function reqStartUpList(parameter) {
return request({
url: 'api/device/switchlist',
method: 'get',
params: parameter
})
return request({
url: 'api/device/switchlist',
method: 'get',
params: parameter
})
} }
// 修改配置开关机 // 修改配置开关机
export function reqEditStartUp(parameter) { export function reqEditStartUp(parameter) {
return request({
url: 'api/device/switchSetting',
method: 'post',
data: parameter
})
return request({
url: 'api/device/switchSetting',
method: 'post',
data: parameter
})
} }
// 清空开关机配置列表的接口 // 清空开关机配置列表的接口
export function reqClearStartUp(parameter) { export function reqClearStartUp(parameter) {
return request({
url: 'api/device/clearSetting',
method: 'post',
data: parameter
})
return request({
url: 'api/device/clearSetting',
method: 'post',
data: parameter
})
} }

80
src/api/login.js

@ -1,58 +1,58 @@
import request from '@/utils/request' import request from '@/utils/request'
export function login(username, password, phone, code, uuid) { export function login(username, password, phone, code, uuid) {
return request({
url: 'auth/login',
method: 'post',
data: {
username,
password,
phone,
code,
uuid
}
})
return request({
url: 'auth/login',
method: 'post',
data: {
username,
password,
phone,
code,
uuid
}
})
} }
export function getMsg(phone) { export function getMsg(phone) {
return request({
url: 'auth/msg',
method: 'post',
data: {
phone
}
})
return request({
url: 'auth/msg',
method: 'post',
data: {
phone
}
})
} }
export function setPassword(phone, new_pass, code, uuid) { export function setPassword(phone, new_pass, code, uuid) {
return request({
url: 'auth/password',
method: 'post',
data: {
phone,
new_pass,
code,
uuid
}
})
return request({
url: 'auth/password',
method: 'post',
data: {
phone,
new_pass,
code,
uuid
}
})
} }
export function getInfo() { export function getInfo() {
return request({
url: 'auth/info',
method: 'get'
})
return request({
url: 'auth/info',
method: 'get'
})
} }
export function getCodeImg() { export function getCodeImg() {
return request({
url: 'auth/code',
method: 'get'
})
return request({
url: 'auth/code',
method: 'get'
})
} }
export function logout() { export function logout() {
return request({
url: 'auth/logout',
method: 'delete'
})
return request({
url: 'auth/logout',
method: 'delete'
})
} }

10
src/api/publish/publishHistory.js

@ -3,9 +3,9 @@ import request from '@/utils/request'
// 发布历史列表 // 发布历史列表
export function reqPublishHistory(parameter) { export function reqPublishHistory(parameter) {
return request({
url: 'api/release/getReleaseHistoryList',
method: 'get',
params: parameter
})
return request({
url: 'api/release/getReleaseHistoryList',
method: 'get',
params: parameter
})
} }

40
src/api/publish/urgentMessage.js

@ -3,35 +3,35 @@ import request from '@/utils/request'
// 编辑紧急发布 // 编辑紧急发布
export function reqUrgentMessage(parameter) { export function reqUrgentMessage(parameter) {
return request({
url: 'api/release/getUrgentNoticeList',
method: 'get',
params: parameter
})
return request({
url: 'api/release/getUrgentNoticeList',
method: 'get',
params: parameter
})
} }
// 根据id查询紧急通知 // 根据id查询紧急通知
export function reqQueryMessage(parameter) { export function reqQueryMessage(parameter) {
return request({
url: 'api/release/getNoticeById',
method: 'get',
params: parameter
})
return request({
url: 'api/release/getNoticeById',
method: 'get',
params: parameter
})
} }
// 编辑紧急通知 // 编辑紧急通知
export function reqEditMessage(parameter) { export function reqEditMessage(parameter) {
return request({
url: 'api/release/editNotice',
method: 'post',
data: parameter
})
return request({
url: 'api/release/editNotice',
method: 'post',
data: parameter
})
} }
// 改变紧急通知的状态 // 改变紧急通知的状态
export function reqChangeMessage(parameter) { export function reqChangeMessage(parameter) {
return request({
url: 'api/release/updateNoticeState',
method: 'post',
data: parameter
})
return request({
url: 'api/release/updateNoticeState',
method: 'post',
data: parameter
})
} }

34
src/api/theme/theme.js

@ -1,29 +1,29 @@
//主题库接口
// 主题库接口
import request from '@/utils/request' import request from '@/utils/request'
// 获取主题库列表 // 获取主题库列表
export function reqThemeGallery(parameter) { export function reqThemeGallery(parameter) {
return request({
url: 'api/material/getThemeLibrary',
method: 'get',
params: parameter
})
return request({
url: 'api/material/getThemeLibrary',
method: 'get',
params: parameter
})
} }
//根据机构id查询主题列表
// 根据机构id查询主题列表
export function reqHeaderList(parameter) { export function reqHeaderList(parameter) {
return request({
url: 'api/themeclass/get_theme_list',
method: 'get',
params: parameter
})
return request({
url: 'api/themeclass/get_theme_list',
method: 'get',
params: parameter
})
} }
// 新增| 编辑 // 新增| 编辑
export function reqAddOrEdit(parameter) { export function reqAddOrEdit(parameter) {
return request({
url: 'api/themeclass/save',
method: 'post',
data: parameter
})
return request({
url: 'api/themeclass/save',
method: 'post',
data: parameter
})
} }

102
src/views/device/deviceConfig.vue

@ -67,28 +67,45 @@
<div class="setting_cont"> <div class="setting_cont">
<span>设置时间</span> <span>设置时间</span>
<div> <div>
<el-form-item prop="open_setting" :rules="[
<el-form-item
prop="open_setting"
:rules="[
{ required: true, message: '请选择开机时间', trigger: 'change' }, { 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-group v-model="form.open_setting" @change="clearCheckbox()">
<el-radio :label="1" value="everyday">每天</el-radio> <el-radio :label="1" value="everyday">每天</el-radio>
<el-radio :label="2" value="weekly">每周</el-radio> <el-radio :label="2" value="weekly">每周</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </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' }, { required: true, message: '请选择每周开机时间', trigger: 'change' },
]">
]"
>
<el-checkbox-group v-model="selectOpenWeekly"> <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 v-for="item in weeklyList" :key="item.id" :label="item.id" :value="item.id" name="type">{{ item.name }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item prop="open_time" :rules="[
<el-form-item
prop="open_time"
:rules="[
{type: 'string', required: true, message: '请选择具体开机时间', trigger: 'change' }, {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' selectableRange: '00:00:00 - 23:59:59'
}" placeholder="任意时间点" value-format="HH:mm:ss" />
}"
placeholder="任意时间点"
value-format="HH:mm:ss"
/>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -98,28 +115,45 @@
<div class="setting_cont"> <div class="setting_cont">
<span>设置时间</span> <span>设置时间</span>
<div> <div>
<el-form-item prop="close_setting" :rules="[
<el-form-item
prop="close_setting"
:rules="[
{required: true, message: '请选择关机时间', trigger: 'change' }, {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-group v-model="form.close_setting" @change="clearCheckbox()">
<el-radio :label="1" value="everyday">每天</el-radio> <el-radio :label="1" value="everyday">每天</el-radio>
<el-radio :label="2" value="weekly">每周</el-radio> <el-radio :label="2" value="weekly">每周</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </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' }, { required: true, message: '请选择每周关机时间', trigger: 'change' },
]">
]"
>
<el-checkbox-group v-model="selectCloseweekly"> <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 v-for="item in weeklyList" :key="item.id" :label="item.id" :value="item.id" name="type">{{ item.name }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item prop="close_time" :rules="[
<el-form-item
prop="close_time"
:rules="[
{type: 'string', required: true, message: '请选择具体关机时间', trigger: 'change' }, {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' selectableRange: '00:00:00 - 23:59:59'
}" placeholder="任意时间点" value-format="HH:mm:ss" />
}"
placeholder="任意时间点"
value-format="HH:mm:ss"
/>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -128,9 +162,12 @@
<h4>设备方向</h4> <h4>设备方向</h4>
<div class="setting_cont"> <div class="setting_cont">
<span>设备方向</span> <span>设备方向</span>
<el-form-item prop="device_direction_name" :rules="[
<el-form-item
prop="device_direction_name"
:rules="[
{ required: true, message: '请选择具体设备方向', trigger: 'change' }, { required: true, message: '请选择具体设备方向', trigger: 'change' },
]">
]"
>
<el-select v-model="form.device_direction_name" size="small" class="filter-item" value-key="name" @change="selectDirection"> <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-option v-for="item in deviceData" :key="item.key" :label="item.name" :value="item" />
</el-select> </el-select>
@ -164,11 +201,11 @@ export default {
name: 'DeviceConfig', name: 'DeviceConfig',
components: { UploadCover }, components: { UploadCover },
filters: { filters: {
parseTime (time, cFormat) {
parseTime(time, cFormat) {
return parseTime(time, cFormat) return parseTime(time, cFormat)
} }
}, },
data () {
data() {
return { return {
query: { query: {
blurry: '' blurry: ''
@ -237,7 +274,7 @@ export default {
}, },
computed: { computed: {
// //
setWeekly () {
setWeekly() {
const a = { const a = {
1: '一', 1: '一',
2: '二', 2: '二',
@ -247,7 +284,7 @@ export default {
6: '六', 6: '六',
7: '七' 7: '七'
} }
return function (str) {
return function(str) {
if (str) { if (str) {
return str.split(',').map(i => a[i]).join('/') return str.split(',').map(i => a[i]).join('/')
} }
@ -256,12 +293,12 @@ export default {
}, },
watch: {}, watch: {},
mounted () {
mounted() {
this.getStartUpList() this.getStartUpList()
}, },
methods: { methods: {
// //
getStartUpList () {
getStartUpList() {
// this.queryInfo.page = pager // this.queryInfo.page = pager
const params = this.queryInfo const params = this.queryInfo
reqStartUpList(params).then(res => { reqStartUpList(params).then(res => {
@ -275,7 +312,7 @@ export default {
}) })
}, },
// //
editFormData (row) {
editFormData(row) {
this.addFromVisible = true this.addFromVisible = true
this.form.device_id = row.device_id this.form.device_id = row.device_id
this.form.open_setting = row.open_setting this.form.open_setting = row.open_setting
@ -301,8 +338,7 @@ export default {
}) })
}, },
// / // /
clearCheckbox () {
clearCheckbox() {
if (this.form.open_setting === 1) { if (this.form.open_setting === 1) {
this.open_weekly = [] this.open_weekly = []
this.form.open_weekly = null this.form.open_weekly = null
@ -313,18 +349,18 @@ export default {
} }
}, },
// //
selectDirection (selVal) {
selectDirection(selVal) {
console.log(selVal) console.log(selVal)
this.form.device_direction = selVal.key this.form.device_direction = selVal.key
this.form.device_direction_name = selVal.name this.form.device_direction_name = selVal.name
}, },
// //
resetForm (formName) {
resetForm(formName) {
this.addFromVisible = false this.addFromVisible = false
this.$refs[formName].resetFields() this.$refs[formName].resetFields()
}, },
// //
submitForm (formName) {
submitForm(formName) {
this.form.startup_screen = this.$refs.childUpload.imageUrl this.form.startup_screen = this.$refs.childUpload.imageUrl
if (this.form.open_setting === 2) { if (this.form.open_setting === 2) {
this.form.open_weekly = this.selectOpenWeekly.join(',') this.form.open_weekly = this.selectOpenWeekly.join(',')
@ -364,7 +400,7 @@ export default {
}, },
// - btn // - btn
// //
handleSelectionChange (sels) {
handleSelectionChange(sels) {
this.sels = sels this.sels = sels
if (sels.length > 0) { if (sels.length > 0) {
this.clearBtnDisabled = false this.clearBtnDisabled = false
@ -373,7 +409,7 @@ export default {
} }
}, },
// //
removeStartUp (rows) {
removeStartUp(rows) {
const ids = [] const ids = []
rows.forEach(item => { rows.forEach(item => {
ids.push(item.device_id) ids.push(item.device_id)
@ -405,7 +441,7 @@ export default {
}) })
}, },
// //
handleSizeChange (size) {
handleSizeChange(size) {
// //
this.queryInfo.size = size this.queryInfo.size = size
this.getStartUpList() this.getStartUpList()

24
src/views/device/index.vue

@ -147,11 +147,11 @@ import { parseTime } from '@/utils/index.js'
export default { export default {
name: 'Device', name: 'Device',
filters: { filters: {
parseTime (time, cFormat) {
parseTime(time, cFormat) {
return parseTime(time, cFormat) return parseTime(time, cFormat)
} }
}, },
data () {
data() {
return { return {
queryInfo: { queryInfo: {
device_id: '', device_id: '',
@ -190,12 +190,12 @@ export default {
} }
}, },
watch: {}, watch: {},
mounted () {
mounted() {
this.getDevice() this.getDevice()
}, },
methods: { methods: {
// //
getDevice () {
getDevice() {
// this.queryInfo.page = pager // this.queryInfo.page = pager
const params = this.queryInfo const params = this.queryInfo
ReqDeviceList(params).then(res => { ReqDeviceList(params).then(res => {
@ -210,7 +210,7 @@ export default {
}) })
}, },
// //
editFormData (row) {
editFormData(row) {
this.addFromVisible = true this.addFromVisible = true
this.form.account = row.device_account this.form.account = row.device_account
this.form.name = row.device_name this.form.name = row.device_name
@ -219,13 +219,13 @@ export default {
this.form.device_id = row.device_id this.form.device_id = row.device_id
}, },
// //
selectDirection (selVal) {
selectDirection(selVal) {
console.log(selVal) console.log(selVal)
this.form.orientation = selVal.key this.form.orientation = selVal.key
this.form.orientation_name = selVal.name this.form.orientation_name = selVal.name
}, },
// //
removeDevice (row) {
removeDevice(row) {
// console.log(row.device_id) // console.log(row.device_id)
this.$confirm(`你确定解绑${row.device_name}?`, '提示', { this.$confirm(`你确定解绑${row.device_name}?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -252,16 +252,16 @@ export default {
}) })
}) })
}, },
recordData (index, row) {
recordData(index, row) {
this.recordVisible = true this.recordVisible = true
}, },
// //
handleClick (row) {
handleClick(row) {
// console.log(row) // console.log(row)
this.contentVisible = true this.contentVisible = true
}, },
// //
submitForm (formName) {
submitForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
const params = { const params = {
@ -289,7 +289,7 @@ export default {
}) })
}, },
// //
queryDevice (id) {
queryDevice(id) {
const params = { const params = {
device_id: id device_id: id
} }
@ -301,7 +301,7 @@ export default {
}) })
}, },
// //
handleSizeChange (size) {
handleSizeChange(size) {
// //
this.queryInfo.size = size this.queryInfo.size = size
this.getDevice() this.getDevice()

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

@ -16,12 +16,12 @@
<el-table-column label="发布时间" align="center" prop="date"> <el-table-column label="发布时间" align="center" prop="date">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.release_type==0">{{ scope.row.release_start }}</div> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="发布周期" align="center" prop="cycle"> <el-table-column label="发布周期" align="center" prop="cycle">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="发布类型" align="center" prop="type"> <el-table-column label="发布类型" align="center" prop="type">
@ -56,16 +56,16 @@
<script> <script>
import { parseTime } from '@/utils/index.js' import { parseTime } from '@/utils/index.js'
import { reqPublishHistory } from "@/api/publish/publishHistory";
import { reqPublishHistory } from '@/api/publish/publishHistory'
export default { export default {
name: 'HistoryList', name: 'HistoryList',
filters: { filters: {
parseTime (time, cFormat) {
parseTime(time, cFormat) {
return parseTime(time, cFormat) return parseTime(time, cFormat)
} }
}, },
data () {
data() {
return { return {
form: { form: {
@ -76,17 +76,17 @@ export default {
page: 1, page: 1,
size: 3 size: 3
}, },
//
//
publishHistoryList: [], publishHistoryList: [],
// //
total: 0, total: 0,
selectedList: [],
selectedList: []
} }
}, },
computed: { computed: {
// //
setWeekly () {
setWeekly() {
const a = { const a = {
1: '一', 1: '一',
2: '二', 2: '二',
@ -96,7 +96,7 @@ export default {
6: '六', 6: '六',
7: '七' 7: '七'
} }
return function (str) {
return function(str) {
if (str) { if (str) {
return str.split(',').map(i => a[i]).join('/') return str.split(',').map(i => a[i]).join('/')
} }
@ -104,22 +104,22 @@ export default {
} }
}, },
mounted () {
mounted() {
this.getPublishHistory() this.getPublishHistory()
}, },
methods: { methods: {
// //
getPublishHistory () {
getPublishHistory() {
const params = this.queryInfo const params = this.queryInfo
reqPublishHistory(params).then(res => { reqPublishHistory(params).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.publishHistoryList = res.data.content this.publishHistoryList = res.data.content
this.total = res.data.totalElements this.total = res.data.totalElements
this.publishHistoryList.forEach(item => { 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) { 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 this.selectedList = val
if (val.length > 0) { if (val.length > 0) {
this.clearBtnDisabled = false this.clearBtnDisabled = false

Loading…
Cancel
Save