lct
Your Name
2022-08-08 891c00081c70124f8060537db846dfc5016761f6
lct
已修改4个文件
已添加5个文件
280 ■■■■ 文件已修改
src/App.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/loginPage/back-icon.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/loginPage/device-pic.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/loginPage/star-bg.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/loginPage/task-job-pic.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/loginPage/xj-bg.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/loginPage/xj-icon.png 补丁 | 查看 | 原始文档 | blame | 历史
src/views/intellectInspect/intelligentMap/index.vue 233 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/safeKnowledgeSys/index.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/App.vue
@@ -77,10 +77,10 @@
                    (state.i18nLocale as string | null) = locale;
                });
                // 获取缓存中的布局配置
                if (Local.get('themeConfig')) {
                    storesThemeConfig.setThemeConfig(Local.get('themeConfig'));
                    document.documentElement.style.cssText = Local.get('themeConfigStyle');
                }
                // if (Local.get('themeConfig')) {
                //     storesThemeConfig.setThemeConfig(Local.get('themeConfig'));
                //     document.documentElement.style.cssText = Local.get('themeConfigStyle');
                // }
                // 获取缓存中的全屏配置
                if (Session.get('isTagsViewCurrenFull')) {
                    stores.setCurrenFullscreen(Session.get('isTagsViewCurrenFull'));
src/assets/loginPage/back-icon.png
src/assets/loginPage/device-pic.png
src/assets/loginPage/star-bg.png
src/assets/loginPage/task-job-pic.png
src/assets/loginPage/xj-bg.png

src/assets/loginPage/xj-icon.png

src/views/intellectInspect/intelligentMap/index.vue
@@ -1,11 +1,25 @@
<template>
    <div class="container">
        <div class="big-title" @click="goBack"><span></span>大型实验室智能巡检系统<span></span></div>
    <div class="big-title" @click="goBack()"><span></span>国泰新华智能巡检系统<span></span></div>
        <div style="font-size: 14px; color: #00ffff">{{ present }}</div>
    <div class="backBtn" @click="goBack()">
      <img src="../../../assets/loginPage/back-icon.png">
      <div>退出</div>
    </div>
        <div class="blocks">
      <div class="current-task">
        <div class="task-des">
          <div class="task-des-l">
            <img src="../../../assets/loginPage/task-job-pic.png">
            <div>巡检任务</div>
          </div>
          <div class="task-des-r">
            该巡检路线沿途监测风机系统、循环水系统以及装置区的各巡检点指标是否正常。
          </div>
        </div>
            <div class="current-data">
                <div class="data-area">
                    <img src="../../../assets/loginPage/xj-icon.png" />
            <img src="../../../assets/loginPage/xj-icon.png">
                    <div>当前巡检:<span>实验室装置区</span></div>
                </div>
                <div class="data-spot">
@@ -18,6 +32,11 @@
                        <p>压力</p>
                    </div>
                </div>
        </div>
      </div>
      <div class="star-pic">
        <div class="star-bg"><img src="../../../assets/loginPage/star-bg.png"></div>
        <div class="star"><img src="../../../assets/loginPage/device-pic.png"></div>
            </div>
            <div class="line-map">
                <div class="item item-t item-l">
@@ -106,7 +125,9 @@
                        <div class="pulse1"></div>
                    </section>
                    <span></span>
                    <p>完成巡检</p>
          <p>
            完成巡检
          </p>
                </div>
                <div class="item start">
                    <section>
@@ -115,7 +136,9 @@
                        <div class="pulse1"></div>
                    </section>
                    <span></span>
                    <p>开始巡检</p>
          <p>
            开始巡检
          </p>
                </div>
                <div class="item item-l">
                    <section>
@@ -144,12 +167,12 @@
                    </div>
                </div>
                <div class="pic-tit water">
                    <img src="../../../assets/loginPage/equipment.JPG" />
          <img src="../../../assets/loginPage/equipment.JPG">
                    <p>实验室装置区</p>
                </div>
                <div></div>
                <div class="pic-tit">
                    <img src="../../../assets/loginPage/wind.JPG" />
          <img src="../../../assets/loginPage/wind.JPG">
                    <p>实验室风机系统</p>
                </div>
                <div class="item item-l warning">
@@ -181,7 +204,7 @@
                <div></div>
                <div></div>
                <div class="pic-tit water">
                    <img src="../../../assets/loginPage/watersys.JPG" />
          <img src="../../../assets/loginPage/watersys.JPG">
                    <p>实验室循环水系统</p>
                </div>
                <div class="item item-t">
@@ -235,9 +258,15 @@
                <div></div>
                <div></div>
            </div>
            <div class="section-1"></div>
            <div class="section-2"></div>
            <div class="section-3"></div>
      <div class="section-1">
      </div>
      <div class="section-2">
      </div>
      <div class="section-3">
      </div>
        </div>
    </div>
</template>
@@ -245,24 +274,25 @@
<script>
export default {
    name: 'NewForm',
    props: {},
  props: {
  },
    data() {
        return {
            present: ''
        };
    }
    },
    created() {
        setInterval(() => {
            this.present = new Date().toLocaleString();
        }, 1000);
      this.present = new Date().toLocaleString()
    }, 1000)
    },
    methods: {
        goBack() {
            this.$router.go(-1);
            // this.$router.push('/discriminate');
      window.history.go(-1)
        }
    }
};
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -271,7 +301,7 @@
    0% {
        transform: scale(0.3);
        -webkit-transform: scale(0.3);
        opacity: 0;
      opacity: 0.0;
    }
    25% {
@@ -295,7 +325,7 @@
    100% {
        transform: scale(1);
        -webkit-transform: scale(1);
        opacity: 0;
      opacity: 0.0;
    }
}
@@ -303,7 +333,7 @@
    0% {
        transform: scale(0.3);
        -webkit-transform: scale(0.3);
        opacity: 0;
      opacity: 0.0;
    }
    25% {
@@ -327,7 +357,7 @@
    100% {
        transform: scale(0.8);
        -webkit-transform: scale(0.8);
        opacity: 0;
      opacity: 0.0;
    }
}
@@ -348,7 +378,7 @@
    display: flex;
    flex-direction: column;
    align-items: center;
    background: url('../../../assets/loginPage/map-bg.jpg') no-repeat center;
    background: url("../../../assets/loginPage/map-bg.jpg") no-repeat center;
    background-size: 100% 100%;
    .big-title {
        height: 40px;
@@ -365,11 +395,29 @@
        span {
            width: 60px;
            height: 1px;
            background: #36fcfc;
        background: #36FCFC;
            margin: 0 20px;
        }
    }
    .backBtn{
      position: absolute;
      z-index: 99999;
      right: 150px;
      top: 40px;
      display: flex;
      align-items: center;
      cursor: pointer;
      img{
        width: 18px;
        height: 18px;
        margin-right: 10px;
      }
      div{
        font-size: 16px;
        color: #00FFFF;
      }
    }
    .blocks {
        position: relative;
        width: 100%;
@@ -391,7 +439,7 @@
            .item {
                width: calc((100vw - 120px) / 7);
                height: calc((100vh - 130px) / 5);
                padding: 20px 40px 20px 20px;
            padding: 20px 30px 20px 20px;
                position: relative;
                box-sizing: border-box;
@@ -461,8 +509,8 @@
                & > div {
                    padding: 10px 0;
                    border-radius: 8px;
                    background-image: linear-gradient(to right, rgba(8, 109, 209, 0.4), rgba(11, 255, 255, 0.2));
                    border: 1px solid rgba(54, 252, 252, 0.6);
              background-image: linear-gradient(to right,rgba(8,109,209,.4),rgba(11,255,255,.2));
              border: 1px solid rgba(54,252,252,.6);
                    display: flex;
                    flex-direction: column;
                    justify-content: center;
@@ -481,7 +529,7 @@
                            &:first-of-type {
                                text-align: right;
                                color: rgba(255, 255, 255, 0.8);
                    color: rgba(255,255,255,.8);
                            }
                        }
                    }
@@ -495,16 +543,16 @@
                    text-align: center;
                    color: #fff;
                    border-radius: 8px;
                    background-image: linear-gradient(to right, rgba(11, 255, 255, 0.2), rgba(8, 109, 209, 0.4));
                    border: 1px solid rgba(54, 252, 252, 0.6);
              background-image: linear-gradient(to right,rgba(11,255,255,.2),rgba(8,109,209,.4));
              border: 1px solid rgba(54,252,252,.6);
                }
            }
            .item-t {
                border-top: 1px solid #36fcfc;
            border-top: 1px solid #36FCFC;
            }
            .item-l {
                border-left: 1px solid #36fcfc;
            border-left: 1px solid #36FCFC;
            }
            .warning {
                & > section {
@@ -582,7 +630,7 @@
                span {
                    width: 1px;
                    height: 50px;
                    background: #36fcfc;
              background: #36FCFC;
                    position: absolute;
                    top: -10px;
                    left: 0;
@@ -602,7 +650,7 @@
                span {
                    width: 100%;
                    height: 1px;
                    background: #36fcfc;
              background: #36FCFC;
                    position: absolute;
                    top: 0;
                    left: calc(40px - 100%);
@@ -614,22 +662,58 @@
                }
            }
        }
        .current-data {
      .current-task{
            position: absolute;
        width: calc((500vw - 600px)/ 7);
            z-index: 999999;
            width: 270px;
            height: 142px;
            left: 50%;
        top: 0;
        right: 0;
        padding: 0 60px;
        display: flex;
        align-items: center;
        justify-content: space-between;
        .task-des{
          padding: 10px 20px;
          display: flex;
          align-items: center;
          border: 1px solid #36FCFC;
          .task-des-l{
            display: flex;
            flex-direction: column;
            align-items: center;
            font-size: 20px;
            color: #36FCFC;
            border-right: 1px solid #36FCFC;
            padding-right: 20px;
            img{
              margin-bottom: 10px;
            }
          }
          .task-des-r{
            width: calc((200vw - 240px)/ 7);
            display: flex;
            flex-direction: column;
            align-items: center;
            font-size: 20px;
            line-height: 28px;
            color: #FCFC36;
            padding-left: 20px;
          }
        }
        .current-data{
          width: 267px;
          height: 138px;
            padding: 20px 30px;
            box-sizing: border-box;
            transform: translateX(-65%);
            background: url('../../../assets/loginPage/xj-bg.png') no-repeat center;
          background: url("../../../assets/loginPage/xj-bg.png") no-repeat center;
            background-size: 100% 100%;
            .data-area {
                display: flex;
                align-items: center;
                border-bottom: 1px solid #00ffff;
            border-bottom: 1px solid #040C3B;
                font-weight: bold;
                padding-bottom: 10px;
                box-sizing: border-box;
@@ -643,10 +727,10 @@
                div {
                    font-size: 15px;
                    color: rgba(255, 255, 255, 0.8);
              color: rgba(4,12,59,.8);
                    span {
                        color: #00ffff;
                color: #040C3B;
                    }
                }
            }
@@ -662,47 +746,82 @@
                    align-items: center;
                    width: 50%;
                    font-size: 14px;
                    color: rgba(255, 255, 255, 0.8);
              color: rgba(4,12,59,.8);
                    p {
                        margin-top: 6px;
                        color: #00ffff;
                color: #040C3B;
                    }
                    &:first-of-type {
                        border-right: 1px solid #36fcfc;
                border-right: 1px solid #040C3B;
                    }
            }
          }
        }
      }
      .star-pic{
        position: absolute;
        width: calc((100vw - 120px)/ 7);
        height: calc((100vw - 120px)/ 7);
        z-index: 999999;
        bottom: 40px;
        right: 40px;
        padding: 20px;
        .star-bg{
          position: inherit;
          width: 100%;
          height: 100%;
          left: 0;
          top: 0;
          img{
            width: 100%;
            height: auto;
            animation: circle 30s linear infinite;
          }
        }
        .star{
          position: inherit;
          width: 100%;
          height: 100%;
          left: 0;
          top: 0;
          img{
            width: 100%;
            height: auto;
                }
            }
        }
        .section-1 {
            position: absolute;
            left: 70px;
            top: -10px;
        top: -20px;
            width: calc((200vw - 240px) / 7 + 60px);
            height: 630px;
            background: rgba(0, 100, 190, 0.1);
            border: 1px solid rgba(0, 100, 190, 0.4);
        height: calc(80vh - 109px);
        background: rgba(0,100,190,.1);
        border: 1px solid rgba(0,100,190,.4);
            border-radius: 8px;
        }
        .section-2 {
            position: absolute;
            left: calc((400vw - 480px) / 7 + 70px);
            top: 150px;
        top: calc((100vh - 130px)/ 5 - 20px);
            width: calc((200vw - 240px) / 7 + 60px);
            height: 470px;
            background: rgba(0, 100, 190, 0.1);
            border: 1px solid rgba(0, 100, 190, 0.4);
        height: calc((300vh - 390px)/ 5 - 5px);
        background: rgba(0,100,190,.1);
        border: 1px solid rgba(0,100,190,.4);
            border-radius: 8px;
        }
        .section-3 {
            position: absolute;
            left: 100px;
            top: 630px;
        top: calc(80vh - 119px);
            width: calc((500vw - 600px) / 7 + 30px);
            height: 180px;
            background: rgba(0, 100, 190, 0.1);
            border: 1px solid rgba(0, 100, 190, 0.4);
        height: calc((100vh - 130px)/ 5 + 20px);
        background: rgba(0,100,190,.1);
        border: 1px solid rgba(0,100,190,.4);
            border-radius: 8px;
        }
    }
src/views/safeKnowledgeSys/index.vue
对比新文件
@@ -0,0 +1,39 @@
<template>
  <div class="home-container">
    <iframe src="http://39.104.85.193"></iframe>
  </div>
</template>
<script>
export default {
  name: 'safeKnowledgeSys',
  props: {
  },
  data(){
    return{
    }
  },
  created() {
  },
  methods:{
  }
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
  .home-container{
    height: calc(100vh - 114px);
    box-sizing: border-box;
    overflow: hidden;
    iframe{
      width: 100%;
      height: 100%;
    }
  }
</style>