From a2f6aec1218641b2d81842b4038d6b1b9e08e33a Mon Sep 17 00:00:00 2001 From: qianbao Date: Sun, 29 Dec 2024 18:23:46 +0800 Subject: [PATCH] 1、鼠标批量移动 --- config/dev.env.js | 6 +++--- config/index.js | 6 +++--- src/mixins/queryform.js | 17 +++++++++++++---- src/store/modules/dataSource.js | 2 ++ src/utils/request.js | 12 +++--------- src/views/bigScreenReport/index.vue | 1 + src/views/bigscreenDesigner/designer/components/contentMenu.vue | 7 +++++++ src/views/bigscreenDesigner/designer/index.vue | 32 +++++++++++++++++++++++--------- src/views/bigscreenDesigner/designer/tools/configure/div/widget-border-box.js | 16 ++++++++++++++++ src/views/bigscreenDesigner/designer/widget/div/mainDiv11.vue | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/bigscreenDesigner/designer/widget/div/widgetBorderBox.vue | 2 ++ src/views/bigscreenDesigner/designer/widget/div/widgetSvg.vue | 8 +++----- src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue | 5 +++-- 13 files changed, 367 insertions(+), 35 deletions(-) create mode 100644 src/views/bigscreenDesigner/designer/widget/div/mainDiv11.vue diff --git a/config/dev.env.js b/config/dev.env.js index d1355f8..8dc5561 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -2,10 +2,10 @@ const merge = require('webpack-merge') const prodEnv = require('./prod.env') //是否开发状态 -const isDev = true; +const isDev = false; //开发API地址 -const devAdrress='"http://weberp.xlyprint.cn/xlyReport"'; -// const devAdrress='"http://127.0.0.1:8080/xlyReport"'; +// const devAdrress='"http://weberp.xlyprint.cn/xlyReport"'; +const devAdrress='"http://127.0.0.1:8080/xlyReport"'; //正式打包API地址 const ipAdrress='"http://"+location.host+"/xlyReport"'; diff --git a/config/index.js b/config/index.js index 6e17267..b58711d 100644 --- a/config/index.js +++ b/config/index.js @@ -48,8 +48,8 @@ module.exports = { // Paths assetsRoot: path.resolve(__dirname, '../dist'), - //assetsSubDirectory: 'BI/static', //正式打包 因为nginx转发原因，需要指定路径 - assetsSubDirectory: 'static', + // assetsSubDirectory: 'static', //正式打包 因为nginx转发原因，需要指定路径 + assetsSubDirectory: '/static', /** * You can set by youself according to actual condition @@ -58,7 +58,7 @@ module.exports = { * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/BI/',//正式打包 因为nginx转发原因，需要指定路径 + assetsPublicPath: '/',//正式打包 因为nginx转发原因，需要指定路径 /** * Source Maps diff --git a/src/mixins/queryform.js b/src/mixins/queryform.js index e2ea728..76b4f34 100644 --- a/src/mixins/queryform.js +++ b/src/mixins/queryform.js @@ -98,6 +98,7 @@ export default { queryEchartsData(params) { return new Promise(async (resolve) => { const { code, data } = await getData(params); + // console.log(data,2222222); if (code != 200) return const analysisData = this.analysisChartsData(params, data); resolve(analysisData) @@ -105,7 +106,7 @@ export default { }, // 解析不同图标的数据 analysisChartsData(params, data) { - // widget-barchart 柱线图、widget-linechart 折线图、 widget-barlinechart 柱线图 + // widget-barchart 柱线图、widget-linechart 折线图、 widget-barlinechart 柱线图 widget-more-bar-line // widget-piechart 饼图、widget-funnel 漏斗图 // widget-text 文本框 // widge-table 表格(数据不要转) @@ -114,7 +115,9 @@ export default { // widget-mapline 中国地图-路线图 // widget-radar 雷达图 // widget-select 下拉框 + //barlineCharts 下拉框 const chartType = params.chartType + // console.log(data,chartType,'33333'); if (chartType == "widget-linechart") { return this.barOrLineChartFn(params.chartProperties, data); }else if (chartType == "widget-barlinechart" ) { @@ -168,12 +171,15 @@ export default { // legend: { // data: ['Forest'] // }, + for (const key in chartProperties) { const obj = {}; const seriesData = []; const value = chartProperties[key]; obj["type"] = value; obj["name"] = key; + console.log("3333333",value,key); + console.log("22222222",chartProperties,data); for (let i = 0; i < data.length; i++) { if (value.startsWith("xAxis")) { // 代表为x轴 @@ -183,7 +189,8 @@ export default { seriesData[i] = data[i][key]; } } - // console.log("seriesData",seriesData); + + // console.log("seriesData",chartProperties); // console.log("xAxisList",xAxisList); obj["data"] = seriesData; if (!obj["type"].startsWith("xAxis")) { @@ -209,6 +216,7 @@ export default { const value = chartProperties[key]; obj["type"] = value; obj["name"] = key; + console.log("value",value); if(value=='xAxis' || value=='bar'|| value=='line'){ for (let i = 0; i < data.length; i++) { if (value.startsWith("xAxis")) { @@ -216,7 +224,8 @@ export default { xAxisList[i] = data[i][key]; } else { // 其他的均为series展示数据 - seriesData[i] = data[i][value]; + // console.log("seriesData",data[i][key]); + seriesData[i] = data[i][key]; } } // console.log("seriesData",seriesData); @@ -229,7 +238,7 @@ export default { } ananysicData["xAxis"] = xAxisList; ananysicData["series"] = series; - console.log("11111",ananysicData); + // console.log("11111",ananysicData); return ananysicData; }, //堆叠图 diff --git a/src/store/modules/dataSource.js b/src/store/modules/dataSource.js index 1e00552..e976b4c 100644 --- a/src/store/modules/dataSource.js +++ b/src/store/modules/dataSource.js @@ -8,12 +8,14 @@ const dataSource = { mutations: { SET_STATIC_DATA: (state, data) => { + state.staticData=[]; state.staticData = data; }, SET_REFRESHTIME: (state, data) => { state.staticRefreshTime = data; }, SET_DYNAMIC_DATA: (state, data) => { + state.dynamicData=[]; state.dynamicData = data; } }, diff --git a/src/utils/request.js b/src/utils/request.js index f8a2a04..f8eca3c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth' // 创建axios实例 const service = axios.create({ baseURL: process.env.BASE_API, // api 的 base_url - timeout: 20000 // 请求超时时间 + timeout: 8000000 // 请求超时时间 }) // request拦截器 @@ -55,18 +55,12 @@ service.interceptors.response.use( } }, error => { - // Message({ - // message: error.message, - // type: 'error', - // duration: 5 * 1000 - // }) - // return Promise.reject(error) Message({ message: error.message, type: 'error', duration: 5 * 1000 - }); - return {code:-1}; + }) + return Promise.reject(error) } ) diff --git a/src/views/bigScreenReport/index.vue b/src/views/bigScreenReport/index.vue index b6741d1..d525de6 100644 --- a/src/views/bigScreenReport/index.vue +++ b/src/views/bigScreenReport/index.vue @@ -120,6 +120,7 @@ export default { reportName: "", reportType: "report_screen", pageNumber: 1, + enableFlag: 1, pageSize: 8, order: "DESC", sort: "update_time" diff --git a/src/views/bigscreenDesigner/designer/components/contentMenu.vue b/src/views/bigscreenDesigner/designer/components/contentMenu.vue index f47f58b..02a8e3f 100644 --- a/src/views/bigscreenDesigner/designer/components/contentMenu.vue +++ b/src/views/bigscreenDesigner/designer/components/contentMenu.vue @@ -36,6 +36,9 @@
移除分组
+
+ 复制全部 +
diff --git a/src/views/bigscreenDesigner/designer/widget/div/widgetBorderBox.vue b/src/views/bigscreenDesigner/designer/widget/div/widgetBorderBox.vue index 3d1764f..39e8847 100644 --- a/src/views/bigscreenDesigner/designer/widget/div/widgetBorderBox.vue +++ b/src/views/bigscreenDesigner/designer/widget/div/widgetBorderBox.vue @@ -26,6 +26,8 @@