Merge branch 'master' of gitee.com:tj-wang-yahui/AMS_HeatSys_Vue_V10

node_modules/.vite/deps/_metadata.json

 {
-  "hash": "a3bf35f5",
+  "hash": "76d29559",
   "configHash": "2effb732",
-  "lockfileHash": "1020ca60",
-  "browserHash": "c8c3c18c",
+  "lockfileHash": "415b4f88",
+  "browserHash": "685fa378",
   "optimized": {
-    "@amap/amap-jsapi-loader": {
-      "src": "../../@amap/amap-jsapi-loader/dist/index.js",
-      "file": "@amap_amap-jsapi-loader.js",
-      "fileHash": "d42d438d",
-      "needsInterop": true
-    },
-    "@element-plus/icons-vue": {
-      "src": "../../@element-plus/icons-vue/dist/index.js",
-      "file": "@element-plus_icons-vue.js",
-      "fileHash": "baef5005",
-      "needsInterop": false
-    },
-    "@kyvg/vue3-notification": {
-      "src": "../../@kyvg/vue3-notification/dist/index.es.js",
-      "file": "@kyvg_vue3-notification.js",
-      "fileHash": "383f2fd6",
-      "needsInterop": false
-    },
-    "@vue/reactivity": {
-      "src": "../../@vue/reactivity/dist/reactivity.esm-bundler.js",
-      "file": "@vue_reactivity.js",
-      "fileHash": "55b6ad91",
-      "needsInterop": false
-    },
-    "axios": {
-      "src": "../../axios/index.js",
-      "file": "axios.js",
-      "fileHash": "9992cd5a",
-      "needsInterop": false
-    },
-    "echarts": {
-      "src": "../../echarts/index.js",
-      "file": "echarts.js",
-      "fileHash": "c1c5414b",
+    "vue": {
+      "src": "../../vue/dist/vue.runtime.esm-bundler.js",
+      "file": "vue.js",
+      "fileHash": "6309e73d",
       "needsInterop": false
     },
     "element-plus": {
       "src": "../../element-plus/es/index.mjs",
       "file": "element-plus.js",
-      "fileHash": "d20fb1c8",
+      "fileHash": "146301e4",
       "needsInterop": false
     },
-    "element-plus/dist/locale/zh-cn.mjs": {
-      "src": "../../element-plus/dist/locale/zh-cn.mjs",
-      "file": "element-plus_dist_locale_zh-cn__mjs.js",
-      "fileHash": "b66ad807",
+    "@element-plus/icons-vue": {
+      "src": "../../@element-plus/icons-vue/dist/index.js",
+      "file": "@element-plus_icons-vue.js",
+      "fileHash": "93e2c300",
       "needsInterop": false
     },
-    "file-saver": {
-      "src": "../../file-saver/dist/FileSaver.min.js",
-      "file": "file-saver.js",
-      "fileHash": "1060b38d",
+    "vue3-smooth-scroll": {
+      "src": "../../vue3-smooth-scroll/dist/vue-smooth-scroll.min.js",
+      "file": "vue3-smooth-scroll.js",
+      "fileHash": "27f6c3ba",
       "needsInterop": true
     },
-    "html2canvas": {
-      "src": "../../html2canvas/dist/html2canvas.esm.js",
-      "file": "html2canvas.js",
-      "fileHash": "6d3c0050",
+    "@kyvg/vue3-notification": {
+      "src": "../../@kyvg/vue3-notification/dist/index.es.js",
+      "file": "@kyvg_vue3-notification.js",
+      "fileHash": "c12b6fc2",
       "needsInterop": false
     },
     "jquery": {
       "src": "../../jquery/dist/jquery.js",
       "file": "jquery.js",
-      "fileHash": "d14e6f78",
+      "fileHash": "e06fd542",
       "needsInterop": true
     },
-    "jsencrypt": {
-      "src": "../../jsencrypt/lib/index.js",
-      "file": "jsencrypt.js",
-      "fileHash": "bb37f250",
-      "needsInterop": false
-    },
-    "jspdf": {
-      "src": "../../jspdf/dist/jspdf.es.min.js",
-      "file": "jspdf.js",
-      "fileHash": "737a71c5",
-      "needsInterop": false
-    },
-    "mitt": {
-      "src": "../../mitt/dist/mitt.mjs",
-      "file": "mitt.js",
-      "fileHash": "344dd8cb",
+    "element-plus/dist/locale/zh-cn.mjs": {
+      "src": "../../element-plus/dist/locale/zh-cn.mjs",
+      "file": "element-plus_dist_locale_zh-cn__mjs.js",
+      "fileHash": "42051261",
       "needsInterop": false
     },
-    "vue": {
-      "src": "../../vue/dist/vue.runtime.esm-bundler.js",
-      "file": "vue.js",
-      "fileHash": "187234b1",
+    "axios": {
+      "src": "../../axios/index.js",
+      "file": "axios.js",
+      "fileHash": "00e1ad23",
       "needsInterop": false
     },
     "vue-router": {
       "src": "../../vue-router/dist/vue-router.mjs",
       "file": "vue-router.js",
-      "fileHash": "031634ec",
-      "needsInterop": false
-    },
-    "vue3-print-nb": {
-      "src": "../../vue3-print-nb/dist/vue3-print-nb.es.js",
-      "file": "vue3-print-nb.js",
-      "fileHash": "0f1272c6",
+      "fileHash": "e89cca3b",
       "needsInterop": false
     },
-    "vue3-smooth-scroll": {
-      "src": "../../vue3-smooth-scroll/dist/vue-smooth-scroll.min.js",
-      "file": "vue3-smooth-scroll.js",
-      "fileHash": "01116be9",
-      "needsInterop": true
-    },
     "vuex": {
       "src": "../../vuex/dist/vuex.esm-bundler.js",
       "file": "vuex.js",
-      "fileHash": "da34bb30",
+      "fileHash": "fb2c9771",
+      "needsInterop": false
+    },
+    "echarts": {
+      "src": "../../echarts/index.js",
+      "file": "echarts.js",
+      "fileHash": "9784809e",
       "needsInterop": false
     },
-    "xlsx-js-style": {
-      "src": "../../xlsx-js-style/dist/xlsx.min.js",
-      "file": "xlsx-js-style.js",
-      "fileHash": "e60a2e2d",
+    "@amap/amap-jsapi-loader": {
+      "src": "../../@amap/amap-jsapi-loader/dist/index.js",
+      "file": "@amap_amap-jsapi-loader.js",
+      "fileHash": "70af1a04",
       "needsInterop": true
     },
-    "element-plus/es/locale/index": {
-      "src": "../../element-plus/es/locale/index.mjs",
-      "file": "element-plus_es_locale_index.js",
-      "fileHash": "ec3d362d",
+    "mitt": {
+      "src": "../../mitt/dist/mitt.mjs",
+      "file": "mitt.js",
+      "fileHash": "3e8c4b6d",
       "needsInterop": false
     }
   },
@@ -135,29 +87,14 @@
     "chunk-YFT6OQ5R": {
       "file": "chunk-YFT6OQ5R.js"
     },
-    "purify.es-RJI7LT7R": {
-      "file": "purify__es-RJI7LT7R.js"
-    },
-    "index.es-YZCZVYIJ": {
-      "file": "index__es-YZCZVYIJ.js"
-    },
-    "chunk-NNO57RI4": {
-      "file": "chunk-NNO57RI4.js"
-    },
-    "chunk-D7ZASVPN": {
-      "file": "chunk-D7ZASVPN.js"
-    },
-    "chunk-KUPSCFII": {
-      "file": "chunk-KUPSCFII.js"
-    },
-    "chunk-6DBZPQPP": {
-      "file": "chunk-6DBZPQPP.js"
+    "chunk-LNZ7GA7G": {
+      "file": "chunk-LNZ7GA7G.js"
     },
-    "chunk-7IQ4QFEB": {
-      "file": "chunk-7IQ4QFEB.js"
+    "chunk-VDFR5PMD": {
+      "file": "chunk-VDFR5PMD.js"
     },
-    "chunk-3EJPJMEH": {
-      "file": "chunk-3EJPJMEH.js"
+    "chunk-ZS7NZCD4": {
+      "file": "chunk-ZS7NZCD4.js"
     }
   }
 }
\ No newline at end of file

node_modules/.vite/deps/element-plus.js

@@ -41,17 +41,17 @@ import {
   warning_filled_default,
   zoom_in_default,
   zoom_out_default
-} from "./chunk-NNO57RI4.js";
-import {
-  English
-} from "./chunk-KUPSCFII.js";
+} from "./chunk-LNZ7GA7G.js";
 import {
   Comment,
   Fragment,
+  NOOP,
   Teleport,
   Text,
   Transition,
   TransitionGroup,
+  camelize,
+  capitalize,
   cloneVNode,
   computed,
   createApp,
@@ -62,30 +62,59 @@ import {
   createSlots,
   createTextVNode,
   createVNode,
+  customRef,
   defineComponent,
+  effectScope,
   getCurrentInstance,
+  getCurrentScope,
   guardReactiveProps,
   h,
+  hasOwn,
+  hyphenate,
   inject,
+  isArray,
+  isDate,
+  isFunction,
+  isObject,
+  isPlainObject,
+  isPromise,
+  isRef,
+  isString,
   isVNode,
+  markRaw,
   mergeProps,
   nextTick,
+  normalizeClass,
+  normalizeProps,
+  normalizeStyle,
   onBeforeMount,
   onBeforeUnmount,
   onBeforeUpdate,
   onDeactivated,
   onMounted,
+  onScopeDispose,
   onUnmounted,
   onUpdated,
   openBlock,
   provide,
+  reactive,
+  readonly,
+  ref,
   render,
   renderList,
   renderSlot,
   resolveComponent,
   resolveDirective,
   resolveDynamicComponent,
+  shallowReactive,
+  shallowRef,
+  toDisplayString,
   toHandlers,
+  toRaw,
+  toRawType,
+  toRef,
+  toRefs,
+  unref,
   useAttrs,
   useSlots,
   vModelCheckbox,
@@ -99,45 +128,11 @@ import {
   withDirectives,
   withKeys,
   withModifiers
-} from "./chunk-6DBZPQPP.js";
-import {
-  NOOP,
-  camelize,
-  capitalize,
-  customRef,
-  effectScope,
-  getCurrentScope,
-  hasOwn,
-  hyphenate,
-  isArray,
-  isDate,
-  isFunction,
-  isObject,
-  isPlainObject,
-  isPromise,
-  isRef,
-  isString,
-  markRaw,
-  normalizeClass,
-  normalizeProps,
-  normalizeStyle,
-  onScopeDispose,
-  reactive,
-  readonly,
-  ref,
-  shallowReactive,
-  shallowRef,
-  toDisplayString,
-  toRaw,
-  toRawType,
-  toRef,
-  toRefs,
-  unref
-} from "./chunk-7IQ4QFEB.js";
+} from "./chunk-VDFR5PMD.js";
 import {
   __commonJS,
   __toESM
-} from "./chunk-3EJPJMEH.js";
+} from "./chunk-ZS7NZCD4.js";
 
 // node_modules/dayjs/dayjs.min.js
 var require_dayjs_min = __commonJS({
@@ -10373,6 +10368,183 @@ var useFocus = (el) => {
   };
 };
 
+// node_modules/element-plus/es/locale/lang/en.mjs
+var English = {
+  name: "en",
+  el: {
+    breadcrumb: {
+      label: "Breadcrumb"
+    },
+    colorpicker: {
+      confirm: "OK",
+      clear: "Clear",
+      defaultLabel: "color picker",
+      description: "current color is {color}. press enter to select a new color."
+    },
+    datepicker: {
+      now: "Now",
+      today: "Today",
+      cancel: "Cancel",
+      clear: "Clear",
+      confirm: "OK",
+      dateTablePrompt: "Use the arrow keys and enter to select the day of the month",
+      monthTablePrompt: "Use the arrow keys and enter to select the month",
+      yearTablePrompt: "Use the arrow keys and enter to select the year",
+      selectedDate: "Selected date",
+      selectDate: "Select date",
+      selectTime: "Select time",
+      startDate: "Start Date",
+      startTime: "Start Time",
+      endDate: "End Date",
+      endTime: "End Time",
+      prevYear: "Previous Year",
+      nextYear: "Next Year",
+      prevMonth: "Previous Month",
+      nextMonth: "Next Month",
+      year: "",
+      month1: "January",
+      month2: "February",
+      month3: "March",
+      month4: "April",
+      month5: "May",
+      month6: "June",
+      month7: "July",
+      month8: "August",
+      month9: "September",
+      month10: "October",
+      month11: "November",
+      month12: "December",
+      week: "week",
+      weeks: {
+        sun: "Sun",
+        mon: "Mon",
+        tue: "Tue",
+        wed: "Wed",
+        thu: "Thu",
+        fri: "Fri",
+        sat: "Sat"
+      },
+      weeksFull: {
+        sun: "Sunday",
+        mon: "Monday",
+        tue: "Tuesday",
+        wed: "Wednesday",
+        thu: "Thursday",
+        fri: "Friday",
+        sat: "Saturday"
+      },
+      months: {
+        jan: "Jan",
+        feb: "Feb",
+        mar: "Mar",
+        apr: "Apr",
+        may: "May",
+        jun: "Jun",
+        jul: "Jul",
+        aug: "Aug",
+        sep: "Sep",
+        oct: "Oct",
+        nov: "Nov",
+        dec: "Dec"
+      }
+    },
+    inputNumber: {
+      decrease: "decrease number",
+      increase: "increase number"
+    },
+    select: {
+      loading: "Loading",
+      noMatch: "No matching data",
+      noData: "No data",
+      placeholder: "Select"
+    },
+    dropdown: {
+      toggleDropdown: "Toggle Dropdown"
+    },
+    cascader: {
+      noMatch: "No matching data",
+      loading: "Loading",
+      placeholder: "Select",
+      noData: "No data"
+    },
+    pagination: {
+      goto: "Go to",
+      pagesize: "/page",
+      total: "Total {total}",
+      pageClassifier: "",
+      page: "Page",
+      prev: "Go to previous page",
+      next: "Go to next page",
+      currentPage: "page {pager}",
+      prevPages: "Previous {pager} pages",
+      nextPages: "Next {pager} pages",
+      deprecationWarning: "Deprecated usages detected, please refer to the el-pagination documentation for more details"
+    },
+    dialog: {
+      close: "Close this dialog"
+    },
+    drawer: {
+      close: "Close this dialog"
+    },
+    messagebox: {
+      title: "Message",
+      confirm: "OK",
+      cancel: "Cancel",
+      error: "Illegal input",
+      close: "Close this dialog"
+    },
+    upload: {
+      deleteTip: "press delete to remove",
+      delete: "Delete",
+      preview: "Preview",
+      continue: "Continue"
+    },
+    slider: {
+      defaultLabel: "slider between {min} and {max}",
+      defaultRangeStartLabel: "pick start value",
+      defaultRangeEndLabel: "pick end value"
+    },
+    table: {
+      emptyText: "No Data",
+      confirmFilter: "Confirm",
+      resetFilter: "Reset",
+      clearFilter: "All",
+      sumText: "Sum"
+    },
+    tour: {
+      next: "Next",
+      previous: "Previous",
+      finish: "Finish"
+    },
+    tree: {
+      emptyText: "No Data"
+    },
+    transfer: {
+      noMatch: "No matching data",
+      noData: "No data",
+      titles: ["List 1", "List 2"],
+      filterPlaceholder: "Enter keyword",
+      noCheckedFormat: "{total} items",
+      hasCheckedFormat: "{checked}/{total} checked"
+    },
+    image: {
+      error: "FAILED"
+    },
+    pageHeader: {
+      title: "Back"
+    },
+    popconfirm: {
+      confirmButtonText: "Yes",
+      cancelButtonText: "No"
+    },
+    carousel: {
+      leftArrow: "Carousel arrow left",
+      rightArrow: "Carousel arrow right",
+      indicator: "Carousel switch to index {index}"
+    }
+  }
+};
+
 // node_modules/element-plus/es/hooks/use-locale/index.mjs
 var buildTranslator = (locale) => (path, option) => translate(path, option, unref(locale));
 var translate = (path, option, locale) => get_default(locale, path, path).replace(/\{(\w+)\}/g, (_2, key) => {

package-lock.json

@@ -38,6 +38,7 @@
         "@vitejs/plugin-vue": "^5.0.4",
         "vite": "^5.1.6",
         "vite-plugin-require-transform": "^1.0.21",
+        "vue3-audio-player": "^1.0.7",
         "vuex": "^4.1.0"
       }
     },
@@ -46,6 +47,52 @@
       "resolved": "https://registry.npmjs.org/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
       "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
     },
+    "node_modules/@any-touch/compute": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@any-touch/compute/-/compute-2.2.0.tgz",
+      "integrity": "sha512-hrw74b/cVT8SmiKFLValmllajw+bBvTa5iUwIXFVVIJM9T3tO15zZC2QbjVz8Uwi6XjH932RDUILGMs2TNvyQg==",
+      "dev": true,
+      "dependencies": {
+        "@any-touch/shared": "^2.2.0",
+        "@any-touch/vector": "^2.2.0",
+        "tslib": "^2.3.1"
+      }
+    },
+    "node_modules/@any-touch/core": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@any-touch/core/-/core-2.2.0.tgz",
+      "integrity": "sha512-xMHAA5aLCatFto+4fQWyE4YAsyN/LsXS4mnYuVpqFYoNz8dl5FsB/TIyb9JrqMKLYMxxcZ9joqR8gDprH1lwBw==",
+      "dev": true,
+      "dependencies": {
+        "@any-touch/shared": "^2.2.0",
+        "any-event": "^2.2.0"
+      }
+    },
+    "node_modules/@any-touch/pan": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@any-touch/pan/-/pan-2.2.0.tgz",
+      "integrity": "sha512-uMkCHbTm5qWji/FvhumP9n1ZCkPU7hy864g+ZhoWZ0OWAmn7s/TKRo4UqPBfqEPUMV6obGZvatrrgBLWT6J57w==",
+      "dev": true,
+      "dependencies": {
+        "@any-touch/compute": "^2.2.0",
+        "@any-touch/shared": "^2.2.0"
+      }
+    },
+    "node_modules/@any-touch/shared": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@any-touch/shared/-/shared-2.2.0.tgz",
+      "integrity": "sha512-2n1zWaATi/3osr/dkIUq5O7aSffKUsTM4DsIbPMW1VEO77v/rX2HkLoxt2Djzj5eCGh7An55Vw8NeA33kTTSRA==",
+      "dev": true
+    },
+    "node_modules/@any-touch/vector": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@any-touch/vector/-/vector-2.2.0.tgz",
+      "integrity": "sha512-t7pGYegIDCJl+swwsohZHZKmF71ZMt+hjwVEyhaEP6nQhcx6S7zulxnRxNp1t8s+c/JdK02Q89HnzQ4Ukg4+IA==",
+      "dev": true,
+      "dependencies": {
+        "@any-touch/shared": "^2.2.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.24.2",
       "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.2.tgz",
@@ -1239,6 +1286,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/any-event": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/any-event/-/any-event-2.2.0.tgz",
+      "integrity": "sha512-PB4sEiVUjL+5mLmwlAGYdI5/1ouckapxS6+RPIvrGXv9XTMav7M3k3rR/f9fwAR+e2608CTR3FOR5HrOEYTtKA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.3.1"
+      }
+    },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -4551,6 +4607,17 @@
         "vue": "^3.2.0"
       }
     },
+    "node_modules/vue3-audio-player": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/vue3-audio-player/-/vue3-audio-player-1.0.7.tgz",
+      "integrity": "sha512-7uGyCDzJaEIN4VV7Sf/s/nOUcO7SV0mRNFjf7dOAG+clVGF8rcL8Arp0vXGwmx4jzxqwOcLhl3C6TK/r9eoI/A==",
+      "dev": true,
+      "dependencies": {
+        "@any-touch/core": "^2.0.2",
+        "@any-touch/pan": "^2.0.2",
+        "vue": "^3.2.25"
+      }
+    },
     "node_modules/vue3-print-nb": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/vue3-print-nb/-/vue3-print-nb-0.1.4.tgz",

package.json

@@ -37,9 +37,9 @@
     "@types/node": "^20.12.7",
     "@types/vue": "^2.0.0",
     "@vitejs/plugin-vue": "^5.0.4",
-    "vue3-audio-player": "^1.0.7",
     "vite": "^5.1.6",
     "vite-plugin-require-transform": "^1.0.21",
+    "vue3-audio-player": "^1.0.7",
     "vuex": "^4.1.0"
   }
 }

