修复国标配置的bug

zhangzengfei

2022-07-20 4a800a8fc83c6bd1f86a8e847b079a51a7532c09

 src/pages/settings/views/generalSettings.vue

@@ -16,58 +16,16 @@
        </div>

      </div>

      <div class="general-right">

        <!-- <div class="lang" v-if="activePage == 0">

          <div class="bar">

            <span class="name">设备ID</span>

            <span class="desc">{{ deviceInfo.server_id }}</span>

          </div>

          <div class="bar">

            <span class="name">设备型号</span>

            <span class="desc">{{ deviceInfo.deviceModel }}</span>

          </div>

          <div class="bar">

            <span class="name">设备类型</span>

            <span class="desc">{{ deviceInfo.deviceDesc }}</span>

          </div>

          <div class="bar">

            <span class="name">通道个数</span>

            <span class="desc">{{ deviceInfo.channelCount }}</span>

          </div>

          <div class="bar">

            <span class="name">主控版本</span>

            <span class="desc">{{ deviceInfo.masterVersion }}</span>

          </div>

          <div class="bar">

            <span class="name">web版本</span>

            <span class="desc">{{ deviceInfo.webVersion }}</span>

          </div>

          <div class="bar">

            <span class="name">硬盘信息</span>

            <span class="desc">{{ deviceInfo.disks }}</span>

          </div>

          <div class="bar">

            <span class="name">CPU</span>

            <span class="desc">{{ deviceInfo.cpu }}</span>

          </div>

          <div class="bar">

            <span class="name">内存</span>

            <span class="desc">{{ deviceInfo.memory }}</span>

          </div>

          <div class="bar">

            <span class="name">运行时间</span>

            <span class="desc">{{ deviceInfo.runningTime }}</span>

          </div>

        </div> -->

        <div class="lang videoTime" v-if="activePage == 0">

          <div class="min-dur">

            <div class="title">抓拍前录像时长</div>

            <div class="entity">

              <div class="sec">{{ min_video_len }}s</div>

              <div class="sec">0s</div>

              <div class="block">

                <el-slider

                  v-model="fakeObj.min"

                  id="cut_min_duration"

                  :min="5 / 1.2"

                  :min="0"

                  :max="100"

                  :step="5 / 1.2"

                  @input="min_len = min_video_len"

@@ -77,38 +35,28 @@
                  :format-tooltip="formatTooltip"

                ></el-slider>

              </div>

              <!-- <el-input-number

              <div class="sec" style="margin: 0 20px">120s</div>

              <el-input-number

                v-model="min_len"

                @change="fakeObj.min = +(min_len / 1.2)"

                controls-position="right"

                :min="5"

                :min="0"

                :step="5"

                :max="120"

                step-strictly

                size="small"

              ></el-input-number

              >&nbsp;s -->

               
              <el-input-number 
              v-model="min_len" 
              @change="fakeObj.min = +(min_len / 1.2)" 
              :min="5" 
              :step="5"

              :max="120" 
              step-strictly

              size="small"

              ></el-input-number>&nbsp;s

              >s

            </div>

          </div>

          <div class="min-dur">

            <div class="title">抓拍后录像时长</div>

            <div class="entity">

              <div class="sec">{{ max_video_len }} s</div>

              <div class="sec">0s</div>

              <div class="block">

                <el-slider

                  v-model="fakeObj.max"

                  id="cut_max_duration"

                  :min="5 / 1.2"

                  :min="0"

                  @input="max_len = max_video_len"

                  :max="100"

                  :step="5 / 1.2"

@@ -117,17 +65,17 @@
                  :show-tooltip="true"

                ></el-slider>

              </div>

              <div class="sec" style="margin: 0 20px">120s</div>

              <el-input-number

                v-model="max_len"

                @change="fakeObj.max = +(max_len / 1.2)"

                :min="5"

                :min="0"

                :step="5"

                step-strictly

                :max="120"

                size="small"

              ></el-input-number

              >&nbsp;s

              
            </div>

          </div>



