diff --git a/.env.development b/.env.development index 3073d66..d779897 100644 --- a/.env.development +++ b/.env.development @@ -24,7 +24,7 @@ VITE_GLOB_COFFEE_API_URL = http://221.2.83.243:6050/coffee VITE_GLOB_GEOSERVER_BASE_URL = http://192.168.10.163:8080 # 导航 -VITE_GLOBAL_NAVIGATION_BASE_URL = http://221.2.83.243:8091 +VITE_GLOB_NAVIGATION_BASE_URL = http://221.2.83.243:8091 # ANYRTC CALL VITE_GLOB_ANYRTC_BASE_URL = https://ktdrw.wisestcity.com:6070 diff --git a/.env.linyefanghuo b/.env.linyefanghuo index 589eae6..d713dfe 100644 --- a/.env.linyefanghuo +++ b/.env.linyefanghuo @@ -26,7 +26,7 @@ VITE_GLOB_INFO_IMAGE_URL= http://221.2.83.243:6050/core VITE_GLOB_GEOSERVER_BASE_URL = http://221.2.83.243:6050/ # 导航 -VITE_GLOBAL_NAVIGATION_BASE_URL = http://221.2.83.243:8091 +VITE_GLOB_NAVIGATION_BASE_URL = http://221.2.83.243:8091 # 视频通话 VITE_GLOB_ANYRTC_BASE_URL = https://ktdrw.wisestcity.com:6070 diff --git a/src/api/demo/system.ts b/src/api/demo/system.ts index f08d016..70d21fa 100644 --- a/src/api/demo/system.ts +++ b/src/api/demo/system.ts @@ -77,6 +77,7 @@ enum Api { GetInterphoneInfo = '/api/FmInterPhone/GetInterphoneInfo', DeleteInterphoneInfo = '/api/FmInterPhone/DeleteInterphoneInfo', AddOrUpdateInterphoneInfo = '/api/FmInterPhone/AddOrUpdateInterphoneInfo', + } export const getPositionsTree = (params?: AccountParams) => diff --git a/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue b/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue index 556db8d..cf1cc30 100644 --- a/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue +++ b/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue @@ -79,13 +79,11 @@ datasSize, } = toRefs(props.chartConfig.option); - console.log("navsArr",navsArr.value) - - const navsClick = function (item, index) { navsIndex.value = index; props.chartConfig.request.requestSQLContent.sql = item.sql; + console.log("SQL_123",item.sql); useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any) => { props.chartConfig.option.sectionDatas = resData; handlerLoadFirePoint(sectionDatas.value); @@ -215,7 +213,6 @@ const getFileImage = (type) => { } // 加载火点信息 const handlerLoadFirePoint = (points: []) => { - console.log("points123",points); points?.forEach((item, index) => { let graphicOptions = { diff --git a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue index ce63940..82c8dad 100644 --- a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue +++ b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue @@ -1,19 +1,22 @@ @@ -65,6 +75,7 @@ @@ -189,6 +303,59 @@ onMounted(() => { color: v-bind('textColors[0]'); } } + + .searchbox{ + height: 35px; + margin-top: 5px; + margin-bottom:5px; + gap:10px; + .selbox{ + width: 150px; + height: 35px; + background: #05231A; + border-radius: 3px; + border: 1px solid #00611A; + background: url("@/assets/images/chart/xunchaguiji/gjinputbg.png"); + background-size: 100% 100%; + } + .inpbox{ + width: 150px; + height: 100%; + background: url("@/assets/images/chart/xunchaguiji/gjinputbg.png"); + background-size: 100% 100%; + margin-right: 4px; + } + .img{ + width: 20px; + height: 20px; + } + .span{ + color: #FFFFFF; + font-size: 14px; + margin-left: 5px; + } + .searchbtn{ + width: 72px; + height: 30px; + background: linear-gradient( 95deg, #00C16B 0%, #008E39 100%), #000000; + border-radius: 3px; + margin-right: 4px; + } + .tongjibtn{ + width: 72px; + height: 30px; + background: linear-gradient( 277deg, #C14000 0%, #FF8849 100%), #000000; + border-radius: 3px; + margin-right: 4px; + } + .xunjianbtn{ + width: 72px; + height: 30px; + background: linear-gradient( 277deg, #125FE3 0%, #1C9DCA 100%), #000000; + border-radius: 3px; + } + } + .scopedbox{ height: 100%; min-width: 120px; @@ -269,7 +436,19 @@ onMounted(() => { .secli:nth-child(2n){ background: v-bind('backgroundColors[2]'); } + + .more-button{ + text-align: center; + color:#fff; + line-height:40px; + cursor:pointer; + &:hover{ + color:#0EB687; + } + } } + + } /* 整个滚动条的样式 */ @@ -288,4 +467,97 @@ onMounted(() => { ::-webkit-scrollbar-thumb:hover { background: #34FFE0; /* 鼠标悬停时的滑块颜色 */ } + + +:deep(.n-input){ + background: none; + margin-left: 5px; +} +:deep(.n-input__state-border){ + border-color: none; +} +:deep(.n-input .n-input__input-el, .n-input .n-input__textarea-el){ + color: #fff; +} +:deep(.n-input .n-input__border, .n-input .n-input__state-border){ + border: none; +} +:deep(.n-input:not(.n-input--disabled).n-input--focus .n-input__state-border){ + border: none !important; + box-shadow: none !important; +} + +:deep(.n-base-selection .n-base-selection-label .n-base-selection-input){ + background: none; + color: #fff; +} +:deep(.n-base-selection .n-base-selection-label){ + background: none; +} +:deep(.n-base-select-menu){ + background: none; +} +:deep(.n-base-selection .n-base-selection__border, .n-base-selection .n-base-selection__state-border){ + border: none; +} +:deep(.el-select__wrapper){ + background: none; + box-shadow: none; +} +:deep(.el-select__placeholder){ + color: #fff; +} + + +/* 1. 输入框容器透明 */ +.transparent-select :deep(.n-base-selection) { + background-color: transparent !important; + border: none !important; + box-shadow: none !important; +} + +/* 输入框悬浮状态 */ +.transparent-select :deep(.n-base-selection:hover) { + background-color: transparent !important; + border: none !important; +} + +/* 输入框聚焦状态 */ +.transparent-select :deep(.n-base-selection--focus) { + background-color: transparent !important; + border: none !important; + box-shadow: none !important; +} + +/* 2. 下拉菜单透明 */ +.transparent-select :deep(.n-base-select-menu) { + background-color: transparent !important; + border: none !important; + box-shadow: none !important; +} + +/* 3. 下拉选项透明 */ +.transparent-select :deep(.n-base-select-option) { + background-color: transparent !important; +} + +/* 下拉选项悬浮状态（建议保留微弱的背景，提升可用性） */ +.transparent-select :deep(.n-base-select-option:hover) { + background-color: rgba(0, 0, 0, 0.05) !important; +} + +/* 4. 隐藏分割线（如果有） */ +.transparent-select :deep(.n-base-select-menu__action) { + border-top: none !important; +} + +/* 5. 箭头图标半透明（可选） */ +.transparent-select :deep(.n-base-selection__arrow) { + opacity: 0.5; +} + +/* 清除图标半透明（可选） */ +.transparent-select :deep(.n-base-selection__clear) { + opacity: 0.5; +} diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_LuXianGuHua/lib/routePathNew.ts b/src/packages/components/Zhichu/Zhichu/ZhiChu_LuXianGuHua/lib/routePathNew.ts index d42d420..609cb3a 100644 --- a/src/packages/components/Zhichu/Zhichu/ZhiChu_LuXianGuHua/lib/routePathNew.ts +++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_LuXianGuHua/lib/routePathNew.ts @@ -1,13 +1,15 @@ import axios from "axios"; import { gcj02towgs84, wgs84togcj02 } from 'coordtransform' import * as turf from '@turf/turf' + + import { Url } from "./urlFormat"; // import { getMethodCommon } from "../../../api/common"; import { parse } from "./handleGeojson"; import { deepClone } from "./utils"; const urls = new Url() import { getAppEnvConfig } from '@/utils/env'; -const { VITE_GLOB_API_URL,VITE_GLOBAL_NAVIGATION_BASE_URL } = getAppEnvConfig(); +const { VITE_GLOB_API_URL,VITE_GLOB_NAVIGATION_BASE_URL } = getAppEnvConfig(); const GD_URL = "https://restapi.amap.com/v5/direction/driving" const GD_KEY = "6af6a87038f44c8c793aa70331f2b7ca" import * as mars3d from 'mars3d'; @@ -25,7 +27,7 @@ let pathRoadGraphicLayers2 = null export const getMethodCommon = (url,params) => { - return axios(`${VITE_GLOBAL_NAVIGATION_BASE_URL}${url}?point=${params.startCoord}&point=${params.endCoord}&profile=car&points_encoded=false`,{ + return axios(`${VITE_GLOB_NAVIGATION_BASE_URL}${url}?point=${params.startCoord}&point=${params.endCoord}&profile=car&points_encoded=false`,{ method:"GET" }) } diff --git a/src/utils/env.ts b/src/utils/env.ts index c9657ee..68ec94b 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -49,7 +49,7 @@ export function getAppEnvConfig() { VITE_GLOB_GEOSERVER_BASE_URL, VITE_GLOB_COFFEE_API_URL, VITE_GLOB_ANYRTC_BASE_URL, - VITE_GLOBAL_NAVIGATION_BASE_URL, + VITE_GLOB_NAVIGATION_BASE_URL, } = ENV; let { VITE_GLOB_API_URL } = ENV; if (localStorage.getItem(API_ADDRESS)) { @@ -76,7 +76,7 @@ export function getAppEnvConfig() { VITE_GLOB_APP_FLV_URL, VITE_GLOB_SRS_API_URL, VITE_GLOB_ANYRTC_BASE_URL, - VITE_GLOBAL_NAVIGATION_BASE_URL, + VITE_GLOB_NAVIGATION_BASE_URL, }; } diff --git a/src/views/demo/fire/firemonitor/AddModal.vue b/src/views/demo/fire/firemonitor/AddModal.vue index 08f334a..bf05825 100644 --- a/src/views/demo/fire/firemonitor/AddModal.vue +++ b/src/views/demo/fire/firemonitor/AddModal.vue @@ -1,72 +1,80 @@ @@ -82,9 +90,38 @@ import { SelectAccount } from './page'; import { reactive, ref, onMounted, watch, defineProps } from 'vue'; import { Map } from './page'; + import axios from 'axios'; + import { getAppEnvConfig } from '@/utils/env'; + let { VITE_GLOB_API_URL } = getAppEnvConfig(); - const labelCol = { span: 3 }; - const wrapperCol = { span: 6 }; + const cameraTypeOptions = ref([ + { + label:"枪机", + value:0 + },{ + label:"半球", + value:1 + },{ + label:"快球", + value:2 + },{ + label:"带云台枪机", + value:3 + } + ]) + + const manufacturerTypeOptions = ref([ + { + value: "海康", + label: '海康', + }, + { + value: "大华", + label: '大华', + } + ]) + const labelCol = { span: 4 }; + const wrapperCol = { span: 18 }; const SelectAccountRef = ref(); const accountVisible = ref(false); const mapVisible = ref(false); @@ -106,7 +143,7 @@ tableData: [], }); const PostionRef = ref(); - onMounted(() => {}); + const addPerson = () => { accountVisible.value = true; }; @@ -128,7 +165,7 @@ const createSite = () => { const params = { ...addForm.value, - accountList: accountList.value, + // accountList: accountList.value, }; return params; }; @@ -147,14 +184,53 @@ createSite, validateForm, }); + + + +const modelOptions = ref([]); + + + const cameraTypes = ref({}); + + const getCameraType = () => { + let url = "/api/SysDataItemDetail/Load"; + let querys = { + code:"FMCamera" + } + + axios({ + method: "get", + url: VITE_GLOB_API_URL + url, + params: querys, + headers: { + 'X-Token': localStorage.getItem("X-Token") + } + }).then(res=>{ + + res.data.result?.forEach((item,index)=>{ + modelOptions.value.push({ + label:item.itemName, + value:item.itemValue, + }) + cameraTypes.value[item.itemValue] = item.itemName + }) + }) + + } + + getCameraType(); + +onMounted(() => { + +}); diff --git a/src/views/demo/fire/firemonitor/Map.vue b/src/views/demo/fire/firemonitor/Map.vue index 641628d..7d89375 100644 --- a/src/views/demo/fire/firemonitor/Map.vue +++ b/src/views/demo/fire/firemonitor/Map.vue @@ -3,9 +3,10 @@