diff --git a/debug.log b/debug.log index 5b153905..00d8faad 100644 --- a/debug.log +++ b/debug.log @@ -29,3 +29,7 @@ [1022/140627.514:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) [1022/140628.205:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) [1022/140628.872:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1201/183600.144:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1201/183600.190:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1201/183601.414:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1201/183602.811:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 9ed9f750..1573cdeb 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -181,35 +181,35 @@ 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.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 - // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 - // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - // axios.defaults.baseURL = 'http://101.43.164.214:11111/' // 百色三标段项目 - // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 - // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 - // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址 - // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 - // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 - // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 - // axios.defaults.baseURL = 'http://192.168.9.249:9820/' //四川网城正式地址 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:34568/' //四川网城外网映射地址 - // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 - // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 - // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工 - // axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒 - // axios.defaults.baseURL = "https://zm.zhgdyun.com:11111"; - // axios.defaults.baseURL = "http://121.37.106.37:9809"; - // 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 = "https://gszhdz.crpower.com.cn:9807/"; // 敦煌 + 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/' //彭洁远程 + // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 + // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 + // axios.defaults.baseURL = 'http://101.43.164.214:11111/' // 百色三标段项目 + // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 + // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 + // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) + // axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址 + // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) + // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 + // axios.defaults.baseURL = 'http://192.168.9.249:9820/' //四川网城正式地址 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:34568/' //四川网城外网映射地址 + // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 + // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 + // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工 + // axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒 + // axios.defaults.baseURL = "https://zm.zhgdyun.com:11111"; + // axios.defaults.baseURL = "http://121.37.106.37:9809"; + // 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 = "https://gszhdz.crpower.com.cn:9807/"; // 敦煌 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/pages/index/index.js b/src/pages/index/index.js index ae42de01..239cebdb 100644 --- a/src/pages/index/index.js +++ b/src/pages/index/index.js @@ -326,6 +326,8 @@ Vue.directive('permission', { const { value } = binding; // 判断当前用户是否拥有该按钮权限 if (!Vue.prototype.checkPermission(value)) { + console.log('权限：', el.parentNode) + el.parentNode.removeChild(el); } } @@ -337,13 +339,14 @@ Vue.prototype.checkPermission = function(permission) { permissions = permissions.filter( (x) => x.path == permission.menuPath )[0]; - // console.log('权限', permissions) + console.log('权限', permissions) if (!permissions || !permissions.actionList) { return false; } let index = permissions.actionList.findIndex( (x) => x.actionCode == permission.key ) + console.log('index', index != -1, permission.key) return index != -1 ? true : false; } // 加载缩略图 diff --git a/src/store/index.js b/src/store/index.js index 65133b8b..d2c754fd 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -94,10 +94,10 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 // FILEURL: 'http://42.180.188.17:11211/image/', //测试 - // BASEURL: baseUrl ? - // baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl ? + baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 @@ -108,8 +108,8 @@ export default new Vuex.Store({ // UPLOADURL: 'http://gszhdz.crpower.com.cn:9809/upload/image', //敦煌线上 // FILEURL: 'http://gszhdz.crpower.com.cn:9809/image/', //敦煌线上 - UPLOADURL: 'http://192.168.34.221:8111/upload/image', //演示平台 雄本地 - FILEURL: 'http://192.168.34.221:8111/image/', //演示平台 雄本地 + // UPLOADURL: 'http://192.168.34.221:8111/upload/image', //演示平台 雄本地 + // FILEURL: 'http://192.168.34.221:8111/image/', //演示平台 雄本地 // UPLOADURL: 'http://jxj.zhgdyun.com:100/upload/image', //演示平台 // FILEURL: 'http://jxj.zhgdyun.com:100/image/', //演示平台 diff --git a/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue b/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue index c74c9a47..a173ee5f 100644 --- a/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue +++ b/src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue @@ -237,12 +237,12 @@ {{ workTicketDetail.applicationTime }} -
+
作业内容
@@ -674,7 +674,7 @@ }}
-
+
作业内容
diff --git a/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue b/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue index 629f0103..3c27af63 100644 --- a/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue +++ b/src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue @@ -252,12 +252,12 @@ {{ workTicketDetail.applicationTime }}
-
+
作业内容
@@ -689,7 +689,7 @@ }}
-
+
作业内容
diff --git a/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue b/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue index f3f07043..875e84e0 100644 --- a/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue +++ b/src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue @@ -33,11 +33,11 @@
-
-
+
+
@@ -85,12 +85,12 @@ > {{ node.label }} @@ -109,11 +109,7 @@ v-show="data.projectNum && videoType == 0" >{{ data.projectNum }} --> - + { if (res.code == 200) { console.log(res.result, "resresresres"); @@ -387,8 +382,8 @@ export default { this.recursiveFilterList(cur.children, rountCount, resultList); } if (cur.type == "video") { - if(this.searchInfo.deviceState) { - if(this.searchInfo.deviceState == cur.videoItem.deviceState){ + if (this.searchInfo.deviceState) { + if (this.searchInfo.deviceState == cur.videoItem.deviceState) { resultList.push(cur); } return prev; @@ -537,11 +532,7 @@ export default { }, playMutipleVideo(data) { this.videoInfo = data.allvideolist[0]; - this.getProjectVideoConfigList( - data.allvideolist[0], - "all", - data.allvideolist - ); + this.getProjectVideoConfigList(data.allvideolist[0], "all", data.allvideolist); }, filterNode(value, data) { this.defaultExpand = true; @@ -549,30 +540,34 @@ export default { return data.name.indexOf(value) !== -1; }, recursion(array) { - return array.map((item) => { - if ( - item.children && - Array.isArray(item.children) && - item.children.length > 0 - ) { - item.children = this.recursion(item.children); - if(item.children.length > 0) { - return item; + return array + .map((item) => { + if (item.children && Array.isArray(item.children) && item.children.length > 0) { + item.children = this.recursion(item.children); + if (item.children.length > 0) { + return item; + } + return; } - return - } - console.log(item.deviceState, this.searchInfo.deviceState); - if(item.type == "video") { - if(item.videoItem && item.videoItem.deviceState == this.searchInfo.deviceState) { - return item; + console.log(888444, item); + if (item.type == "video") { + if ( + item.videoItem && + item.videoItem.deviceState == this.searchInfo.deviceState + ) { + return item; + } + return; } - return - } - return item; - }).filter(item => item != undefined); + return item; + }) + .filter((item) => item != undefined) + .filter((item) => (item.type != "video" ? item.children.length > 0 : true)); }, }, computed: { + // 计算树形数据的总数、在线数和离线数 + // type: 1-总数 2-在线数 3-离线数 filterTreeDataTotal() { return (type) => { if (type == 1) { @@ -599,11 +594,7 @@ export default { const dataList = structuredClone(this.treeData); return dataList.map((item) => { let children = []; - if ( - item.children && - Array.isArray(item.children) && - item.children.length > 0 - ) { + if (item.children && Array.isArray(item.children) && item.children.length > 0) { children = this.recursion(item.children); } return { @@ -631,8 +622,8 @@ export default { }; - \ No newline at end of file diff --git a/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue b/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue index 15c18838..b2295347 100644 --- a/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue +++ b/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue @@ -88,48 +88,55 @@
- - + - 设备监测 + - 录像中心 + - 图片中心 + - 音频中心 + - + index="fifth" + >工作时长统计 +
@@ -663,6 +670,7 @@ export default { }, handleClick(tab, event) { console.log(tab, event); + this.activeName = tab; this.pageInfo.pageNo = 1; if (this.activeName == "fourth") { this.pageInfo.pageSize = 28; @@ -1891,6 +1899,13 @@ export default { padding: 10px 15px 20px; height: calc(100% - 30px); position: relative; + /deep/ .el-menu { + margin-bottom: 20px; + .el-menu-item { + height: 40px; + line-height: 40px; + } + } .rightPanel_title { height: calc(38px + 36px + 22px); } diff --git a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue index 5c17fdb9..39e41a6e 100644 --- a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue +++ b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue @@ -1941,7 +1941,7 @@ export default { setWorkTicketOperateWorkTicketApi(data).then((res) => { if (res.code == 200) { if (res.result && res.result.code == 1) { - this.$alert(res.result.message, "", { + this.$alert(res.result.message, "提示", { confirmButtonText: "确定", callback: (action) => {}, });