@@ -160,7 +108,17 @@
                    playSpan2

                  }}</span> -->



                  <img v-else src="/images/settings/暂停.png" alt="" style="width:16px;hight:16px;cursor: pointer;margin-top:15px;">

                  <img

                    v-else

                    src="/images/settings/暂停.png"

                    alt=""

                    style="

                      width: 16px;

                      hight: 16px;

                      cursor: pointer;

                      margin-top: 15px;

                    "

                  />

                  <!-- 

                  <i

                    v-if="!item.isPlay"

@@ -185,6 +143,7 @@
              action=""

              :http-request="uploadSound"

              :show-file-list="false"

              style="bottom: -94px; left: calc(50% - 217px)"

            >

              <div class="info">

                请将声音事件文件拖拽到此处，或<span class="info-click"

@@ -208,37 +167,39 @@


        <div class="self-setting" v-if="activePage == 2">

          <div class="top-title">颜色主题</div>

          <div class="color-bar">           
          <div class="color-bar">

            <div

            v-for="(item,index) in colorList"

            :key="index"   
            style="border:none;"

              v-for="(item, index) in colorList"

              :key="index"

              style="border: none"

            >

            <div class="color-option"

            v-if="universalColor != index"

            :style="{cursor: 'pointer',backgroundColor:item.color}"

            @click="colorCard(item.color,index)"

            />    
              <div

                class="color-option"

                v-if="universalColor != index"

                :style="{ cursor: 'pointer', backgroundColor: item.color }"

                @click="colorCard(item.color, index)"

              />



            <div class="color-option color-option-active"

            v-else

            :style="{cursor: 'pointer',border:`2px solid ${item.color}`}"

            @click="colorCard(item.color,index)">

           <div 
           :style="{backgroundColor:item.color}"

           class="color-option-content">

           </div>

  
              <div

                class="color-option color-option-active"

                v-else

                :style="{

                  cursor: 'pointer',

                  border: `2px solid ${item.color}`,

                }"

                @click="colorCard(item.color, index)"

              >

                <div

                  :style="{ backgroundColor: item.color }"

                  class="color-option-content"

                ></div>

              </div>

            </div>

          </div>

          </div>



          


          <div class="top-title">图标主题</div>

          <div class="icon-bar" style="cursor: pointer" @click="selectIcons(0)">

            <div class="bar-title">

              <span class="title">扁平写实图标</span>

              <span class="title">面性风格</span>

              <span

                class="icon iconfont"

                :class="activeIcons == 0 ? 'icon-active' : 'icon-normal'"

@@ -257,7 +218,7 @@
          </div>

          <div class="icon-bar" style="cursor: pointer" @click="selectIcons(1)">

            <div class="bar-title">

              <span class="title">扁平化图标</span>

              <span class="title">简约风格</span>

              <span

                class="icon iconfont"

                :class="activeIcons == 1 ? 'icon-active' : 'icon-normal'"

@@ -274,14 +235,14 @@
              </div>

            </div>

          </div>

          


          <div class="top-title">桌面背景主题</div>

          <div class="bg-bar">

            <div class="bg-list">

              <div

                v-for="(item, i) in tableBGList"

                class="bg-img"

                :class="activeBg == i ? 'bg-list-active' : ''"              
                :class="activeBg == i ? 'bg-list-active' : ''"

                :key="i"

                @click="pickBg(item, i)"

              >

@@ -298,9 +259,7 @@
<script>

import { saveAlarmConfig, getDevInfo } from "@/api/system";

import { uploadSound, getSoundList, deleteSound } from "@/api/event";

import {

  updateUser,

} from "@/api/user";

import { updateUser } from "@/api/user";

