Merge remote-tracking branch 'origin/master'

jiangping

2024-12-27 c6e139f411e323f49d641ca899ad85229a4cdce4

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	screen/vite.config.js

 h5_meeting/manifest.json

@@ -96,9 +96,9 @@
            "disableHostCheck" : true,
            "proxy" : {
                "/gateway_interface" : {
                    "target" : "http://10.50.250.253:8088/gateway_interface", // 代理服务器域名或IP地址
                    // "target" : "http://10.50.250.253:8088/gateway_interface", // 代理服务器域名或IP地址
                    // "target" : "http://192.168.0.173/gateway_interface", // 代理服务器域名或IP地址
                    // "target" : "http://192.168.0.173/gateway_interface", // 代理服务器域名或IP地址
                    "target" : "https://atwl.ahzyssl.com/zhyq_interface", // 代理服务器域名或IP地址
                    "changeOrigin" : true, // 允许跨域 
                    "pathRewrite" : {
                        "^/gateway_interface" : ""

 h5_meeting/pages/index/index.vue

@@ -153,7 +153,7 @@
                    qr.data =

                        "https://atwl.ahzyssl.com/zhyq_h5/#/pages/login/login/?type=2&yw=1&ywid=" + this.meetingInfo.id

                    // 设置二维码大小，必须与canvas设置的宽高一致

                    qr.size = 83;

                    qr.size = 104;

                    // 调用制作二维码方法

                    qr.make();

                    // 获取canvas上下文

@@ -340,16 +340,16 @@
            }



            .qrcode_wrap {

                width: 92px;

                height: 92px;

                width: 110px;

                height: 110px;

                display: flex;

                align-items: center;

                justify-content: center;

                background-color: #fff;



                .qrcode {

                    width: 84px;

                    height: 84px;

                    width: 104px;

                    height: 104px;

                }

            }




 pda/manifest.json

@@ -18,7 +18,8 @@
            "proxy" : {
                "/gateway_interface" : {
                    // 这个字段名需与你配置的basePrefixUrl一致，系统识别到带有/dev-api请求的地址时，会在前面拼接上代理服务器地址
                    "target" : "http://10.50.250.253:8088/gateway_interface", // 代理服务器域名或IP地址
                    // "target" : "http://10.50.250.253:8088/gateway_interface", // 代理服务器域名或IP地址
                    "target" : "https://atwl.ahzyssl.com/zhyq_interface", // 代理服务器域名或IP地址

                    // "target" : "http://192.168.0.108:10010", // 代理服务器域名或IP地址
                    "changeOrigin" : true, // 允许跨域 

 pda/pages/index/index.vue

@@ -46,7 +46,12 @@
    }

  },

  onLoad() {



        const token = uni.getStorageSync('token')
        if(!token){
            uni.redirectTo({
                url: '/pages/index/login'
            })
        }

  },

  methods: {
        loginout() {

 pda/utils/config.js

@@ -1,6 +1,6 @@

// export const baseUrl = 'gateway_interface/'
export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
export const baseUrl = 'gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`


 screen/package-lock.json

@@ -22,7 +22,6 @@
      },
      "devDependencies": {
        "@vitejs/plugin-vue": "^5.0.4",
        "sass": "^1.77.6",
        "scss": "^0.2.4",
        "vite": "^5.2.8",
        "vite-plugin-vue-devtools": "^7.0.25"
@@ -900,6 +899,7 @@
      "dev": true,
      "hasInstallScript": true,
      "optional": true,
      "peer": true,
      "dependencies": {
        "detect-libc": "^1.0.3",
        "is-glob": "^4.0.3",
@@ -941,6 +941,7 @@
      "os": [
        "android"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -961,6 +962,7 @@
      "os": [
        "darwin"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -981,6 +983,7 @@
      "os": [
        "darwin"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1001,6 +1004,7 @@
      "os": [
        "freebsd"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1021,6 +1025,7 @@
      "os": [
        "linux"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1041,6 +1046,7 @@
      "os": [
        "linux"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1061,6 +1067,7 @@
      "os": [
        "linux"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1081,6 +1088,7 @@
      "os": [
        "linux"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1101,6 +1109,7 @@
      "os": [
        "linux"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1121,6 +1130,7 @@
      "os": [
        "linux"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1141,6 +1151,7 @@
      "os": [
        "win32"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1161,6 +1172,7 @@
      "os": [
        "win32"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1181,6 +1193,7 @@
      "os": [
        "win32"
      ],
      "peer": true,
      "engines": {
        "node": ">= 10.0.0"
      },
@@ -1822,6 +1835,7 @@
      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
      "dev": true,
      "optional": true,
      "peer": true,
      "dependencies": {
        "fill-range": "^7.1.1"
      },
@@ -1924,6 +1938,8 @@
      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-4.0.1.tgz",
      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
      "dev": true,
      "optional": true,
      "peer": true,
      "dependencies": {
        "readdirp": "^4.0.1"
      },
@@ -2101,6 +2117,7 @@
      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
      "dev": true,
      "optional": true,
      "peer": true,
      "bin": {
        "detect-libc": "bin/detect-libc.js"
      },
@@ -2271,6 +2288,7 @@
      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
      "dev": true,
      "optional": true,
      "peer": true,
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -2454,7 +2472,9 @@
      "version": "5.0.3",
      "resolved": "https://registry.npmmirror.com/immutable/-/immutable-5.0.3.tgz",
      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
      "dev": true
      "dev": true,
      "optional": true,
      "peer": true
    },
    "node_modules/inflight": {
      "version": "1.0.6",
@@ -2492,6 +2512,7 @@
      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
      "dev": true,
      "optional": true,
      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -2502,6 +2523,7 @@
      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
      "dev": true,
      "optional": true,
      "peer": true,
      "dependencies": {
        "is-extglob": "^2.1.1"
      },
@@ -2533,6 +2555,7 @@
      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
      "dev": true,
      "optional": true,
      "peer": true,
      "engines": {
        "node": ">=0.12.0"
      }
@@ -2696,6 +2719,7 @@
      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
      "dev": true,
      "optional": true,
      "peer": true,
      "dependencies": {
        "braces": "^3.0.3",
        "picomatch": "^2.3.1"
@@ -2791,7 +2815,8 @@
      "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-7.1.1.tgz",
      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
      "dev": true,
      "optional": true
      "optional": true,
      "peer": true
    },
    "node_modules/node-releases": {
      "version": "2.0.19",
@@ -2914,6 +2939,7 @@
      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
      "dev": true,
      "optional": true,
      "peer": true,
      "engines": {
        "node": ">=8.6"
      },
@@ -3083,6 +3109,8 @@
      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-4.0.2.tgz",
      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
      "dev": true,
      "optional": true,
      "peer": true,
      "engines": {
        "node": ">= 14.16.0"
      },
@@ -3170,6 +3198,8 @@
      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",
      "integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==",
      "dev": true,
      "optional": true,
      "peer": true,
      "dependencies": {
        "chokidar": "^4.0.0",
        "immutable": "^5.0.2",
@@ -3377,6 +3407,7 @@
      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
      "dev": true,
      "optional": true,
      "peer": true,
      "dependencies": {
        "is-number": "^7.0.0"
      },

 screen/package.json

@@ -24,7 +24,6 @@
  },
  "devDependencies": {
    "@vitejs/plugin-vue": "^5.0.4",
    "sass": "^1.77.6",
    "scss": "^0.2.4",
    "vite": "^5.2.8",
    "vite-plugin-vue-devtools": "^7.0.25"

 screen/public/favicon.ico

 screen/src/assets/images/FireFighting/xiaofang_ic_lixian@2x.png

Binary files differ

 screen/src/assets/images/FireFighting/xiaofang_ic_zhengchang@2x.png

 screen/src/views/FireFighting.vue

@@ -101,6 +101,13 @@
                </div>
              </div>
              <div class="item">
                <img src="@/assets/images/FireFighting/xiaofang_ic_pingbi@2x.png" alt="">
                <div class="content">
                  <div class="name">屏蔽</div>
                  <div class="num num5">{{ dataList4.shieldDeviceNum || 0 }}</div>
                </div>
              </div>
              <div class="item">
                <img src="@/assets/images/FireFighting/xiaofang_ic_guzhang@2x.png" alt="">
                <div class="content">
                  <div class="name">故障</div>
@@ -108,17 +115,10 @@
                </div>
              </div>
              <div class="item">
                <img src="@/assets/images/FireFighting/xiaofang_ic_lixian@2x.png" alt="">
                <img src="@/assets/images/FireFighting/xiaofang_ic_zhengchang@2x.png" alt="">
                <div class="content">
                  <div class="name">正常</div>
                  <div class="num num4">{{ dataList4.offlineDeviceNum }}</div>
                </div>
              </div>
              <div class="item">
                <img src="@/assets/images/FireFighting/xiaofang_ic_pingbi@2x.png" alt="">
                <div class="content">
                  <div class="name">屏蔽</div>
                  <div class="num num5">{{ dataList4.shieldDeviceNum || 0 }}</div>
                </div>
              </div>
            </div>
@@ -147,7 +147,7 @@
                  <div class="item">
                    <img class="icon" src="@/assets/images/FireFighting/ic_wendu@2x.png" alt="">
                    <div class="content">
                      <div class="num">{{ dataList8[dataIndex8].temperatureData?.latestValue }}<span>°C</span></div>
                      <div class="num" v-if="dataList8[dataIndex8].temperatureData && dataList8[dataIndex8].temperatureData.latestValue">{{ Number(dataList8[dataIndex8].temperatureData.latestValue).toFixed(1) }}<span>°C</span></div>
                      <div class="la">阈值 {{ dataList8[dataIndex8].temperatureData?.alarmLow }}～{{
                        dataList8[dataIndex8].temperatureData?.alarmHigh }}°C</div>
                    </div>
@@ -155,9 +155,9 @@
                  <div class="item">
                    <img class="icon" src="@/assets/images/FireFighting/ic_shidu@2x.png" alt="">
                    <div class="content">
                      <div class="num">{{ dataList8[dataIndex8].humidityData?.latestValue }}<span>%</span></div>
                      <div class="num" v-if="dataList8[dataIndex8].humidityData && dataList8[dataIndex8].humidityData.latestValue">{{ Number(dataList8[dataIndex8].humidityData.latestValue).toFixed(1) }}<span>%</span></div>
                      <div class="la">阈值 {{ dataList8[dataIndex8].humidityData?.alarmLow }}～{{
                        dataList8[dataIndex8].humidityData?.alarmHigh }}</div>
                        dataList8[dataIndex8].humidityData?.alarmHigh }}°C</div>
                    </div>
                  </div>
                </div>
@@ -559,7 +559,7 @@
      {
        name: '最上层立体圆',
        type: 'pictorialBar',
        symbolSize: [260, 40],
        symbolSize: [182, 40],
        symbolOffset: [0, -20],
        z: 12,
        itemStyle: {
@@ -577,7 +577,7 @@
      {
        name: '中间立体圆',
        type: 'pictorialBar',
        symbolSize: [260, 40],
        symbolSize: [182, 40],
        symbolOffset: [0, -20],
        z: 12,
        itemStyle: {
@@ -610,7 +610,7 @@
      {
        name: '最底部立体圆',
        type: 'pictorialBar',
        symbolSize: [260, 40],
        symbolSize: [182, 40],
        symbolOffset: [0, 20],
        z: 12,
        itemStyle: {
@@ -659,9 +659,9 @@
        label: {
          distance: 15,
          show: true,
          position: data > 58 ? 'inside' : 'top',
          position: data > 52  ? 'inside' : 'top',
          formatter: '{c}' + '%',
          fontSize: 80,
          fontSize: 72,
          color: '#1AFCFF',
          textShadowColor: '#03C7F9',
          textShadowBlur: 30,
@@ -1225,16 +1225,16 @@

            .num3 {
              background-image: -webkit-linear-gradient(top,
                  #fff 0%,
                  #e9bf43 50%,
                  #eb8131 100%);
                  #eb8131 0%,
                  #d0a72c 50%,
                  #e9bf43 100%);
            }

            .num4 {
              background-image: -webkit-linear-gradient(top,
                  #fff 0%,
                  #9e9e9e 50%,
                  #9e9e9e 100%);
                  #78db91 50%,
                  #6de8b0 100%);
            }

            .num5 {
@@ -1249,9 +1249,9 @@
    }

    .center_box_two {
      width: 100%;
      width: 108%;
      display: flex;

      margin: 0 -4%;
      .content_wrap {
        flex: 1;
        flex-shrink: 0;
@@ -1436,11 +1436,11 @@
              /* border: 6px solid red; */
              .liquidle_te {
                font-weight: 500;
                font-size: 16px;
                font-size: 18px;
                position: absolute;
                top: 102px;
                top: 99px;
                left: 0;
                width: 214px;
                width: 206px;
                display: flex;
                flex-direction: column;
                align-items: center;
@@ -1448,7 +1448,7 @@
                .placeT {
                  font-size: 12px;
                  color: #869CC9;
                  margin-top: 4px;
                  margin-top: 6px;
                }
              }

@@ -1462,14 +1462,14 @@
              } */

              .liquidlevel {
                width: 300px;
                width: 220px;
                height: 400px;
                transform: scale(0.24);
                transform: scale(0.27);
                color: #fff;
                text-align: center;
                position: relative;
                left: -42px;
                top: -140px;
                left: -8px;
                top: -143px;
              }
            }
          }

 screen/src/views/SecurityControl.vue

@@ -612,7 +612,7 @@
  })
}

const colors = ['#FEAF01', '#01ABFE', '#51F9E4']
const colors = [ '#01ABFE','#FEAF01', '#51F9E4']
const initEchart2 = () => {
  const myChart = echarts.init(document.getElementById('echart2'))
  const option = {
@@ -965,7 +965,7 @@
    initialSlide: 0,
    direction: 'vertical', //竖直方向
    slidesPerView: 3,
    autoplay: autoplayFlag(dataList2.value.filter(i => i.total > 0), 3, 4000),
    autoplay: autoplayFlag(dataList2.value.filter(i => i.totalNum > 0), 3, 4000),
    observer: true, //修改swiper自己或子元素时，自动初始化swiper
  })
}

 screen/src/views/videoUrl/Video.vue

@@ -6,7 +6,7 @@
</template>

<script setup>
import { defineProps, ref, onMounted, onUnmounted, watch } from 'vue'
import { ref, onMounted, onUnmounted, watch } from 'vue'
const props = defineProps({
  indexCode: String,
  href: String,

 screen/vite.config.js

@@ -26,8 +26,8 @@
    proxy: {
      "/gateway_interface": {
        // target: "http://192.168.0.104:10010",
        target: "http://10.50.250.253:8088/gateway_interface",
        // target: "http://192.168.0.173/gateway_interface",
        // target: "http://10.50.250.253:8088/gateway_interface",
        target: "https://atwl.ahzyssl.com/zhyq_interface",
        changeOrigin: true,
        rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
      },