public/config.js

 
- export const ExternalSERVEICE='http://218.69.97.198:8001'
- export const WithinSERVEICE='http://192.168.1.252:8001'
-// export const ExternalSERVEICE='http://localhost:5013'
-// export const WithinSERVEICE='http://localhost:5013'
+//  export const ExternalSERVEICE='http://218.69.97.198:8001'
+//  export const WithinSERVEICE='http://192.168.1.252:8001'
+export const ExternalSERVEICE='http://localhost:5013'
+export const WithinSERVEICE='http://localhost:5013'
 export const CURRLOGO="LOGO_gangyi.png"
 
 

src/views/home.vue

@@ -194,30 +194,28 @@
         <div class="header-info">
           <div class="h-link">
             <a href="javascript:void(0)" @click="openMap" title="可视化界面">
-              <el-icon style="fontsize: 30px">
+              <el-icon :style="{ fontSize: '30px' }">
                 <MapLocation color="rgb(255,255,255)" />
               </el-icon>
             </a>
           </div>
           <div class="h-link">
             <a href="javascript:void(0)" :title="realName">
-              <el-icon style="fontsize: 25px">
+              <el-icon :style="{ fontSize: '30px' }">
                 <UserFilled color="rgb(161,187,214)" />
               </el-icon>
             </a>
           </div>
           <div class="h-link">
             <a href="javascript:void(0)" title="系统设置">
-              <el-icon style="fontsize: 25px">
-                <!-- <el-image src="/imgs/home/Sys.png" :fit="'fill'" /> -->
+              <el-icon :style="{ fontSize: '30px' }">
                 <Setting color="rgb(255,255,255)" />
               </el-icon>
             </a>
           </div>
           <div class="h-link">
             <a href="javascript:void(0)" @click="logout" title="退出系统">
-              <el-icon style="fontsize: 25px">
-                <!-- <el-image src="/imgs/home/exit.png" :fit="'fill'" /> -->
+              <el-icon :style="{ fontSize: '30px' }">
                 <SwitchButton color="rgb(255,255,255)" />
               </el-icon>
             </a>
@@ -803,7 +801,7 @@ export default defineComponent({
       getinfo();
       alarm();
       countalarm();
-    }, 10 * 1000); // 每分钟执行一次
+    }, 60 * 1000); // 每分钟执行一次
 
     return {
       menuWidth,