提交代码修复大屏地图小屏幕点击问题，优化大屏适配问题。

2022-04-26 10:20:21 +08:00 · 2022-04-26 10:20:21 +08:00 · 650d3fe4ec
parent 604bf4961d
commit 650d3fe4ec
7 changed files with 59 additions and 33 deletions
--- a/src/components/Amap/components/bigscLocation/indexV_3.vue
+++ b/src/components/Amap/components/bigscLocation/indexV_3.vue
@ -77,6 +77,7 @@ export default {
      this.aMap = new AMap.Map("container", {
        center: [this.mapCenter.lng, this.mapCenter.lat],
        resizeEnable: true,
+        viewMode: '3D',
        // zoom: this.zoom,
        mapStyle: "amap://styles/" + this.theme,
      });
@ -95,6 +96,7 @@ export default {
    // 地图标点 点击事件
    markerClick(e) {
      // console.log("地图点击标注点！！");
+      debugger;
      if (!this.infoWindow) {
        this.createInfoWindowO();
      }
@ -146,7 +148,10 @@ export default {
    createMarker() {
      var markerList = [];
      var _this = this;
-      var projectUrl = this.$store.getters.tenantId === 0 ? '/project/project' : '/project_tenant/project_tenant'
+      var projectUrl =
+        this.$store.getters.tenantId === 0
+          ? "/project/project"
+          : "/project_tenant/project_tenant";
      for (var i = 0; i < this.projectList.length; i++) {
        if (this.projectList[i].projectLat && this.projectList[i].projectLng) {
          let marker = new AMap.Marker({
@ -157,13 +162,22 @@ export default {
            // map: this.aMap,
            icon:
              this.projectList[i].tenantIndexVo["unProcessed"] > 0
-                ? markerAlarmIcon
-                : markerIcon,
+                    ? markerAlarmIcon
+                    : markerIcon,
+            // icon:
+            //   new AMap.Icon({
+            //     image: this.projectList[i].tenantIndexVo["unProcessed"] > 0
+            //         ? markerAlarmIcon
+            //         : markerIcon,
+            //     size: new AMap.Size(80, 80),
+            //     imageSize: new AMap.Size(52, 52),
+            //   }),
+
            offset: new AMap.Pixel(-13, -30),
          });
          var content = [];
          window["amapObj"] = this.aMap;
-          window['_this'] = this;
+          window["_this"] = this;
          content.push(
            `<div class="info-block">
              <span class="info-title">报警提醒</span>
@ -173,11 +187,9 @@ export default {
                <div class="info-item"><span class="info-lable">项目：</span>
                  <span class="info-value info-a"
                    onclick="window['_this'].$router.push({ path:'${projectUrl}', query: { 'projectId': '${
-                      this.projectList[i].projectId
-                    }', 'tempType': 'details' } })"
-                  >${
-                    this.projectList[i].projectName
-                  }</span></div>
+              this.projectList[i].projectId
+            }', 'tempType': 'details' } })"
+                  >${this.projectList[i].projectName}</span></div>
                <div class="info-item"><span class="info-lable">地址：</span>
                  <marquee style="margin: 0; width:calc(100% - 80px);" behavior="alternate" scrollamount="1" width="calc(100% - 40px)">
                    <span class="info-value">${
@ -220,7 +232,10 @@ export default {
      var resultStr = "";
      var _this = this;
      window["_this"] = this;
-      var deviceUrl = this.$store.getters.tenantId === 0 ? '/device/device' : '/device_tenant/device_tenant'
+      var deviceUrl =
+        this.$store.getters.tenantId === 0
+          ? "/device/device"
+          : "/device_tenant/device_tenant";
      if (list && list.length > 0) {
        list.forEach((v) => {
          // if (v.unProcessAlarmTotal > 0) {
@ -229,8 +244,8 @@ export default {
            `
              <div class="item-device"
                onclick="window['_this'].$router.push({ path:'${deviceUrl}', query: { 'deviceId': '${
-                  v.deviceId
-                }', 'tempType': 'details' } })"
+              v.deviceId
+            }', 'tempType': 'details' } })"
              >
                <img class="d-img" src="${infoDeviceIcon}" />
                <span class="device-info" name="${v.deviceId}"
--- a/src/views/bigScreen/v3/index.vue
+++ b/src/views/bigScreen/v3/index.vue
@ -5,7 +5,7 @@
    ref="big-v3-wrap-id"
    :style="{
      transformOrigin: 'center top',
-      transform: `scale(${scalseNum})`,
+      transform: `scale(${scalseNumX}, ${ scalseNumY })`,
      opacity: 1,
      transition: `all 0.5s ease 0s`,
    }"
@ -82,6 +82,7 @@ import trendWrap from "./profile/trend";
 import MapWrap from "./profile/mapWrap";
 import MapWrapPersonal from "./profile/personalCenter";
 import { iotWebSocketAlarmBaseUrl } from "@/config/env";
+import Cookies from 'js-cookie'

 import { getWarningAnalysis, homeCount, appProjectList } from "@/api/app";
 export default {
@ -100,7 +101,8 @@ export default {
  data() {
    return {
      title: "智慧能源综合管理系统",
-      scalseNum: 1,
+      scalseNumX: 1,
+      scalseNumY: 1,
      resultInfo: {},
      alarmInfoResult: {},
      projectList: [],
@ -133,12 +135,10 @@ export default {
  watch: {
    $route(to, from) {
      if (from.fullPath === "/index") {
-        debugger
        document.getElementById("con_lf_top_div").style.background = "#fff";
        document.getElementById("con_lf_top_div").style.height = "calc(100vh - 84px)";
        document.getElementById("con_lf_top_div").style.minHeight = "calc(100vh - 84px)";
      } else if (to.fullPath === "/index") {
-        debugger
        document.getElementById("con_lf_top_div").style.background = "#010e45";
        document.getElementById("con_lf_top_div").style.height = "calc(100vh - 84px)";
        document.getElementById("con_lf_top_div").style.minHeight = "calc(100vh - 84px)";
@ -200,16 +200,25 @@ export default {
    },
    resize_window() {
      if (this.fullscreen) {
-        this.scalseNum = Math.min(
-          Number(document.documentElement.clientHeight / 1080),
-          Number(document.documentElement.clientWidth / 1920)
-        );
+        // this.scalseNumX = Math.min(
+        //   Number(document.documentElement.clientHeight / 1080),
+        //   Number(document.documentElement.clientWidth / 1920)
+        // );
+        this.scalseNumX = Number(document.documentElement.clientWidth / 1920)
+        this.scalseNumY = Number(document.documentElement.clientHeight / 1080)
      } else {
-        this.scalseNum = Math.min(
-          Number(document.documentElement.clientHeight / 1080),
-          Number(document.documentElement.clientWidth / 1920) - Number(200 / 1920)
-        );
-        console.log('get', document.getElementById('big-v3-wrap-id').clientWidth, document.documentElement.clientWidth)
+        // this.scalseNumX = Math.min(
+        //   Number(document.documentElement.clientHeight / 1080),
+        //   Number(document.documentElement.clientWidth / 1920) - Number(200 / 1920)
+        // );
+        if (document.documentElement.clientWidth < 993) {
+          this.scalseNumX = Number(document.documentElement.clientWidth / 1920) - (Cookies.get("sidebarStatus") == '1'?
+           Number(200 / 1920) : 0)
+        } else {
+          this.scalseNumX = Number(document.documentElement.clientWidth / 1920) - (Cookies.get("sidebarStatus") == '1'?
+           Number(200 / 1920) : Number(54 / 1920))
+        }
+        this.scalseNumY = Number(document.documentElement.clientHeight / 1080)
      }
    },
    // 查询项目列表
--- a/src/views/power/examine/index.vue
+++ b/src/views/power/examine/index.vue
@ -106,8 +106,8 @@
        prop="faultType"
        :formatter="statusFormat"
      />
-      <el-table-column label="上报人" align="left" prop="reporterName" />
-      <el-table-column label="处理人" align="left" prop="handlerName" />
+      <el-table-column label="上报人" align="left" prop="reporterNickName" />
+      <el-table-column label="处理人" align="left" prop="handleNickName" />
      <el-table-column label="工作内容" align="left" prop="maintenanceContext">
        <template slot-scope="scope">
          <span
--- a/src/views/power/maintenance/index.vue
+++ b/src/views/power/maintenance/index.vue
@ -152,8 +152,8 @@
        prop="faultType"
        :formatter="statusFormat"
      />
-      <el-table-column label="上报人" align="left" prop="reporterName" />
-      <el-table-column label="处理人" align="left" prop="handlerName" />
+      <el-table-column label="上报人" align="left" prop="reporterNickName" />
+      <el-table-column label="处理人" align="left" prop="handleNickName" />
      <el-table-column label="工作内容" align="left" prop="maintenanceContext">
        <template slot-scope="scope">
          <span class="lay-table-textarea" :title="scope.row.maintenanceContext">
--- a/src/views/power/mywork/details.vue
+++ b/src/views/power/mywork/details.vue
@ -50,7 +50,7 @@
        <el-col :span="12">
          <div class="item-block">
            <span>上报人员：</span>
-            <span>{{ workDetails.reporterName }}</span>
+            <span>{{ workDetails.reporterNickName }}</span>
          </div>
        </el-col>
        <el-col :span="12">
@ -109,7 +109,7 @@
        <el-col :span="12">
          <div class="item-block">
            <span>处理人员：</span>
-            <span>{{ workDetails.handlerName }}</span>
+            <span>{{ workDetails.handleNickName }}</span>
          </div>
        </el-col>
        <el-col :span="12">
--- a/src/views/power/mywork/index.vue
+++ b/src/views/power/mywork/index.vue
@ -124,8 +124,8 @@
        prop="faultType"
        :formatter="statusFormat"
      />
-      <el-table-column label="上报人" align="left" prop="reporterName" />
-      <el-table-column label="处理人" align="left" prop="handlerName" />
+      <el-table-column label="上报人" align="left" prop="reporterNickName" />
+      <el-table-column label="处理人" align="left" prop="handleNickName" />
      <el-table-column label="工作内容" align="left" prop="maintenanceContext">
        <template slot-scope="scope">
          <span
--- a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
+++ b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
@ -333,10 +333,12 @@ export default {
          case 'true':
            params.data.params.switch = 1;
            params.deviceId = this.tSelectList.toString();
+            break;

          case 'false':
            params.data.params.switch = 0;
            params.deviceId = this.tSelectList.toString();
+            break;
        }

        setSwitchControl(params).then((res) => {