diff --git a/src/assets/js/api/loginSign.js b/src/assets/js/api/loginSign.js index d4ed7422..cdc9f1b3 100644 --- a/src/assets/js/api/loginSign.js +++ b/src/assets/js/api/loginSign.js @@ -54,4 +54,10 @@ export const jumpLargeUserInfoApi = data => post('xmgl/base/getLoginInfoByToken' // 获取登录的图片验证码 export const getImgCodeLoginApi = data => get('xmgl/base/login/captcha', data); // 账号密码登录（带验证码） -export const verifyLoginApi = data => post('xmgl/base/verify/login', data); \ No newline at end of file +export const verifyLoginApi = data => post('xmgl/base/verify/login', data); + +// 用户中心 +// 保存用户配置信息 +export const saveConfigUserConfigApi = data => post('xmgl/userConfig/saveConfig', data); +// 列表查询用户配置信息 +export const getUserConfigListApi = data => get('xmgl/userConfig/list', data); \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 9e211d82..aa0c64a7 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -181,7 +181,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 - // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 + axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 @@ -208,7 +208,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = "http://139.9.66.234:20628"; // axios.defaults.baseURL = "http://jxj.zhgdyun.com:9500"; // axios.defaults.baseURL = "http://jxj.zhgdyun.com:21000"; // 潮州 - axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 敦煌 + // axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 敦煌 // axios.defaults.baseURL = "https://gszhdz.crpower.com.cn:9807/"; // 敦煌 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; diff --git a/src/components/header.vue b/src/components/header.vue index 5959863a..ee5061a8 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -28,11 +28,12 @@ >>{{ item.name }} -
+ + +
+
diff --git a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue index 7d149397..c8021872 100644 --- a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue +++ b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue @@ -597,7 +597,7 @@ export default { let tempCode = row.serialNumber; const param = { cameraIndexCode: tempCode, - streamType: row.defaultStreamType == 2 ? 0 : row.defaultStreamType, + streamType: row.defaultStreamType && row.eIndex < 4 ? row.defaultStreamType : "", type: window.location.protocol.includes("https") ? "wss" : "ws", transmode: 1, itemId: row.itemId, diff --git a/src/components/videoModule/isc_plugin/video_isc_plugin.js b/src/components/videoModule/isc_plugin/video_isc_plugin.js index a9499063..9f3f5ccf 100644 --- a/src/components/videoModule/isc_plugin/video_isc_plugin.js +++ b/src/components/videoModule/isc_plugin/video_isc_plugin.js @@ -76,7 +76,7 @@ export function unInitObjPlugin() { } } //预览视频 -export function OpenVideo(cameraIndexCode, streamMode, winIndex) { +export function OpenVideo(cameraIndexCode, streamMode, winIndex = 0) { var transMode = +'1'; //传输协议：1、TCP 0、UDP var gpuMode = +'0'; //是否启用GPU硬解：1、启用 0、不启用 console.log(8855544, streamMode) @@ -84,7 +84,7 @@ export function OpenVideo(cameraIndexCode, streamMode, winIndex) { funcName: "startPreview", argument: JSON.stringify({ cameraIndexCode: cameraIndexCode, - streamMode: streamMode == 2 ? 0 : streamMode, // 码流类型 0 主码流 1 子码流 (2 主码流 1 子码流) + streamMode: streamMode == 2 && (winIndex > 4) ? 0 : 1, // 码流类型 0 主码流 1 子码流 (2 主码流 1 子码流) transMode: transMode, gpuMode: gpuMode, wndId: -1, diff --git a/src/components/videoModule/videoModule.vue b/src/components/videoModule/videoModule.vue index 98cd6a89..4f384944 100644 --- a/src/components/videoModule/videoModule.vue +++ b/src/components/videoModule/videoModule.vue @@ -36,7 +36,7 @@ :type="type" :isIframe="isIframe" :devList="devList" - v-if="infor.enableNotPlugin != 1" + v-if="isWindows() && $store.state.forceH5Play == 0" :class="{ isDockingToWoer: isDockingToWoer, isLongguangIframe: isIframe, @@ -324,6 +324,7 @@ import { } from "./isc_plugin/video_isc_plugin.js"; import { getVideoItemInfoApi } from "@/assets/js/api/equipmentCenter/cameraList"; import { projectVideoConfigListApi } from "@/assets/js/api/equipmentCenter/cameraList"; +import { isWindows } from "@/util/util"; export default { props: [ "value", @@ -507,6 +508,7 @@ export default { window.removeEventListener("keydown", this.fullScreen); }, methods: { + isWindows, selectPlayVideo(find) { this.$emit("selectPlayVideo", find); }, diff --git a/src/store/index.js b/src/store/index.js index d2c754fd..00cb9f99 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -41,6 +41,7 @@ export default new Vuex.Store({ uid: val.uid, reloadPage: val.reloadPage, projectExtendInfo: val.projectExtendInfo, + forceH5Play: val.forceH5Play, }; }, }), @@ -291,6 +292,7 @@ export default new Vuex.Store({ uid: false, //是否第三方免码登录 true为免码登录 reloadPage: false, //重载页面 因为动态加载资源 要刷新页面 projectExtendInfo: null, //项目扩展信息 + forceH5Play: 0, //项目扩展信息 }, mutations: { setUPLOADURL(state, data) { @@ -314,6 +316,9 @@ export default new Vuex.Store({ // setCurrentUrl(state,data){ // state.currentUrl = data // } + setForceH5Play(state,data){ + state.forceH5Play = data + }, setProjectSn(state, data) { state.projectSn = data; }, diff --git a/src/util/util.js b/src/util/util.js index 7ede5540..9bda381e 100644 --- a/src/util/util.js +++ b/src/util/util.js @@ -113,4 +113,9 @@ export function handleSingleMaskedField(fieldName, currentValue, originalValue) return null; } return currentValue; +} + +// 判断当前系统是不是windows系统 +export function isWindows() { + return navigator.userAgent.indexOf('Windows') !== -1; } \ No newline at end of file diff --git a/src/views/companyAdmin/companyBigScreen/aIEarlyWarn/areaTree.vue b/src/views/companyAdmin/companyBigScreen/aIEarlyWarn/areaTree.vue index 78a2b34f..cddb4ce7 100644 --- a/src/views/companyAdmin/companyBigScreen/aIEarlyWarn/areaTree.vue +++ b/src/views/companyAdmin/companyBigScreen/aIEarlyWarn/areaTree.vue @@ -12,7 +12,7 @@
@@ -97,6 +97,7 @@ import { projectVideoConfigListApi, } from "@/assets/js/api/equipmentCenter/cameraList"; import { selectAllProjectInfoList } from "@/assets/js/api/companyBigScreen.js"; +import { isWindows } from "@/util/util"; export default { props: [ "videoType", @@ -132,6 +133,7 @@ export default { this.loadData(); }, methods: { + isWindows, shrinkCloseFlagFn() { this.shrinkCloseFlag = !this.shrinkCloseFlag; this.$emit("shrinkCloseChange", this.shrinkCloseFlag); diff --git a/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue b/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue index a0de644d..fce00feb 100644 --- a/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue +++ b/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue @@ -144,6 +144,7 @@ v-model="policeCameraItemInfo.deviceState" clearable placeholder="请选择" + @visible-change="visibleChange" > --> -
@@ -365,8 +353,20 @@ :equipmentDialog=" equipmentDialog " + :visibleDialog="visibleDialog" >
+
); import IscPlugin from "../terminalOperation/components/isc_plugin"; import { Message } from "element-ui"; +import { isWindows } from "@/util/util"; import { getWorkTicketCountWorkTicketApi, getWorkTicketPageApi, @@ -999,6 +1000,10 @@ const onViewAllClick = () => { const equipmentDialog = ref(false); const equipmentDetail = ref({}); +const visibleDialog = ref(false); +const visibleChange = (val) => { + visibleDialog.value = val; +}; // 查看设备详情 const onEquipmentClick = (row) => { equipmentDetail.value = row; diff --git a/src/views/companyAdmin/companyBigScreen/terminalOperation/components/isc_plugin.vue b/src/views/companyAdmin/companyBigScreen/terminalOperation/components/isc_plugin.vue index 7968d430..83a456ae 100644 --- a/src/views/companyAdmin/companyBigScreen/terminalOperation/components/isc_plugin.vue +++ b/src/views/companyAdmin/companyBigScreen/terminalOperation/components/isc_plugin.vue @@ -17,7 +17,7 @@ let closeVideo = null; import VideoPlugin from "./video_isc_plugin.js"; import { getVideoItemInfoPoliceCameraItemApi } from "@/assets/js/api/workTicketManage"; export default { - props: ["devList", "type", "isIframe", "itemId", "equipmentDialog"], + props: ["devList", "type", "isIframe", "itemId", "equipmentDialog", "visibleDialog"], data() { return { layout: "1x1", @@ -124,11 +124,10 @@ export default { // } // }, // }, - equipmentDialog: { - // immediate: true, + isVisible: { handler(newval) { console.log("resizeFn", newval, this.videoPlugin); - if (newval) { + if (newval.equipmentDialog || newval.visibleDialog) { this.videoPlugin.hidePluginWindow(); } else { this.videoPlugin.showPluginWindow(); @@ -136,12 +135,18 @@ export default { // 调整大小 // this.videoPlugin.resizePlugin('', this.itemId); }, - }, + } }, computed: { isExpand() { return this.$store.state.isExpand; }, + isVisible() { + return { + equipmentDialog: this.equipmentDialog, + visibleDialog: this.visibleDialog, + } + } }, }; diff --git a/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue b/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue index 406dfcf8..1c8bd9d3 100644 --- a/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue +++ b/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue @@ -143,6 +143,7 @@ v-model="policeCameraItemInfo.deviceState" clearable placeholder="请选择" + @visible-change="visibleChange" > --> -
@@ -380,8 +368,20 @@ :equipmentDialog=" equipmentDialog " + :visibleDialog="visibleDialog" >
+
import("./components/iscPlayer.vue") ); import IscPlugin from "./components/isc_plugin"; +import { isWindows } from "@/util/util"; import { Message } from "element-ui"; import { getWorkTicketCountWorkTicketApi, @@ -1012,6 +1013,10 @@ const onViewAllClick = () => { const equipmentDialog = ref(false); const equipmentDetail = ref({}); +const visibleDialog = ref(false); +const visibleChange = (val) => { + visibleDialog.value = val; +}; // 查看设备详情 const onEquipmentClick = (row) => { console.log(7747,row); diff --git a/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue b/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue index 875e84e0..90a35b5f 100644 --- a/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue +++ b/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue @@ -12,8 +12,8 @@
@@ -133,7 +133,7 @@
-
+
云台
index < 16) diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue index 061ca02a..dabae433 100644 --- a/src/views/equipmentCenter/videoManage/videoConfig.vue +++ b/src/views/equipmentCenter/videoManage/videoConfig.vue @@ -1075,12 +1075,12 @@ placeholder="请输入外网端口" > - +
diff --git a/src/views/home/login_v3.vue b/src/views/home/login_v3.vue index c9816279..40c82154 100644 --- a/src/views/home/login_v3.vue +++ b/src/views/home/login_v3.vue @@ -539,6 +539,7 @@ import { selectSystemLogoConfigApi } from "@/assets/js/api/jxjadmin"; import getcode from "@/components/getMsgCode"; import { getOneComputerAuthApi } from "@/assets/js/api/loginSign"; import { selectNoticeRemindSoundApi } from "@/assets/js/api/configManage"; +import { getUserConfigListApi } from "@/assets/js/api/loginSign"; import LoginInfo from "./components/loginInfo.vue"; import axios from "axios"; import { MD5 } from "crypto-js"; @@ -1390,6 +1391,7 @@ export default { "Bearer" + " " + data.token; this.$http.defaults.headers.common["operateId"] = data.userId; this.$store.commit("setUserInfo", data); + this.getUserConfigList(data); localStorage.setItem("jumpToken", data.token); //储存token到本地 let isHaveUserCenterMenu = false; // 判断是否有用户中心模块 var moduleList = data.menuAuthority.moduleList @@ -1587,6 +1589,17 @@ export default { } this.selectMp3FileList(); }, + getUserConfigList(data) { + getUserConfigListApi({ + userId: data.userId, + }).then((res) => { + if (res.code === 200) { + if(res.result instanceof Array && res.result.length > 0) { + this.$store.commit("setForceH5Play", res.result[0].forceH5Play); + } + } + }); + }, }, }; diff --git a/src/views/projectFront/configManage/notificationRuleSet.vue b/src/views/projectFront/configManage/notificationRuleSet.vue index 166bf067..11479a1a 100644 --- a/src/views/projectFront/configManage/notificationRuleSet.vue +++ b/src/views/projectFront/configManage/notificationRuleSet.vue @@ -281,14 +281,14 @@ @@ -26,19 +27,22 @@ import DataListData from './componentsModule/dataListData' import DataFormData from './componentsModule/dataFormData' import DataInfoFormData from './componentsModule/dataInfoFormData' +import SystemSetting from './componentsModule/systemSetting' export default { components: { DataListData, DataFormData, - DataInfoFormData + DataInfoFormData, + SystemSetting }, data() { return { - checkedId: 1, + checkedId: 4, centerModuleList: [ {id: 1, name: '个人信息'}, {id: 2, name: '修改密码'}, - {id: 3, name: '安全日志'} + {id: 3, name: '安全日志'}, + {id: 4, name: '系统设置'}, ], } },