export default {

  data() {

    return {

@@ -318,7 +277,6 @@
        max: 0,

      },

      menuArr: [

        // { name: "设备信息", icon: "\ue933" ,size:18},

        { name: "事件录像时长", icon: "\ue74f", size: 20 },

        { name: "事件声音", icon: "\ueb5e", size: 16 },

        { name: "个性化设置", icon: "\ue750", size: 18 },

@@ -341,63 +299,64 @@
      },

      isPlay: false,

      realIconList: [

        { url: "/images/settings/日志管理.png", color: "green" },

        { url: "/images/settings/实时监控.png", color: "yellow" },

        { url: "/images/settings/数据可视化.png", color: "pink" },

        { url: "/images/settings/面性图标/1仰卧检测.png" },

        { url: "/images/settings/面性图标/2个体静止.png" },

        { url: "/images/settings/面性图标/3安全警戒.png" },

        { url: "/images/settings/面性图标/4安全帽检测.png" },

        { url: "/images/settings/面性图标/5奔跑.png" },

        { url: "/images/settings/面性图标/6车辆检测.png" },

        { url: "/images/settings/面性图标/7抽烟.png" },

      ],

      flatIconList: [

        { url: "/images/settings/数据推送.png" },

        { url: "/images/settings/数据栈配置.png" },

        { url: "/images/settings/系统设置.png" },

        { url: "/images/settings/简约图标/1仰卧检测.png" },

        { url: "/images/settings/简约图标/2个体静止.png" },

        { url: "/images/settings/简约图标/3安全警戒.png" },

        { url: "/images/settings/简约图标/4安全帽检测.png" },

        { url: "/images/settings/简约图标/5奔跑.png" },

        { url: "/images/settings/简约图标/6车辆检测.png" },

        { url: "/images/settings/简约图标/7抽烟.png" },

      ],

      tableBGList: [

        { name: "background", url: "/images/desktop/background.png" },

        { name: "message", url: "/images/desktop/message.png" },

        { name: "weather", url: "/images/desktop/weather.png" },

      ],

      universalColor:'',

      universalColor: "",

      colorList: [

        {name:1 ,color:"#FC6B9E"},

        {name:2 ,color:"#F38F56"},

        {name:3 ,color:"#FDD33A"},

        {name:4 ,color:"#53D999"},

        {name:5 ,color:"#21CDB2"},

        {name:6 ,color:"#61E2EB"},

        {name:7 ,color:"#4E94FF"},

        {name:8 ,color:"#8E8CD8"},

        {name:9 ,color:"#4C4A48"},

      ]

        { name: 1, color: "#FC6B9E" },

        { name: 2, color: "#F38F56" },

        { name: 3, color: "#FDD33A" },

        { name: 4, color: "#53D999" },

        { name: 5, color: "#21CDB2" },

        { name: 6, color: "#61E2EB" },

        { name: 7, color: "#4E94FF" },

        { name: 8, color: "#8E8CD8" },

        { name: 9, color: "#4C4A48" },

      ],

    };

  },

  mounted() {

    this.getDeviceInfo();

    this.getSounds();

    let _this = this;

    this.eventAudio.addEventListener("ended", () => {

      if (_this.curPlayingIndex !== null && _this.soundList.length) {

        _this.soundList[_this.curPlayingIndex].isPlay = false;

        _this.curPlayingIndex = null;

      }

    });

    const url = this.curUser.backgroundpic;

    this.activeIcons = this.curUser.useIconType-1

    this.activeIcons = this.curUser.useIconType - 1;

    this.universalColor = this.colorList.findIndex((x) => {

      return x.color == localStorage.getItem("--colorCard");

    });

    if (url) {

      // const arr = url.split("/");

      this.activeBg = this.tableBGList.findIndex((x) => {

        return x.url == url;

      });

    } else {

      this.activeBg = 0;

    }

    const e = this.$refs.curPage;

    e.addEventListener("click", (e) => {

      if (this.showUpload) {

        this.showUpload = false;

      }

    });



    this.eventAudio.addEventListener("ended", this.endedHandle, false);

    this.$refs.curPage.addEventListener("click", this.clickHandle, false);

  },

  beforeDestroy() {

    this.$refs.curPage.removeEventListener("click");

    this.eventAudio.removeEventListener("ended", this.endedHandle, false);

    this.$refs.curPage.removeEventListener("click", this.clickHandle, false);

  },

  computed: {

    min_video_len() {

@@ -407,28 +366,41 @@
      return Math.round(this.fakeObj.max * 1.2);

    },

    curUser() {

      const info = JSON.parse(sessionStorage.getItem("userInfo"));

      return info;

      return JSON.parse(sessionStorage.getItem("userInfo"));

    },

  },

  methods: {

    endedHandle() {

      let _this = this;

      if (_this.curPlayingIndex !== null && _this.soundList.length) {

        _this.soundList[_this.curPlayingIndex].isPlay = false;

        _this.curPlayingIndex = null;

      }

    },

    clickHandle() {

      let _this = this;

      if (this.showUpload) {

        this.showUpload = false;

      }

    },

    formatTooltip(v) {

      return Math.round(v * 1.2);

    },

    pickBg(item, i) {

      this.activeBg = i;

      let message = "changeBackground?" + item.name;

      window.parent.postMessage(  {msg: message, }, "*" );

      window.parent.postMessage({ msg: message }, "*");

      updateUser({

        id: this.curUser.id,

        backgroundpic: item.url,

      }).then((res) => {

        if (res.success) {

          sessionStorage.setItem("userInfo", JSON.stringify(res.data))

          sessionStorage.setItem("userInfo", JSON.stringify(res.data));

          debugger;

          this.$message.success(res.msg);

        }

      });

      this.$forceUpdate()

      this.$forceUpdate();

    },

    togglePlay(item, i) {

      if (this.curPlayingIndex !== null) {

@@ -494,7 +466,7 @@
          this.getSounds();

        },

        (err) => {

          this.$message.error("声音上传失败");

          this.$message.error(err.msg);

        }

      );

    },

