hanbaoshan
2020-08-11 d969c4735bfa4cfc21dda697c56cfae542a43017
根据当前用户屏幕分辨率动态展示相关应用窗口的宽高
3个文件已修改
21 ■■■■ 已修改文件
src/pages/desktop/index/components/DFrame.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/desktop/index/store/modules/desktop.js 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/syslog/index/App.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/desktop/index/components/DFrame.vue
@@ -112,7 +112,7 @@
        //logging: true, //查看html2canvas内部执行流程
        removeContainer: true,
        imageTimeout: 0,
        useCORS: true //开启跨域配置
        //useCORS: true //开启跨域配置
      }).then(canvas => {
        let shotSrc = canvas.toDataURL();
        
src/pages/desktop/index/store/modules/desktop.js
@@ -94,8 +94,23 @@
    dframe.order = 0;
    dframe.isShow = true;
    let curDframe = state.docks.find(dock => dock.id == dframe.id);
    //读取当前屏幕分辨率
    console.log(window.screen.availWidth);
    console.log(window.screen.availHeight);
    debugger;
    dframe.width = curDframe.width;
    dframe.height = curDframe.height;
    //根据分辨率动态调整(摄像机配置,数据栈配置,比对库管理,算力管理,实时监控)
    //获取原始宽高比
    let ratio = curDframe.width/curDframe.height;
    if(curDframe.name == 'cameraAccess' || curDframe.name == 'dataStack' || curDframe.name == 'library' || curDframe.name == 'analysisPower' || curDframe.name == 'cameraVideo'){
      //处理富余高度大于140的窗口
      if(window.screen.availHeight - curDframe.height > 140){
        dframe.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height;
        dframe.width = dframe.height*ratio;
      }
    }
    //全部绝对居中
    dframe.leftOffset = (document.body.offsetWidth - dframe.width)/2;
    dframe.topOffset = (document.body.offsetHeight - dframe.height)/2;
@@ -106,8 +121,8 @@
    return true;
  },
  addMinDock: (state, dock) => {
    let ids = state.minDocks.map(item => item.id);
    
    if (ids.indexOf(dock.id) > -1) {
src/pages/syslog/index/App.vue
@@ -10,7 +10,7 @@
          :value="item.value"
        ></el-option>
      </el-select>
      <b>时间:</b>
      <b>操作时间:</b>
      <el-date-picker
        v-model="timeValue"
        type="datetimerange"