diff --git a/public/js/config.js b/public/js/config.js index 84f2320b..6549dbb4 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,5 +1,5 @@ //-------项目配置标识------- -var COMPANY = ""; //通用 +// var COMPANY = ""; //通用 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -21,7 +21,7 @@ var COMPANY = ""; //通用 // COMPANY = "agjt"; //鞍钢集团 // COMPANY = 'zkax' //中科安信 // COMPANY = 'hfqc' //乌丹站舍(合肥启程) -// COMPANY = 'mulei' //木垒 +COMPANY = 'mulei' //木垒 var PROJECT = { local_test: "common", // 普通版 diff --git a/src/assets/js/api/quality.js b/src/assets/js/api/quality.js index d41b91a3..a1059b38 100644 --- a/src/assets/js/api/quality.js +++ b/src/assets/js/api/quality.js @@ -218,4 +218,10 @@ export const getSelectQualityStatisticsNumApi = data => post('/xmgl/qualityInspe export const getStatsByEnterpriseApi= data => post('/xmgl/qualityInspectionRecord/statsByEnterprise', data); // 分包单位统计 export const getRiskChartApi = data => post('/xmgl/qualityInspectionRecord/riskChart', data); // 风险走势图 export const getCountDangerLevelApi = data => post('/xmgl/qualityInspectionRecord/countDangerLevel', data); // 隐患数量展示 -export const getcountQualityInspectionRecordRegionApi = data => post('/xmgl/qualityInspectionRecord/countQualityInspectionRecordRegion', data); // 责任区域数据统计 \ No newline at end of file +export const getcountQualityInspectionRecordRegionApi = data => post('/xmgl/qualityInspectionRecord/countQualityInspectionRecordRegion', data); // 责任区域数据统计 + +// 质量文件管理 +export const getQualityFileListApi = data => post('/xmgl/qualityFile/page', data); +export const addQualityFileApi = data => post('/xmgl/qualityFile/add', data); +export const updateQualityFileApi = data => post('/xmgl/qualityFile/edit', data); +export const deleteQualityFileApi = data => post('/xmgl/qualityFile/delete', data); \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index f2db1152..3af6a61b 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -180,12 +180,12 @@ if (process.env.NODE_ENV == "development") { // 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://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://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/'//测试地址 diff --git a/src/components/videoModule/isc_plugin/video_isc_plugin.js b/src/components/videoModule/isc_plugin/video_isc_plugin.js index cddb1e0c..6d388b7d 100644 --- a/src/components/videoModule/isc_plugin/video_isc_plugin.js +++ b/src/components/videoModule/isc_plugin/video_isc_plugin.js @@ -394,15 +394,15 @@ function getPubKey(callback) { // } // } -// 监听滚动条 -window.addEventListener('scroll', () => { - // console.log('滚动条') - if(oWebControl != null){ - width = document.getElementById('videoOverview').offsetWidth-20 - height = document.getElementById('videoOverview').offsetHeight-18 - oWebControl.JS_Resize(width, height ); - } - },true); +// 监听滚动条 - 滚动摄像头列表会照成抖动(去除 +// window.addEventListener('scroll', () => { +// // console.log('滚动条') +// if(oWebControl != null){ +// width = document.getElementById('videoOverview').offsetWidth-20 +// height = document.getElementById('videoOverview').offsetHeight-18 +// oWebControl.JS_Resize(width, height ); +// } +// },true); // 监听窗口 // window.addEventListener('resize', () => { // console.log('窗口') diff --git a/src/components/videoModule/playBack/back.js b/src/components/videoModule/playBack/back.js index ba2d38c2..c5e4bc7f 100644 --- a/src/components/videoModule/playBack/back.js +++ b/src/components/videoModule/playBack/back.js @@ -380,15 +380,15 @@ function getPubKey(callback) { // } // } -// 监听滚动条 -window.addEventListener('scroll', () => { - // console.log('滚动条') - if(oWebControl != null){ - width = document.getElementById('videoOverview').offsetWidth-20 - height = document.getElementById('videoOverview').offsetHeight-18 - oWebControl.JS_Resize(width, height ); - } - },true); +// 监听滚动条 - 滚动摄像头列表会照成抖动(去除 +// window.addEventListener('scroll', () => { +// // console.log('滚动条') +// if(oWebControl != null){ +// width = document.getElementById('videoOverview').offsetWidth-20 +// height = document.getElementById('videoOverview').offsetHeight-18 +// oWebControl.JS_Resize(width, height ); +// } +// },true); // 监听窗口 // window.addEventListener('resize', () => { // console.log('窗口') diff --git a/src/components/videoModule/playBack/playBack.vue b/src/components/videoModule/playBack/playBack.vue index 1e7e71e8..ade9ddcb 100644 --- a/src/components/videoModule/playBack/playBack.vue +++ b/src/components/videoModule/playBack/playBack.vue @@ -116,13 +116,13 @@ export default { } }); - // 监听滚动条scroll事件，使插件窗口跟随浏览器滚动而移动 - $(window).scroll(() => { - if (this.oWebControl != null) { - this.oWebControl.JS_Resize(this.width, this.height); - this.setWndCover(); - } - }) + // 监听滚动条scroll事件，使插件窗口跟随浏览器滚动而移动 - 滚动摄像头列表会照成抖动(去除 + // $(window).scroll(() => { + // if (this.oWebControl != null) { + // this.oWebControl.JS_Resize(this.width, this.height); + // this.setWndCover(); + // } + // }) }, beforeDestroy() { this.closeWindow();//关闭插件 diff --git a/src/router/index.js b/src/router/index.js index 86406dac..5bc9e127 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1538,6 +1538,14 @@ const routes2 = [{ "@/views/projectFront/quality/subdivisionalWorks.vue", ], resolve), }, + { + path: "/project/quality/qualityFile", //质量管理 -- 分布分项工程 + name: "质量管理_质量文件管理", + component: (resolve) => + require([ + "@/views/projectFront/quality/qualityFile.vue", + ], resolve), + }, { path: "/project/quality/rectificationRanking", //质量管理 -- 整改排名 name: "质量管理_整改排名1", diff --git a/src/store/index.js b/src/store/index.js index fdaa5822..a326b512 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -56,13 +56,13 @@ export default new Vuex.Store({ // FILEURL: 'http://1.13.185.209:9820/image/', // 中科佳成 // UPLOADURL: 'http://8.136.222.164:8808/upload/image/', // 中科安信 // FILEURL: 'http://8.136.222.164:8808/image/', // 中科安信 - UPLOADURL: 'http://101.43.164.214:11111/upload/image/', // 百色 - FILEURL: 'http://101.43.164.214:11111/image/', // 百色 + // UPLOADURL: 'http://101.43.164.214:11111/upload/image/', // 百色 + // FILEURL: 'http://101.43.164.214:11111/image/', // 百色 WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // FILEURL:'http://182.90.224.237:51234/image/', - // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 - // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 + UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 + FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) @@ -72,8 +72,8 @@ export default new Vuex.Store({ CONTRACTORURL2: process.env.NODE_ENV == "development" ? "http://192.168.34.175:88/#/workspace/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/workspace/contractorApply`, //罗峰承包商入场地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // 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/', //测试 + // 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", //正式环境 diff --git a/src/util/index.js b/src/util/index.js index d74118c6..c8cc3657 100644 --- a/src/util/index.js +++ b/src/util/index.js @@ -1,6 +1,31 @@ import resetForm from './resetForm'; import nowDate from './nowDate'; +// 下载 +export function download(url, fileName) { + const x = new XMLHttpRequest() + x.open('GET', url, true) + x.responseType = 'blob' + x.onload = () => { + const url = window.URL.createObjectURL(x.response) + createAndRemove(url, fileName) + } + x.send() +} +function createAndRemove(url, fileName) { + // 创建隐藏的可下载链接 + var eleLink = document.createElement('a') + eleLink.download = fileName + eleLink.style.display = 'none' + // 下载内容转变成blob地址 + eleLink.href = url + // 触发点击 + document.body.appendChild(eleLink) + eleLink.click() + // 然后移除 + document.body.removeChild(eleLink) +} + export { resetForm, nowDate } \ No newline at end of file diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue index 7806330a..8d2cce03 100644 --- a/src/views/home/login_v2.vue +++ b/src/views/home/login_v2.vue @@ -595,7 +595,7 @@ export default { getUserByUidApi(data).then((res) => { if (res.code == 200) { //赋值 - this.parseLoginData(res.result); + this.parseLoginData(res.result, true); } else { this.$message.error(res.message); } diff --git a/src/views/projectFront/quality/qualityFile.vue b/src/views/projectFront/quality/qualityFile.vue new file mode 100644 index 00000000..68fed973 --- /dev/null +++ b/src/views/projectFront/quality/qualityFile.vue @@ -0,0 +1,267 @@ + + +