@@ -505,11 +477,12 @@
      this.activeIcons = i;

      updateUser({

        id: this.curUser.id,

        iconType: i+1,

        iconType: i + 1,

      }).then((res) => {

        if (res.success) {

          window.parent.postMessage({ msg: "AppUpdate" }, "*");

          sessionStorage.setItem("userInfo", JSON.stringify(res.data))

          sessionStorage.setItem("userInfo", JSON.stringify(res.data));

          debugger;

          this.$message.success(res.msg);

        }

      });

@@ -573,12 +546,12 @@
        }

      });

    },

    colorCard(color,index) {

      this.universalColor = index

      document.documentElement.style.setProperty('--colorCard',`${color}`)

      localStorage.setItem('--colorCard',`${color}`)

      window.parent.postMessage({msg:'changeColor',color},'*')

    }

    colorCard(color, index) {

      this.universalColor = index;

      document.documentElement.style.setProperty("--colorCard", `${color}`);

      localStorage.setItem("--colorCard", `${color}`);

      window.parent.postMessage({ msg: "changeColor", color }, "*");

    },

  },

};

</script>

@@ -596,8 +569,8 @@
  flex-basis: auto;

  box-sizing: border-box;

  .el-input__inner {

 height: 24px !important;

}

    height: 24px !important;

  }

  .general-center {

    height: 100%;

    width: 300px;

@@ -634,7 +607,7 @@
      color: white !important;

    }

    .menu-item:hover {

      background-color: #F2F2F7;

      background-color: #f2f2f7;

    }

  }

  .general-right {

@@ -659,7 +632,7 @@
    .el-form-item {

      margin-bottom: 10px;

      height: 50px;

      background: #F2F2F7;

      background: #f2f2f7;

      padding: 4px 20px;

      -webkit-box-sizing: border-box;

      box-sizing: border-box;

@@ -692,18 +665,18 @@
        text-align: center;

        font-weight: 700;

        border: none;

        background: #F2F2F7;

        background: #f2f2f7;

        border-radius: 8px;

        height: 48px;

        margin-bottom: 4px;

        border:2px solid #F2F2F7 !important;    
       }

        border: 2px solid #f2f2f7 !important;

      }

      .bar-group {

        overflow: auto;

        height: calc(100% - 100px);

        .general-bar {

          height: 48px;

          background: #F2F2F7;

          background: #f2f2f7;

          border-radius: 10px;

          line-height: 48px;

          box-sizing: border-box;

@@ -712,7 +685,7 @@
          display: flex;

          justify-content: space-between;

          margin-bottom: 2px;

          border:2px solid #F2F2F7;

          border: 2px solid #f2f2f7;

          margin-bottom: 4px;

          .name {

            font-size: 14px;

@@ -722,18 +695,7 @@
            display: flex;

            justify-content: space-between;

            color: rgba(191, 191, 191, 1);

            /*  .el-icon-video-pause {

            cursor: pointer;

            font-size: 23px;

            vertical-align: middle;

            color: #409eff;

          }

          .el-icon-video-play {

            cursor: pointer;

            font-size: 23px;

            vertical-align: middle;

            color: #409eff;

          } */



            span {

              color: #333;

            }

@@ -779,7 +741,7 @@
      .min-dur {

        box-sizing: border-box;

        padding: 0 20px;

        background-color: #F2F2F7;

        background-color: #f2f2f7;

        height: 105px;

        margin-bottom: 4px;

        border-radius: 15px;

@@ -807,13 +769,13 @@
        .sec {

          min-width: 30px;

          line-height: 80px;

          margin-right: 10px;

          color:#333 ;



          color: #333;

          font-size: 8px;

        }

        .block {

          flex: 1;

          margin: 0 20px 0 6px;

          margin: 0 0px 0 6px;

        }

        .el-input-number--small {

          width: 100px;

@@ -867,7 +829,7 @@
        font-weight: 700;

        margin-top: 20px;

      }

  /*     .icon-bar:hover {

      /*     .icon-bar:hover {

        background-color: rgba(233, 233, 233, 1);

      } */

      .color-bar {

@@ -878,26 +840,26 @@
        height: 96px;

        background-color: #fff;

        border-radius: 8px;

        padding-left:7px ;

        padding-left: 7px;

        .color-option {

          margin-right:12px ;

          margin-right: 12px;

          width: 30px;

          height: 30px;

          border-radius:50% ;

          border-radius: 50%;

        }



        .color-option-active {

          box-sizing: border-box;

          margin-right:12px ;

          margin-right: 12px;

          width: 30px;

          height: 30px;

          border-radius:50% ;

          border-radius: 50%;

          background-color: #fff;

          padding: 4px;

          .color-option-content {

            width: 100%;

            height: 100%;

            border-radius:50% ;

            border-radius: 50%;

          }

        }

      }

@@ -905,7 +867,7 @@
        cursor: pointer;

        box-sizing: border-box;

        padding: 15px 13px 14px 20px;

        background: #F2F2F7;

        background: #f2f2f7;

        border-radius: 8px;

        margin-bottom: 10px;

        .bar-title {

@@ -924,12 +886,12 @@
          }

          .icon-normal {

            font-size: 16px;

            color: #E0E0E0;

            color: #e0e0e0;

          }

        }

        .entity {

          display: flex;

          margin-left:5px ;

          margin-left: 5px;

          .entity-img {

            background-color: rgba(248, 248, 248, 1);

            width: 50px;

@@ -943,7 +905,7 @@
        }

      }

      .bg-bar {

        background-color: #F2F2F7;

        background-color: #f2f2f7;

        box-sizing: border-box;

        padding: 15px 25px;

        border-radius: 12px;

@@ -961,7 +923,7 @@
              height: 100%;

            }

          }

         /*  .bg-img:hover {

          /*  .bg-img:hover {

            border: 2px solid yellow;

          } */

          .bg-list-active {

@@ -990,8 +952,6 @@
}



.upload-demo {

  top: 452px;

  left: 2px !important;

  width: 452px;

  height: 150px;

  background: #ffffff;

@@ -1008,10 +968,10 @@
    margin-top: 30px;

  }



.info-click {

  color: var(--colorCard);

  text-decoration: underline;

}

  .info-click {

    color: var(--colorCard);

    text-decoration: underline;

  }



  .info-click {

    color: #4e94ff;

@@ -1040,7 +1000,7 @@
    font-size: 14px;

  }

  .warn-icon {

    color: #fe6d68;

    color: var(--colorCard);

    font-size: 40px;

    margin-top: 11px;

  }

@@ -1066,7 +1026,7 @@
  .el-message-box__btns {

    display: flex;

    justify-content: center;

    margin-top: 20px;

    margin: 20px;

    .el-button:focus,

    .el-button:hover {

      background-color: none;

@@ -1093,8 +1053,8 @@
    button:last-child {

      background-color: var(--colorCard) !important;

      border: 1px solid var(--colorCard) !important;

      span { 
         color: #fff;

      span {

        color: #fff;

      }

    }

  }

@@ -1102,17 +1062,15 @@
</style>



<style>



.videoTime .el-slider__button {

  margin-top: -25px !important;

  border: none !important;

  
}



.videoTime .el-slider__button::after {

  display: block;

  position: relative;

content: "\e75d";

  content: "\e75d";

  color: var(--colorCard);

  font-family: "iconfont" !important;

  font-size: 16px;

@@ -1122,7 +1080,7 @@
}



.videoTime .el-tooltip {

background-color: #F2F2F7 !important;

  background-color: #f2f2f7 !important;

  border: none !important;

}



@@ -1132,10 +1090,10 @@
}



.videoTime .el-slider__stop {

  background-color: #C4C4C4 !important;

  background-color: #c4c4c4 !important;

  height: 3px !important;

  width: 8px !important;

  border-radius:0 !important;

  border-radius: 0 !important;

}



.videoTime .el-slider__bar {

@@ -1151,68 +1109,29 @@
  font-weight: 700 !important;

}





.videoTime .el-input-number.el-input-number--small .el-input__inner {

font-size: 12px !important;

height: 24px !important;

  font-size: 12px !important;

  height: 24px !important;

}



.el-input-number__decrease {

color: #333 !important;

/* top: 4px !important; */

 height: 22px !important;

 width: 20px !important;

 line-height: 22px  !important;

  color: #333 !important;

  /* top: 4px !important; */

  height: 22px !important;

  width: 20px !important;

  line-height: 22px !important;

}



/* .el-input-number__decrease:hover i{

  color: var(--colorCard);

} */



.el-input-number__increase {

color: #333 !important;

 /* top: 4px !important; */

 height: 22px !important;

 width: 24px !important;

 line-height: 22px  !important;

  color: #333 !important;

  /* top: 4px !important; */

  height: 22px !important;

  width: 24px !important;

  line-height: 22px !important;

}



.el-input-number__increase:hover i{

 /*  color: var(--colorCard); */

 color: #4E94FF;

.el-input-number__increase:hover i {

  /*  color: var(--colorCard); */

  color: #4e94ff;

}









/* .el-tooltip__popper {

  font-size: 12px !important;

  background-color: transparent !important;

  color:var(--colorCard) !important;

}



.popper__arrow::after {

  border-color: transparent !important;

  border: none !important;

}



.popper__arrow:after {

  border-bottom-color: green !important;

}



.popper__arrow:after {

  border-top-color: pink !important;

}



.toolClass {

  border: none !important;

}



.toolClass {

  border: none !important;

}



.el-slider__button::after {

  border: none !important;

} */

</style>

</style>