diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue index 30149bc..0449f01 100644 --- a/src/components/mycomponent/dialog/deviceInfoDialog.vue +++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue @@ -685,7 +685,7 @@ // 数据处理 this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive) this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser) - + this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus) this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus) this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder) }) diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue index 30149bc..0449f01 100644 --- a/src/components/mycomponent/dialog/deviceInfoDialog.vue +++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue @@ -685,7 +685,7 @@ // 数据处理 this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive) this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser) - + this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus) this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus) this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder) }) diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue index 964678a..0900244 100644 --- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue +++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue @@ -167,8 +167,9 @@ }, mounted() { list().then((res) => { - const str = res[26].detail; - const str2 = res[27].detail; + console.log(res) + const str = res[25].detail; + const str2 = res[26].detail; this.typeList = this.dealAry(str2); this.modelList = this.dealAry(str); }); diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue index 30149bc..0449f01 100644 --- a/src/components/mycomponent/dialog/deviceInfoDialog.vue +++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue @@ -685,7 +685,7 @@ // 数据处理 this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive) this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser) - + this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus) this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus) this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder) }) diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue index 964678a..0900244 100644 --- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue +++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue @@ -167,8 +167,9 @@ }, mounted() { list().then((res) => { - const str = res[26].detail; - const str2 = res[27].detail; + console.log(res) + const str = res[25].detail; + const str2 = res[26].detail; this.typeList = this.dealAry(str2); this.modelList = this.dealAry(str); }); diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue index c899612..1695565 100644 --- a/src/views/distributor/distributorList.vue +++ b/src/views/distributor/distributorList.vue @@ -5,11 +5,11 @@
经销商编号
- +
经销商名称
- +
@@ -18,21 +18,14 @@ 导出
- + - - @@ -91,16 +88,16 @@ // 获取指定页面 getListPage(limit = 10, offset = 1) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) this.tableData = res }) }, - search(limit, offset){ + search(limit, offset) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) @@ -128,7 +125,18 @@ }); listPage(`limit=100000000&offset=1`, {}) .then((res) => { - outToExcel(res.rows); + res.rows = res.rows.map((item, index) => { + return { + 序号: index + 1, + 经销商编号: item.distributorCode, + 经销商名称: item.distributorName, + 单位性质: item.companyNatureName, + 企业类型: item.companyTypeName, + 详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress) + } + + }) + outToExcel(res.rows, '经销商列表'); loading.close(); // 关闭加载动画 this.$message({ message: "导出成功", @@ -153,25 +161,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 10px 20px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -183,6 +197,7 @@ } } + .footer { display: flex; justify-content: space-between; diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue index 30149bc..0449f01 100644 --- a/src/components/mycomponent/dialog/deviceInfoDialog.vue +++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue @@ -685,7 +685,7 @@ // 数据处理 this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive) this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser) - + this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus) this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus) this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder) }) diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue index 964678a..0900244 100644 --- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue +++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue @@ -167,8 +167,9 @@ }, mounted() { list().then((res) => { - const str = res[26].detail; - const str2 = res[27].detail; + console.log(res) + const str = res[25].detail; + const str2 = res[26].detail; this.typeList = this.dealAry(str2); this.modelList = this.dealAry(str); }); diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue index c899612..1695565 100644 --- a/src/views/distributor/distributorList.vue +++ b/src/views/distributor/distributorList.vue @@ -5,11 +5,11 @@
经销商编号
- +
经销商名称
- +
@@ -18,21 +18,14 @@ 导出
- + - - @@ -91,16 +88,16 @@ // 获取指定页面 getListPage(limit = 10, offset = 1) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) this.tableData = res }) }, - search(limit, offset){ + search(limit, offset) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) @@ -128,7 +125,18 @@ }); listPage(`limit=100000000&offset=1`, {}) .then((res) => { - outToExcel(res.rows); + res.rows = res.rows.map((item, index) => { + return { + 序号: index + 1, + 经销商编号: item.distributorCode, + 经销商名称: item.distributorName, + 单位性质: item.companyNatureName, + 企业类型: item.companyTypeName, + 详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress) + } + + }) + outToExcel(res.rows, '经销商列表'); loading.close(); // 关闭加载动画 this.$message({ message: "导出成功", @@ -153,25 +161,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 10px 20px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -183,6 +197,7 @@ } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue index d248ed1..2a18bde 100644 --- a/src/views/login/index_2.vue +++ b/src/views/login/index_2.vue @@ -51,10 +51,8 @@ - - diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue index 30149bc..0449f01 100644 --- a/src/components/mycomponent/dialog/deviceInfoDialog.vue +++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue @@ -685,7 +685,7 @@ // 数据处理 this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive) this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser) - + this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus) this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus) this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder) }) diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue index 964678a..0900244 100644 --- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue +++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue @@ -167,8 +167,9 @@ }, mounted() { list().then((res) => { - const str = res[26].detail; - const str2 = res[27].detail; + console.log(res) + const str = res[25].detail; + const str2 = res[26].detail; this.typeList = this.dealAry(str2); this.modelList = this.dealAry(str); }); diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue index c899612..1695565 100644 --- a/src/views/distributor/distributorList.vue +++ b/src/views/distributor/distributorList.vue @@ -5,11 +5,11 @@
经销商编号
- +
经销商名称
- +
@@ -18,21 +18,14 @@ 导出
- + - - @@ -91,16 +88,16 @@ // 获取指定页面 getListPage(limit = 10, offset = 1) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) this.tableData = res }) }, - search(limit, offset){ + search(limit, offset) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) @@ -128,7 +125,18 @@ }); listPage(`limit=100000000&offset=1`, {}) .then((res) => { - outToExcel(res.rows); + res.rows = res.rows.map((item, index) => { + return { + 序号: index + 1, + 经销商编号: item.distributorCode, + 经销商名称: item.distributorName, + 单位性质: item.companyNatureName, + 企业类型: item.companyTypeName, + 详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress) + } + + }) + outToExcel(res.rows, '经销商列表'); loading.close(); // 关闭加载动画 this.$message({ message: "导出成功", @@ -153,25 +161,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 10px 20px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -183,6 +197,7 @@ } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue index d248ed1..2a18bde 100644 --- a/src/views/login/index_2.vue +++ b/src/views/login/index_2.vue @@ -51,10 +51,8 @@ - - diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue index 488c26d..6b18471 100644 --- a/src/views/move/hotAndNews.vue +++ b/src/views/move/hotAndNews.vue @@ -5,76 +5,35 @@
标题
- +
类型
- - + +
- + 查询 - + 重置 - + 新增 - + 删除
- + @@ -83,13 +42,8 @@ @@ -108,22 +62,10 @@ - + - + @@ -157,7 +99,8 @@ }, mounted() { list().then((res) => { - const str2 = res[27].detail; + console.log(res) + const str2 = res[26].detail; this.typeList = this.dealAry(str2); }); }, @@ -196,11 +139,12 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (offset - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ + res.rows = res.rows.map((item, index) => { + return { ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7) } }) this.tableData = res; @@ -217,13 +161,14 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (1 - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ - ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] - } - }) + res.rows = res.rows.map((item, index) => { + return { + ...item, + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3) + } + }) this.tableData = res; }); }, @@ -242,14 +187,14 @@ ids.push(ele.id); }); batchDelete({ ids: ids }).then((res) => { - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }) - .catch(() => {}); + .catch(() => { }); } else { this.$message.error("请选择需要删除的数据"); } @@ -264,11 +209,11 @@ const id = row.id; bdelete({ id: id }).then((res) => { // 删除成功跟新数据 - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }); }, @@ -282,25 +227,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 0px 0px 30px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -311,6 +262,7 @@ } } } + .footer { display: flex; justify-content: space-between; diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue index 30149bc..0449f01 100644 --- a/src/components/mycomponent/dialog/deviceInfoDialog.vue +++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue @@ -685,7 +685,7 @@ // 数据处理 this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive) this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser) - + this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus) this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus) this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder) }) diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue index 964678a..0900244 100644 --- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue +++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue @@ -167,8 +167,9 @@ }, mounted() { list().then((res) => { - const str = res[26].detail; - const str2 = res[27].detail; + console.log(res) + const str = res[25].detail; + const str2 = res[26].detail; this.typeList = this.dealAry(str2); this.modelList = this.dealAry(str); }); diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue index c899612..1695565 100644 --- a/src/views/distributor/distributorList.vue +++ b/src/views/distributor/distributorList.vue @@ -5,11 +5,11 @@
经销商编号
- +
经销商名称
- +
@@ -18,21 +18,14 @@ 导出
- + - - @@ -91,16 +88,16 @@ // 获取指定页面 getListPage(limit = 10, offset = 1) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) this.tableData = res }) }, - search(limit, offset){ + search(limit, offset) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) @@ -128,7 +125,18 @@ }); listPage(`limit=100000000&offset=1`, {}) .then((res) => { - outToExcel(res.rows); + res.rows = res.rows.map((item, index) => { + return { + 序号: index + 1, + 经销商编号: item.distributorCode, + 经销商名称: item.distributorName, + 单位性质: item.companyNatureName, + 企业类型: item.companyTypeName, + 详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress) + } + + }) + outToExcel(res.rows, '经销商列表'); loading.close(); // 关闭加载动画 this.$message({ message: "导出成功", @@ -153,25 +161,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 10px 20px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -183,6 +197,7 @@ } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue index d248ed1..2a18bde 100644 --- a/src/views/login/index_2.vue +++ b/src/views/login/index_2.vue @@ -51,10 +51,8 @@ - - diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue index 488c26d..6b18471 100644 --- a/src/views/move/hotAndNews.vue +++ b/src/views/move/hotAndNews.vue @@ -5,76 +5,35 @@
标题
- +
类型
- - + +
- + 查询 - + 重置 - + 新增 - + 删除
- + @@ -83,13 +42,8 @@ @@ -108,22 +62,10 @@ - + - + @@ -157,7 +99,8 @@ }, mounted() { list().then((res) => { - const str2 = res[27].detail; + console.log(res) + const str2 = res[26].detail; this.typeList = this.dealAry(str2); }); }, @@ -196,11 +139,12 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (offset - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ + res.rows = res.rows.map((item, index) => { + return { ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7) } }) this.tableData = res; @@ -217,13 +161,14 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (1 - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ - ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] - } - }) + res.rows = res.rows.map((item, index) => { + return { + ...item, + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3) + } + }) this.tableData = res; }); }, @@ -242,14 +187,14 @@ ids.push(ele.id); }); batchDelete({ ids: ids }).then((res) => { - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }) - .catch(() => {}); + .catch(() => { }); } else { this.$message.error("请选择需要删除的数据"); } @@ -264,11 +209,11 @@ const id = row.id; bdelete({ id: id }).then((res) => { // 删除成功跟新数据 - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }); }, @@ -282,25 +227,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 0px 0px 30px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -311,6 +262,7 @@ } } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/move/message.vue b/src/views/move/message.vue index 94f52ad..8e27eac 100644 --- a/src/views/move/message.vue +++ b/src/views/move/message.vue @@ -190,7 +190,7 @@ editCategory(row){ console.log(row) this.isShowAdd = true - this.title = '消息推送编辑' + this.title = '消息推送详情' this.$refs.addMessage.init(row) }, // 批量删除 diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue index 30149bc..0449f01 100644 --- a/src/components/mycomponent/dialog/deviceInfoDialog.vue +++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue @@ -685,7 +685,7 @@ // 数据处理 this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive) this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser) - + this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus) this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus) this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder) }) diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue index 964678a..0900244 100644 --- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue +++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue @@ -167,8 +167,9 @@ }, mounted() { list().then((res) => { - const str = res[26].detail; - const str2 = res[27].detail; + console.log(res) + const str = res[25].detail; + const str2 = res[26].detail; this.typeList = this.dealAry(str2); this.modelList = this.dealAry(str); }); diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue index c899612..1695565 100644 --- a/src/views/distributor/distributorList.vue +++ b/src/views/distributor/distributorList.vue @@ -5,11 +5,11 @@
经销商编号
- +
经销商名称
- +
@@ -18,21 +18,14 @@ 导出
- + - - @@ -91,16 +88,16 @@ // 获取指定页面 getListPage(limit = 10, offset = 1) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) this.tableData = res }) }, - search(limit, offset){ + search(limit, offset) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) @@ -128,7 +125,18 @@ }); listPage(`limit=100000000&offset=1`, {}) .then((res) => { - outToExcel(res.rows); + res.rows = res.rows.map((item, index) => { + return { + 序号: index + 1, + 经销商编号: item.distributorCode, + 经销商名称: item.distributorName, + 单位性质: item.companyNatureName, + 企业类型: item.companyTypeName, + 详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress) + } + + }) + outToExcel(res.rows, '经销商列表'); loading.close(); // 关闭加载动画 this.$message({ message: "导出成功", @@ -153,25 +161,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 10px 20px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -183,6 +197,7 @@ } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue index d248ed1..2a18bde 100644 --- a/src/views/login/index_2.vue +++ b/src/views/login/index_2.vue @@ -51,10 +51,8 @@ - - diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue index 488c26d..6b18471 100644 --- a/src/views/move/hotAndNews.vue +++ b/src/views/move/hotAndNews.vue @@ -5,76 +5,35 @@
标题
- +
类型
- - + +
- + 查询 - + 重置 - + 新增 - + 删除
- + @@ -83,13 +42,8 @@ @@ -108,22 +62,10 @@ - + - + @@ -157,7 +99,8 @@ }, mounted() { list().then((res) => { - const str2 = res[27].detail; + console.log(res) + const str2 = res[26].detail; this.typeList = this.dealAry(str2); }); }, @@ -196,11 +139,12 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (offset - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ + res.rows = res.rows.map((item, index) => { + return { ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7) } }) this.tableData = res; @@ -217,13 +161,14 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (1 - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ - ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] - } - }) + res.rows = res.rows.map((item, index) => { + return { + ...item, + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3) + } + }) this.tableData = res; }); }, @@ -242,14 +187,14 @@ ids.push(ele.id); }); batchDelete({ ids: ids }).then((res) => { - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }) - .catch(() => {}); + .catch(() => { }); } else { this.$message.error("请选择需要删除的数据"); } @@ -264,11 +209,11 @@ const id = row.id; bdelete({ id: id }).then((res) => { // 删除成功跟新数据 - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }); }, @@ -282,25 +227,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 0px 0px 30px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -311,6 +262,7 @@ } } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/move/message.vue b/src/views/move/message.vue index 94f52ad..8e27eac 100644 --- a/src/views/move/message.vue +++ b/src/views/move/message.vue @@ -190,7 +190,7 @@ editCategory(row){ console.log(row) this.isShowAdd = true - this.title = '消息推送编辑' + this.title = '消息推送详情' this.$refs.addMessage.init(row) }, // 批量删除 diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue index 652300f..d20a139 100644 --- a/src/views/product/brandList.vue +++ b/src/views/product/brandList.vue @@ -16,7 +16,7 @@
@@ -25,7 +25,7 @@
diff --git a/dist.zip b/dist.zip index edf644f..792169b 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/system/area.js b/src/api/system/area.js index fcb9dd2..343579b 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -2,6 +2,7 @@ * 区域管理接口 */ import request from '@/utils/request' + // 区域查询 export function getAreaListPage(params) { return request({ @@ -43,7 +44,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: 'ext/dict/code/levelType', + url: 'sys/dict/code/levelType', method: 'get' }) } diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue index 945f9af..140d4b0 100644 --- a/src/components/echart/lineChart/gradientLineChart.vue +++ b/src/components/echart/lineChart/gradientLineChart.vue @@ -98,7 +98,36 @@ label: { fontSize: '16' } - } + }, + position: function (point, params, dom, rect, size) { + // 提示框 限制在chart 图中 + var x = 0; // x坐标位置 + var y = 0; // y坐标位置 + + var pointX = point[0]; + var pointY = point[1]; + + // 提示框大小 + var boxWidth = size.contentSize[0]; + var boxHeight = size.contentSize[1]; + + // boxWidth > pointX 说明鼠标左边放不下提示框 + if (boxWidth > pointX) { + x = 25; + } else { + // 左边放的下 + x = pointX - boxWidth; + } + + if (boxHeight > pointY) { + y = 5; + } else { + // 上边放得下 + y = pointY - boxHeight; + } + dom.style.transform = 'translateZ(0)' // 提示框被遮挡时可以设置 + return [x, y]; + }, }, xAxis: [ { diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue index 1ec5a4c..85e22d1 100644 --- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue +++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue @@ -9,79 +9,44 @@
- +
- +
- +
- +
- +
- +
- +
@@ -93,14 +58,7 @@
- +
@@ -111,141 +69,69 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -293,7 +179,13 @@ val: '', datevalue: '', options: [], - tableData: [] + tableData: [], + } + }, + computed: { + address() { + const { dataInfo } = this + return dataInfo.itemProvince === dataInfo.itemCity ? dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress : dataInfo.itemProvince + dataInfo.itemCity + dataInfo.itemArea + dataInfo.itemAddress } }, mounted() { diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue index 754c1dd..0e31049 100644 --- a/src/components/mycomponent/dialog/categoryAddDialog.vue +++ b/src/components/mycomponent/dialog/categoryAddDialog.vue @@ -141,7 +141,7 @@ { paramName: '', paramOrder: 0, - paramRequire: '0' + paramRequire: 0 } ] }, diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue index 08a9d09..66b5f95 100644 --- a/src/components/mycomponent/dialog/categoryInfoDialog.vue +++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue @@ -23,7 +23,7 @@ 参数{{ index+1 }}： 参数名称:{{ param.paramName }} 排序:{{ param.paramOrder }} - 必填:{{ param.paramRequire?'是':'否' }} + 必填:{{ param.paramRequire === '0' ? '否' :'是' }} diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue index 30149bc..0449f01 100644 --- a/src/components/mycomponent/dialog/deviceInfoDialog.vue +++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue @@ -685,7 +685,7 @@ // 数据处理 this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive) this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser) - + this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus) this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus) this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder) }) diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue index 964678a..0900244 100644 --- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue +++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue @@ -167,8 +167,9 @@ }, mounted() { list().then((res) => { - const str = res[26].detail; - const str2 = res[27].detail; + console.log(res) + const str = res[25].detail; + const str2 = res[26].detail; this.typeList = this.dealAry(str2); this.modelList = this.dealAry(str); }); diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue index c899612..1695565 100644 --- a/src/views/distributor/distributorList.vue +++ b/src/views/distributor/distributorList.vue @@ -5,11 +5,11 @@
经销商编号
- +
经销商名称
- +
@@ -18,21 +18,14 @@ 导出
- + - - @@ -91,16 +88,16 @@ // 获取指定页面 getListPage(limit = 10, offset = 1) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) this.tableData = res }) }, - search(limit, offset){ + search(limit, offset) { listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => { - // 得到相关数据 + // 得到相关数据 res.rows.forEach((item, index) => { item.index = (index + 1) + ((offset - 1) * limit) }) @@ -128,7 +125,18 @@ }); listPage(`limit=100000000&offset=1`, {}) .then((res) => { - outToExcel(res.rows); + res.rows = res.rows.map((item, index) => { + return { + 序号: index + 1, + 经销商编号: item.distributorCode, + 经销商名称: item.distributorName, + 单位性质: item.companyNatureName, + 企业类型: item.companyTypeName, + 详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress) + } + + }) + outToExcel(res.rows, '经销商列表'); loading.close(); // 关闭加载动画 this.$message({ message: "导出成功", @@ -153,25 +161,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 10px 20px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -183,6 +197,7 @@ } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue index d248ed1..2a18bde 100644 --- a/src/views/login/index_2.vue +++ b/src/views/login/index_2.vue @@ -51,10 +51,8 @@ - - diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue index 488c26d..6b18471 100644 --- a/src/views/move/hotAndNews.vue +++ b/src/views/move/hotAndNews.vue @@ -5,76 +5,35 @@
标题
- +
类型
- - + +
- + 查询 - + 重置 - + 新增 - + 删除
- + @@ -83,13 +42,8 @@ @@ -108,22 +62,10 @@ - + - + @@ -157,7 +99,8 @@ }, mounted() { list().then((res) => { - const str2 = res[27].detail; + console.log(res) + const str2 = res[26].detail; this.typeList = this.dealAry(str2); }); }, @@ -196,11 +139,12 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (offset - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ + res.rows = res.rows.map((item, index) => { + return { ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7) } }) this.tableData = res; @@ -217,13 +161,14 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (1 - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ - ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] - } - }) + res.rows = res.rows.map((item, index) => { + return { + ...item, + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3) + } + }) this.tableData = res; }); }, @@ -242,14 +187,14 @@ ids.push(ele.id); }); batchDelete({ ids: ids }).then((res) => { - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }) - .catch(() => {}); + .catch(() => { }); } else { this.$message.error("请选择需要删除的数据"); } @@ -264,11 +209,11 @@ const id = row.id; bdelete({ id: id }).then((res) => { // 删除成功跟新数据 - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }); }, @@ -282,25 +227,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 0px 0px 30px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -311,6 +262,7 @@ } } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/move/message.vue b/src/views/move/message.vue index 94f52ad..8e27eac 100644 --- a/src/views/move/message.vue +++ b/src/views/move/message.vue @@ -190,7 +190,7 @@ editCategory(row){ console.log(row) this.isShowAdd = true - this.title = '消息推送编辑' + this.title = '消息推送详情' this.$refs.addMessage.init(row) }, // 批量删除 diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue index 652300f..d20a139 100644 --- a/src/views/product/brandList.vue +++ b/src/views/product/brandList.vue @@ -16,7 +16,7 @@
@@ -25,7 +25,7 @@
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue index 71ae178..b10accb 100644 --- a/src/views/product/categoryList.vue +++ b/src/views/product/categoryList.vue @@ -92,7 +92,7 @@ - + @@ -157,7 +99,8 @@ }, mounted() { list().then((res) => { - const str2 = res[27].detail; + console.log(res) + const str2 = res[26].detail; this.typeList = this.dealAry(str2); }); }, @@ -196,11 +139,12 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (offset - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ + res.rows = res.rows.map((item, index) => { + return { ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7) } }) this.tableData = res; @@ -217,13 +161,14 @@ res.rows.forEach((item, index) => { item.index = index + 1 + (1 - 1) * 10; }); - res.rows = res.rows.map((item, index) =>{ - return{ - ...item, - recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture, - publishTime:item.publishTime.split(' ')[0] - } - }) + res.rows = res.rows.map((item, index) => { + return { + ...item, + recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '', + publishTime: item.publishTime.split(' ')[0], + recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3) + } + }) this.tableData = res; }); }, @@ -242,14 +187,14 @@ ids.push(ele.id); }); batchDelete({ ids: ids }).then((res) => { - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }) - .catch(() => {}); + .catch(() => { }); } else { this.$message.error("请选择需要删除的数据"); } @@ -264,11 +209,11 @@ const id = row.id; bdelete({ id: id }).then((res) => { // 删除成功跟新数据 - this.$message({ - message: "删除成功", - type: "success", - }); - this.refresh(); + this.$message({ + message: "删除成功", + type: "success", + }); + this.refresh(); }); }); }, @@ -282,25 +227,31 @@ width: 100%; min-height: 700px; overflow: auto; + .productData { width: 100%; display: flex; justify-content: center; + .middle { margin: 0 30px; } } + .productFun { margin: 0px 0px 30px; display: flex; justify-content: space-between; + .productInput { display: flex; align-items: center; + .inputBox { margin: 0 50px 0 10px; } } + .productBtn { .btnItem { margin-right: 10px; @@ -311,6 +262,7 @@ } } } + .footer { display: flex; justify-content: space-between; diff --git a/src/views/move/message.vue b/src/views/move/message.vue index 94f52ad..8e27eac 100644 --- a/src/views/move/message.vue +++ b/src/views/move/message.vue @@ -190,7 +190,7 @@ editCategory(row){ console.log(row) this.isShowAdd = true - this.title = '消息推送编辑' + this.title = '消息推送详情' this.$refs.addMessage.init(row) }, // 批量删除 diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue index 652300f..d20a139 100644 --- a/src/views/product/brandList.vue +++ b/src/views/product/brandList.vue @@ -16,7 +16,7 @@
@@ -25,7 +25,7 @@
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue index 71ae178..b10accb 100644 --- a/src/views/product/categoryList.vue +++ b/src/views/product/categoryList.vue @@ -92,7 +92,7 @@ - +