diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index fa11162..39db601 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -1,6 +1,15 @@ * { margin: 0; padding: 0; + -moz-user-select: none; /*火狐*/ + + -webkit-user-select: none; /*webkit浏览器*/ + + -ms-user-select: none; /*IE10*/ + + -khtml-user-select: none; /*早期浏览器*/ + + user-select: none; } html, diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue index 1fd3db4..5db5e3b 100644 --- a/src/views/alarmHandling/index.vue +++ b/src/views/alarmHandling/index.vue @@ -288,8 +288,8 @@ {{ item.lineName }} / {{ item.displayName !== null && item.displayName !== "" - ? item.displayName - : item.cmdid + ? item.towerName + : item.displayName }} / {{ diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index c11ceaf..9ab6ebb 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -463,8 +463,6 @@ export default { //大图点击左侧切换图片 leftClick() { this.bigNum--; //执行下一张 - this.mediaType = this.terminalPhoto[this.bigNum].mediaType; - this.bigPicPath = this.terminalPhoto[this.bigNum].path + "!1366x768"; this.activeSmall--; console.log("activeSmall", this.activeSmall, "bigNum", this.bigNum); @@ -473,11 +471,13 @@ export default { this.activeSmall = 4; this.smallLeftClick(); } - console.log(this.terminalPhoto[this.bigNum]); + this.mediaType = this.fiveList[this.bigNum].mediaType; + this.bigPicPath = this.fiveList[this.bigNum].path + "!1366x768"; + console.log(this.fiveList[this.bigNum]); getCoordinate({ - channelId: this.terminalPhoto[this.bigNum].channelId, + channelId: this.fiveList[this.bigNum].channelId, needPic: "1", - termId: this.terminalPhoto[this.bigNum].termId, + termId: this.fiveList[this.bigNum].termId, }) .then((res) => { console.log(res); @@ -490,10 +490,8 @@ export default { }, //点击右侧切换图片 rightClick() { + console.log("点击切换分页", this.fiveList); this.bigNum++; //执行下一张 - this.mediaType = this.terminalPhoto[this.bigNum].mediaType; - this.bigPicPath = this.terminalPhoto[this.bigNum].path + "!1366x768"; - this.activeSmall++; console.log("activeSmall", this.activeSmall, "bigNum", this.bigNum); if (this.activeSmall > 4) { @@ -501,10 +499,12 @@ export default { console.log(this.activeSmall); this.smallRightClick(); } + this.mediaType = this.fiveList[this.bigNum].mediaType; + this.bigPicPath = this.fiveList[this.bigNum].path + "!1366x768"; getCoordinate({ - channelId: this.terminalPhoto[this.bigNum].channelId, + channelId: this.fiveList[this.bigNum].channelId, needPic: "1", - termId: this.terminalPhoto[this.bigNum].termId, + termId: this.fiveList[this.bigNum].termId, }) .then((res) => { console.log(res); @@ -520,6 +520,7 @@ export default { console.log(row); console.log(); this.activeSmall = index; + this.bigNum = index; this.mediaType = row.mediaType; this.bigPicPath = row.path + "!1366x768"; // this.bgbigPath = row.path + "!1366x768"; @@ -541,8 +542,8 @@ export default { //点击小图切换左侧 smallLeftClick() { this.activeSmall = 0; + this.bigNum = 0; console.log("点击了左侧"); - this.page--; if (this.page < 1) { this.isshowArrow = false; @@ -570,6 +571,7 @@ export default { //点击小图切换右侧 smallRightClick() { this.activeSmall = 0; + this.bigNum = 0; console.log("点击了右侧"); console.log(this.page); this.page++; diff --git a/src/views/components/carouselChartmore.vue b/src/views/components/carouselChartmore.vue index fb3995e..fe8543f 100644 --- a/src/views/components/carouselChartmore.vue +++ b/src/views/components/carouselChartmore.vue @@ -460,11 +460,33 @@ export default { this.videopath = this.fiveList[this.activeSmall].thumb; }, + //点击小图变成大图 + handleBigpic(row, index) { + console.log(row, index); + console.log(); + this.activeSmall = index; + this.bigNum = index; + this.mediaType = row.mediaType; + this.bigPicPath = row.path + "!1366x768"; + // this.bgbigPath = row.path + "!1366x768"; + getCoordinate({ + channelId: row.channelId, + needPic: "1", + termId: row.termId, + }) + .then((res) => { + console.log(res); + this.localPoints = res.data.list; + if (this.markEnable === 1) { + this.drawline(); + } + // this.drawline(); + }) + .catch((err) => {}); + }, //大图点击左侧切换图片 leftClick() { this.bigNum--; //执行下一张 - this.mediaType = this.terminalPhoto[this.bigNum].mediaType; - this.bigPicPath = this.terminalPhoto[this.bigNum].path + "!1366x768"; this.activeSmall--; console.log("activeSmall", this.activeSmall, "bigNum", this.bigNum); @@ -473,11 +495,13 @@ export default { this.activeSmall = 9; this.smallLeftClick(); } + this.mediaType = this.fiveList[this.bigNum].mediaType; + this.bigPicPath = this.fiveList[this.bigNum].path + "!1366x768"; console.log(this.terminalPhoto[this.bigNum]); getCoordinate({ - channelId: this.terminalPhoto[this.bigNum].channelId, + channelId: this.fiveList[this.bigNum].channelId, needPic: "1", - termId: this.terminalPhoto[this.bigNum].termId, + termId: this.fiveList[this.bigNum].termId, }) .then((res) => { console.log(res); @@ -491,9 +515,6 @@ export default { //点击右侧切换图片 rightClick() { this.bigNum++; //执行下一张 - this.mediaType = this.terminalPhoto[this.bigNum].mediaType; - this.bigPicPath = this.terminalPhoto[this.bigNum].path + "!1366x768"; - this.activeSmall++; console.log("activeSmall", this.activeSmall, "bigNum", this.bigNum); if (this.activeSmall > 9) { @@ -501,10 +522,12 @@ export default { console.log(this.activeSmall); this.smallRightClick(); } + this.mediaType = this.fiveList[this.bigNum].mediaType; + this.bigPicPath = this.fiveList[this.bigNum].path + "!1366x768"; getCoordinate({ - channelId: this.terminalPhoto[this.bigNum].channelId, + channelId: this.fiveList[this.bigNum].channelId, needPic: "1", - termId: this.terminalPhoto[this.bigNum].termId, + termId: this.fiveList[this.bigNum].termId, }) .then((res) => { console.log(res); @@ -515,32 +538,11 @@ export default { }) .catch((err) => {}); }, - //点击小图变成大图 - handleBigpic(row, index) { - console.log(row); - console.log(); - this.activeSmall = index; - this.mediaType = row.mediaType; - this.bigPicPath = row.path + "!1366x768"; - // this.bgbigPath = row.path + "!1366x768"; - getCoordinate({ - channelId: row.channelId, - needPic: "1", - termId: row.termId, - }) - .then((res) => { - console.log(res); - this.localPoints = res.data.list; - if (this.markEnable === 1) { - this.drawline(); - } - // this.drawline(); - }) - .catch((err) => {}); - }, + //点击小图切换左侧 smallLeftClick() { this.activeSmall = 0; + this.bigNum = 0; console.log("点击了左侧"); this.page--; @@ -570,6 +572,7 @@ export default { //点击小图切换右侧 smallRightClick() { this.activeSmall = 0; + this.bigNum = 0; console.log("点击了右侧"); console.log(this.page); this.page++; diff --git a/vue.config.js b/vue.config.js index f7f6c53..301cf51 100644 --- a/vue.config.js +++ b/vue.config.js @@ -29,12 +29,12 @@ module.exports = defineConfig({ proxy: { "/api": { //表示拦截以/api开头的请求路径 - //target: "http://47.96.238.157:8093", //阿里云服务器环境 + target: "http://47.96.238.157:8093", //阿里云服务器环境 //target: "http://180.166.218.222:40080", //dell - target: "http://180.166.218.222:40080", //dell服务器环境 + //target: "http://180.166.218.222:40080", //dell服务器环境 changOrigin: true, //是否开启跨域 pathRewrite: { - "^/api": "/api", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的 + "^/api": "", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的 }, }, },