From 4d5f630deaf37c12b45a0ec5f5946551492165b2 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 30 Mar 2022 08:52:09 +0800 Subject: [PATCH] eslint code --- .env.development | 3 + src/api/device/deviceList.js | 42 ++++---- src/api/device/startUpList.js | 32 +++--- src/api/login.js | 82 +++++++------- src/api/publish/publishHistory.js | 12 +-- src/api/publish/urgentMessage.js | 42 ++++---- src/api/theme/theme.js | 36 +++---- src/views/device/deviceConfig.vue | 102 ++++++++++++------ src/views/device/index.vue | 24 ++--- .../publishContent/historyList/index.vue | 30 +++--- 10 files changed, 222 insertions(+), 183 deletions(-) diff --git a/.env.development b/.env.development index e3c607e..28f06a5 100644 --- a/.env.development +++ b/.env.development @@ -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' diff --git a/src/api/device/deviceList.js b/src/api/device/deviceList.js index dda0743..b430c1b 100644 --- a/src/api/device/deviceList.js +++ b/src/api/device/deviceList.js @@ -2,37 +2,37 @@ import request from '@/utils/request' // 获取设备列表 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} // 编辑设备发起请求 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查询设备 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解绑 export function ReqRemoveDevice(parameter) { - return request({ - url: 'api/device/delete', - method: 'post', - data: parameter - }) -} \ No newline at end of file + return request({ + url: 'api/device/delete', + method: 'post', + data: parameter + }) +} diff --git a/src/api/device/startUpList.js b/src/api/device/startUpList.js index 479db70..c80ab9b 100644 --- a/src/api/device/startUpList.js +++ b/src/api/device/startUpList.js @@ -2,27 +2,27 @@ import request from '@/utils/request' 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) { - return request({ - url: 'api/device/switchSetting', - method: 'post', - data: parameter - }) + return request({ + url: 'api/device/switchSetting', + method: 'post', + data: parameter + }) } // 清空开关机配置列表的接口 export function reqClearStartUp(parameter) { - return request({ - url: 'api/device/clearSetting', - method: 'post', - data: parameter - }) -} \ No newline at end of file + return request({ + url: 'api/device/clearSetting', + method: 'post', + data: parameter + }) +} diff --git a/src/api/login.js b/src/api/login.js index 57464c3..c11e561 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,58 +1,58 @@ import request from '@/utils/request' 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) { - 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) { - 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() { - return request({ - url: 'auth/info', - method: 'get' - }) + return request({ + url: 'auth/info', + method: 'get' + }) } export function getCodeImg() { - return request({ - url: 'auth/code', - method: 'get' - }) + return request({ + url: 'auth/code', + method: 'get' + }) } export function logout() { - return request({ - url: 'auth/logout', - method: 'delete' - }) -} \ No newline at end of file + return request({ + url: 'auth/logout', + method: 'delete' + }) +} diff --git a/src/api/publish/publishHistory.js b/src/api/publish/publishHistory.js index 7045632..ea600ef 100644 --- a/src/api/publish/publishHistory.js +++ b/src/api/publish/publishHistory.js @@ -3,9 +3,9 @@ import request from '@/utils/request' // 发布历史列表 export function reqPublishHistory(parameter) { - return request({ - url: 'api/release/getReleaseHistoryList', - method: 'get', - params: parameter - }) -} \ No newline at end of file + return request({ + url: 'api/release/getReleaseHistoryList', + method: 'get', + params: parameter + }) +} diff --git a/src/api/publish/urgentMessage.js b/src/api/publish/urgentMessage.js index 19bc6cc..9a7703b 100644 --- a/src/api/publish/urgentMessage.js +++ b/src/api/publish/urgentMessage.js @@ -3,35 +3,35 @@ import request from '@/utils/request' // 编辑紧急发布 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查询紧急通知 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) { - return request({ - url: 'api/release/editNotice', - method: 'post', - data: parameter - }) + return request({ + url: 'api/release/editNotice', + method: 'post', + data: parameter + }) } // 改变紧急通知的状态 export function reqChangeMessage(parameter) { - return request({ - url: 'api/release/updateNoticeState', - method: 'post', - data: parameter - }) -} \ No newline at end of file + return request({ + url: 'api/release/updateNoticeState', + method: 'post', + data: parameter + }) +} diff --git a/src/api/theme/theme.js b/src/api/theme/theme.js index 9893d8f..e75d9f6 100644 --- a/src/api/theme/theme.js +++ b/src/api/theme/theme.js @@ -1,29 +1,29 @@ -//主题库接口 +// 主题库接口 import request from '@/utils/request' // 获取主题库列表 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) { - 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) { - return request({ - url: 'api/themeclass/save', - method: 'post', - data: parameter - }) -} \ No newline at end of file + return request({ + url: 'api/themeclass/save', + method: 'post', + data: parameter + }) +} diff --git a/src/views/device/deviceConfig.vue b/src/views/device/deviceConfig.vue index 8a7c31b..bdb3f92 100644 --- a/src/views/device/deviceConfig.vue +++ b/src/views/device/deviceConfig.vue @@ -67,28 +67,45 @@
设置时间:
- + ]" + :class="{'no_margin': form.open_setting === 2}" + > 每天 每周 - + ]" + > {{ item.name }} - - + + }" + placeholder="任意时间点" + value-format="HH:mm:ss" + />
@@ -98,28 +115,45 @@
设置时间:
- + ]" + :class="{'no_margin': form.close_setting === 2}" + > 每天 每周 - + ]" + > {{ item.name }} - - + + }" + placeholder="任意时间点" + value-format="HH:mm:ss" + />
@@ -128,9 +162,12 @@

设备方向

设备方向: - + ]" + > @@ -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() diff --git a/src/views/device/index.vue b/src/views/device/index.vue index d4a0165..1410e2b 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -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() diff --git a/src/views/publishContent/historyList/index.vue b/src/views/publishContent/historyList/index.vue index 394485c..cb151b8 100644 --- a/src/views/publishContent/historyList/index.vue +++ b/src/views/publishContent/historyList/index.vue @@ -16,12 +16,12 @@ @@ -56,16 +56,16 @@