禅道bug修复

ZZJ

2022-03-22 81c9b1f75b80fade52653243b914ccb2677b4a8f

禅道bug修复

 src/pages/ai/index/App.vue

@@ -695,7 +695,7 @@
          }

        })

        .catch((e) => {

          _this.$notify.warning(e.data);

          _this.$notify.warning(e.msg);

          clearInterval(timer);

          app.upgradeLoading = false;

        });


 src/pages/cameraAccess/components/CameraInfo.vue

@@ -387,6 +387,7 @@
              });
              this.resolutionList = list;
              this.sensors = res.data.sensors;
              console.log(list);
            }

            this.$nextTick(() => {
@@ -582,8 +583,23 @@
    },
    // 添加设备
    addDevice(node) {
      console.log("1111");
      this.isAdd = true;
      this.addParentId = node;
      this.resolutionList = [
        {
          label: "本机分辨率",
          value: "0*0",
        },
        {
          label: "1920*1080",
          value: "1920*1080",
        },
        {
          label: "2688*1520",
          value: "2688*1520",
        },
      ];
      this.initFormData();
    },
  },

 src/pages/cameraAccess/components/DataStackInfo.vue

@@ -261,6 +261,7 @@
        label="时长"
        show-overflow-tooltip
        align="center"
        v-if="form.type != 2"
      ></el-table-column>
      <el-table-column
        prop="uploadTime"

 src/pages/cameraAccess/components/scene/SlideScene.vue

@@ -1,76 +1,108 @@
<template>

  <div class="swiper-box">

    <p class="task-tip" v-if="sceneData.length == 0 ">暂无场景，请开始创建</p>

    <p class="task-tip" v-if="sceneData.length == 0">暂无场景，请开始创建</p>

    <swiper

      ref="sceneSwiper"

      v-if="sceneData.length>=1"

      v-if="sceneData.length >= 1"

      :options="swiperOption"

      class="swiper-box-container"

    >

      <swiper-slide v-for="item in sceneData" :key="item.id+'s'">

      <swiper-slide v-for="item in sceneData" :key="item.id + 's'">

        <div class="wrap-box">

          <div class="inner">

            <div class="scenario-icon">

              <div class="single" v-if="item.rules.length==1">

              <div class="single" v-if="item.rules.length == 1">

                <div class="svg-wrap">

                  <!-- <svg class="icon" aria-hidden="true" style="font-size:4rem;">

                    <use :xlink:href="`#${item.rules[0].icon}`" />

                  </svg>-->

                  <img

                    class="baseImg"

                    :src="item.rules[0].icon_blob && item.rules[0].icon_blob.indexOf(',')>0?item.rules[0].icon_blob:`data:image/png;base64,${item.rules[0].icon_blob}`"

                    :src="

                      item.rules[0].icon_blob &&

                      item.rules[0].icon_blob.indexOf(',') > 0

                        ? item.rules[0].icon_blob

                        : `data:image/png;base64,${item.rules[0].icon_blob}`

                    "

                    alt

                  />

                </div>

              </div>

              <div class="double" v-else-if="item.rules.length==2">

                <div class="svg-wrap" v-for="(rule,index) in item.rules" :key="index">

              <div class="double" v-else-if="item.rules.length == 2">

                <div

                  class="svg-wrap"

                  v-for="(rule, index) in item.rules"

                  :key="index"

                >

                  <!-- <svg class="icon" aria-hidden="true" style="font-size:2rem;">

                    <use :xlink:href="`#${rule.icon}`" />

                  </svg>-->

                  <img

                    class="baseImg"

                    :src="item.rules[index].icon_blob &&item.rules[index].icon_blob.indexOf(',')>0?item.rules[index].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    :src="

                      item.rules[index].icon_blob &&

                      item.rules[index].icon_blob.indexOf(',') > 0

                        ? item.rules[index].icon_blob

                        : `data:image/png;base64,${rule.icon_blob}`

                    "

                    alt

                  />

                </div>

              </div>

              <div class="third" v-else-if="item.rules.length==3">

                <div class="svg-wrap" v-for="(rule,index) in item.rules" :key="'t'+index">

              <div class="third" v-else-if="item.rules.length == 3">

                <div

                  class="svg-wrap"

                  v-for="(rule, index) in item.rules"

                  :key="'t' + index"

                >

                  <!-- <svg class="icon" aria-hidden="true" style="font-size:2rem;">

                    <use :xlink:href="`#${rule.icon}`" />

                  </svg>-->

                  <img

                    class="baseImg"

                    :src="item.rules[index].icon_blob &&item.rules[index].icon_blob.indexOf(',')>0?item.rules[index].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    :src="

                      item.rules[index].icon_blob &&

                      item.rules[index].icon_blob.indexOf(',') > 0

                        ? item.rules[index].icon_blob

                        : `data:image/png;base64,${rule.icon_blob}`

                    "

                    alt

                  />

                </div>

              </div>

              <div class="four" v-else-if="item.rules.length==4">

                <div class="svg-wrap" v-for="(rule,index) in item.rules" :key="'f'+index">

              <div class="four" v-else-if="item.rules.length == 4">

                <div

                  class="svg-wrap"

                  v-for="(rule, index) in item.rules"

                  :key="'f' + index"

                >

                  <!-- <svg class="icon" aria-hidden="true" style="font-size:2rem;">

                    <use :xlink:href="`#${rule.icon}`" />

                  </svg>-->

                  <img

                    class="baseImg"

                    :src="item.rules[index].icon_blob && item.rules[index].icon_blob.indexOf(',')>0?item.rules[index].icon_blob:`data:image/png;base64,${rule.icon_blob}`"

                    :src="

                      item.rules[index].icon_blob &&

                      item.rules[index].icon_blob.indexOf(',') > 0

                        ? item.rules[index].icon_blob

                        : `data:image/png;base64,${rule.icon_blob}`

                    "

                    alt

                  />

                </div>

              </div>

            </div>

            <div class="scenario-name">{{item.scene_name}}</div>

            <div class="scenario-name">{{ item.scene_name }}</div>

          </div>

        </div>

      </swiper-slide>

    </swiper>

    <div class="swiper-pre-border" v-show="sceneData.length > 4 ">

    <div class="swiper-pre-border" v-show="sceneData.length > 4">

      <div class="icon-btn" slot="button-prev">

        <i class="iconfont iconzuo"></i>

      </div>

    </div>

    <div class="swiper-next-border" v-show="sceneData.length > 4 ">

    <div class="swiper-next-border" v-show="sceneData.length > 4">

      <div class="icon-btn" slot="button-next">

        <i class="iconfont iconyou1"></i>

      </div>

@@ -79,11 +111,11 @@
</template>



<script>

import {chunkArr} from '@/scripts/util';

import { chunkArr } from "@/scripts/util";

export default {

  props: [

    // 'swiperOption',

    'sceneData'

    "sceneData",

  ],



  data() {

@@ -115,28 +147,27 @@
        spaceBetween: 0,

        pagination: {

          el: ".swiper-pagination",

          clickable: true

          clickable: true,

        },

        navigation: {

          nextEl: ".swiper-next-border",

          prevEl: ".swiper-pre-border"

          prevEl: ".swiper-pre-border",

        },

        observer: true,//修改swiper自己或子元素时，自动初始化swiper

        observeParents: true,//修改swiper的父元素时，自动初始化swiper

        observer: true, //修改swiper自己或子元素时，自动初始化swiper

        observeParents: true, //修改swiper的父元素时，自动初始化swiper

      },

      mySwiper: {}

    }

      mySwiper: {},

    };

  },

  mounted() {

    // this.mySwiper = this.$refs.sceneSwiper.swiper;



  },



  computed: {

    slides() {

      return chunkArr(this.mockSceneData, 5);

    }

  }

    },

  },

};

</script>



@@ -302,6 +333,7 @@
      position: absolute;

      bottom: 10px;

      left: 0;

      word-break: break-all;

    }

  }

}


 src/pages/vindicate/views/systemClean.vue

@@ -1,29 +1,46 @@
<template>

  <div class="clear" v-loading="loading" :element-loading-text="loadingText">

    <div class="clear-list">

        <div class="cap">

          <div class="cap-bar">

      <div class="cap">

        <div class="cap-bar">

          <!-- <div class="inner-bar" :style="`width: ${100-percent}%;`"></div> -->

          <el-progress v-if="percent>25" type="circle" :percentage="100-percent" stroke-width="10"></el-progress>

          <el-progress v-if="percent<=25&&percent>0" type="circle" :percentage="100-percent" status="warning" stroke-width="10"></el-progress>

          <el-progress v-if="percent == 0" type="circle" :percentage="100-percent" status="exception" stroke-width="10"></el-progress>

          <el-progress

            v-if="percent > 25"

            type="circle"

            :percentage="100 - percent"

            stroke-width="10"

          ></el-progress>

          <el-progress

            v-if="percent <= 25 && percent > 0"

            type="circle"

            :percentage="100 - percent"

            status="warning"

            stroke-width="10"

          ></el-progress>

          <el-progress

            v-if="percent == 0"

            type="circle"

            :percentage="100 - percent"

            status="exception"

            stroke-width="10"

          ></el-progress>

        </div>

        <div class="cap-text">

            <span class="useable">磁盘可用: {{ percent }}%</span>

          </div>

       </div>

          <span class="useable">磁盘可用: {{ percent }}%</span>

        </div>

      </div>



    <el-button type="primary" @click="deleteData">数据清理</el-button>

      <el-button type="primary" @click="deleteData">数据清理</el-button>

    </div>





    <div class="clear-list">

      <span class="t">请选择要清理的数据范围</span>

      <el-date-picker popper-class="clean-time-picker"

      <el-date-picker

        popper-class="clean-time-picker"

        style="width: 100%"

        v-model="dataRange"

        value-format="yyyy-MM-dd"

        type="daterange" 
        type="daterange"

        align="right"

        size="small"

        range-separator="至"

@@ -31,11 +48,13 @@
        end-placeholder="结束日期"

        :picker-options="pickerOptions"

      ></el-date-picker>

    </div>      
    </div>



    <div class="warm">

        <i class="iconfont icontishi-zhuyi"></i>

        <span class="text">请注意，按以上日期范围删除的数据不可恢复，立即生效，请谨慎操作!</span>

      <i class="iconfont icontishi-zhuyi"></i>

      <span class="text"

        >请注意，按以上日期范围删除的数据不可恢复，立即生效，请谨慎操作!</span

      >

    </div>

  </div>

</template>

@@ -43,24 +62,24 @@
<script>

import { deleteData } from "@/api/system";

export default {

  created(){

  const end = new Date();

  const start = new Date();

  start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

  var year=end.getFullYear();

  var month=end.getMonth()+1;

  var day=end.getDate();

  month=month<10?"0"+month:month;

  day=day<10?"0"+day:day;

  const endTime = year+"-"+month+"-"+day

  created() {

    const end = new Date();

    const start = new Date();

    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

    var year = end.getFullYear();

    var month = end.getMonth() + 1;

    var day = end.getDate();

    month = month < 10 ? "0" + month : month;

    day = day < 10 ? "0" + day : day;

    const endTime = year + "-" + month + "-" + day;



  var year2=start.getFullYear();

  var month2=start.getMonth()+1;

  var day2=start.getDate();

  month2=month2<10?"0"+month2:month2;

  day2=day2<10?"0"+day2:day2;

  const startTime = year2+"-"+month2+"-"+day2

  this.dataRange = [startTime,endTime]

    var year2 = start.getFullYear();

    var month2 = start.getMonth() + 1;

    var day2 = start.getDate();

    month2 = month2 < 10 ? "0" + month2 : month2;

    day2 = day2 < 10 ? "0" + day2 : day2;

    const startTime = year2 + "-" + month2 + "-" + day2;

    this.dataRange = [startTime, endTime];

  },

  data() {

    return {

@@ -70,52 +89,56 @@
          day.setTime(day.getTime() - 24 * 60 * 60 * 1000);

          return time.getTime() > day;

        },

         shortcuts: [{

            text: '最近一周',

        shortcuts: [

          {

            text: "最近一周",

            onClick(picker) {

              const end = new Date();

              const start = new Date();

              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

              picker.$emit('pick', [start, end]);

            }

          }, {

            text: '最近一个月',

              picker.$emit("pick", [start, end]);

            },

          },

          {

            text: "最近一个月",

            onClick(picker) {

              const end = new Date();

              const start = new Date();

              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);

              picker.$emit('pick', [start, end]);

            }

          }, {

            text: '最近三个月',

              picker.$emit("pick", [start, end]);

            },

          },

          {

            text: "最近三个月",

            onClick(picker) {

              const end = new Date();

              const start = new Date();

              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);

              picker.$emit('pick', [start, end]);

            }

          }]

              picker.$emit("pick", [start, end]);

            },

          },

        ],

      },

      loading: false,

      loadingText: '',

      loadingText: "",

      dataRange: [],

    };

  },

  props:["free","full"],

  props: ["free", "full"],

  computed: {

    percent(){

      return Math.round(this.free/this.full *100)

    }

    percent() {

      return Math.round((this.free / this.full) * 100);

    },

  },

  methods: {

    deleteData() {

      if (this.dataRange.length==0) {

        this.$message.warning("请先选择日期")

        return

      if (!this.dataRange || this.dataRange.length == 0) {

        this.$message.warning("请先选择日期");

        return;

      }

      const [showStartTime, showEndTime] = this.dataRange

      const [showStartTime, showEndTime] = this.dataRange;

      const h = this.$createElement;

       const icon = this.$msgbox( {

      const icon = this.$msgbox({

        title: "",

        message: h(

          "div",

@@ -124,9 +147,13 @@
              "display: flex;  flex-direction: column; justify-content: center; align-items: center;",

          },

          [

            h("span", { class: "icon iconfont warn-icon" }, '\ue71c'),

            h("span", { class: "icon iconfont warn-icon" }, "\ue71c"),

            h("span", { class: "warn-title" }, "提示 "),

            h("span", { class: "warn-dec" }, `${showStartTime} 至 ${showEndTime} 产生的全部数据将被删除，此操作立即生效，不可恢复，是否删除？`),

            h(

              "span",

              { class: "warn-dec" },

              `${showStartTime} 至 ${showEndTime} 产生的全部数据将被删除，此操作立即生效，不可恢复，是否删除？`

            ),

          ]

        ),

        showCancelButton: true,

@@ -135,26 +162,25 @@
      })



        .then(() => {

          this.loading = true

          this.loadingText = "正在删除数据，请稍候！"

          this.loading = true;

          this.loadingText = "正在删除数据，请稍候！";

          deleteData({

            startTime: showStartTime,

            endTime: showEndTime,

          })

          
            .then((resp) => {

              if (resp.success) {

                this.loading = false

                this.loading = false;

                this.$message.success(`清理成功，已清理 ${resp.data} 条数据`);

                this.$emit("refreshPercent")

                this.$emit("refreshPercent");

              }

            })

            .catch((err) => {

              this.$message.error("删除失败，"+err.msg);

              this.loading = false

              this.$message.error("删除失败，" + err.msg);

              this.loading = false;

            });

        })

        .catch(() => { });

        .catch(() => {});

    },

  },

};

@@ -162,10 +188,10 @@
<style lang="scss">

.all {

  width: 100%;

  background-color: #FBFAFF;

  background-color: #fbfaff;

}

.container {

 background-color: #FBFAFF;

  background-color: #fbfaff;

}



.clear {

@@ -175,66 +201,66 @@
  border-left: 4px solid #f2f2f7;



  .clear-list {

  background: #F2F2F7;

  border-radius: 8px;

  height: 114px;

  display: flex;

  align-items: center;

  justify-content: space-between;

  padding: 0 45px;

  color: #333333;

  font-weight: bold;

  font-size: 16px;

  
  &:first-child {

    border-bottom: 1px solid #E1E0E6;

  }



  .cap {

    background: #f2f2f7;

    border-radius: 8px;

    height: 114px;

    display: flex;

    align-items: center;

    justify-content: space-between;

    padding: 0 45px;

    color: #333333;

    font-weight: bold;

    font-size: 16px;



    .cap-bar {

    width: 70px;

    height: 70px;

    div {

      width: 100%;

      height: 100%;

      .el-progress-circle {

       width: 100% !important;

       height: 100% !important;

      }

      &::after {

        position: relative;

        top: -77%;

        background-image: url(/images/vindicate/内存.png);

        width: 38px;

        height: 35px;

        background-size:cover;

        display: inline-block;

        margin: auto;

        content: '';

      }

    }

    svg {

      width: 70px;

      height: 70px;

    }

    .el-progress__text {

      display: none !important;

    }

    &:first-child {

      border-bottom: 1px solid #e1e0e6;

    }



    .cap-text {

      color: #333333;

      font-weight: bold;

      font-size: 16px;

      .useable {

      margin-left:20px ;

    .cap {

      display: flex;

      align-items: center;



      .cap-bar {

        width: 70px;

        height: 70px;

        div {

          width: 100%;

          height: 100%;

          .el-progress-circle {

            width: 100% !important;

            height: 100% !important;

          }

          &::after {

            position: relative;

            top: -77%;

            background-image: url(/images/vindicate/内存.png);

            width: 38px;

            height: 35px;

            background-size: cover;

            display: inline-block;

            margin: auto;

            content: "";

          }

        }

        svg {

          width: 70px;

          height: 70px;

        }

        .el-progress__text {

          display: none !important;

        }

      }



      .cap-text {

        color: #333333;

        font-weight: bold;

        font-size: 16px;

        .useable {

          margin-left: 20px;

        }

      }

    }

     }

   .el-button.el-button--primary {

    .el-button.el-button--primary {

      width: 150px !important;

      height: 30px !important;

      line-height: 7px !important;

@@ -244,132 +270,130 @@
      border-radius: 25px !important;

      border: none !important;

    }

    


    .el-date-editor.el-range-editor {

      height: 48px;

      width: 361px !important;

      border-radius: 8px;

      .el-input__icon.el-range__icon.el-icon-date {

      margin:0 15px ;

      &::before {

      line-height: 40px;

      font-size: 20px;

      color: #333;

        margin: 0 15px;

        &::before {

          line-height: 40px;

          font-size: 20px;

          color: #333;

        }

      }

      }

      .el-range-separator{

      .el-range-separator {

        line-height: 41px;

      }

      input {

        width: 127px;

        height: 32px;

        font-size: 12px;

        background: #F2F2F7;

        background: #f2f2f7;

        border-radius: 20px;

      }

    }

   
  .t {

    height: 22px;

    width: 242px;



    .t {

      height: 22px;

      width: 242px;

    }

  }



  .warm {

    position: absolute;

    bottom: 60px;

    left: 50%;

    width: 420px;

    transform: translateX(-50%);

    .icontishi-zhuyi {

      margin-right: 10px;

      color: red;

    }

  }

}



.warm {

  position: absolute;

  bottom: 60px;

  left: 50%;

  width: 420px;

  transform:translateX(-50%) ;

  .icontishi-zhuyi {

    margin-right:10px ;

    color: red;

  }

}

}





</style>



<style scoped lang="scss">

.warn-icon {

    color: var(--colorCard);

    font-size: 40px;

    margin-top: 11px;

  }

  .warn-title {

    font-weight: bold;

    font-size: 16px;

    margin: 6px;

    line-height: 22px;

  }

  .warn-dec {

    font-weight: bold;

    font-size: 14px;

    color: #828282;

    line-height: 20px;

  }

   .el-message-box__headerbtn {

    top: 12px;

  }

  .el-message-box__headerbtn .el-message-box__close {

    color: #333333;

    font-weight: bold;

  }

  .el-message-box__btns {

    display: flex;

    justify-content: center;

  color: var(--colorCard);

  font-size: 40px;

  margin-top: 11px;

}

.warn-title {

  font-weight: bold;

  font-size: 16px;

  margin: 6px;

  line-height: 22px;

}

.warn-dec {

  font-weight: bold;

  font-size: 14px;

  color: #828282;

  line-height: 20px;

}

.el-message-box__headerbtn {

  top: 12px;

}

.el-message-box__headerbtn .el-message-box__close {

  color: #333333;

  font-weight: bold;

}

.el-message-box__btns {

  display: flex;

  justify-content: center;

  margin: 20px;

    .el-button:focus,

    .el-button:hover {

      background-color: none;

      border: none;

  .el-button:focus,

  .el-button:hover {

    background-color: none;

    border: none;

  }

  button {

    width: 175px;

    height: 40px;

    border-radius: 25px;

    span {

      font-size: 16px;

      font-weight: 700;

    }

    button {

      width: 175px;

      height: 40px;

      border-radius: 25px;

      span {

        font-size: 16px;

        font-weight: 700;

      }

      &:hover {

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

      }

    }

    button:first-child {

      background-color: #e0e0e0;

      span {

        color: #333333;

      }

    }

    button:last-child {

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

    &:hover {

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

      span { 
         color: #fff;

      }

    }

   } 
  }

  button:first-child {

    background-color: #e0e0e0;

    span {

      color: #333333;

    }

  }

  button:last-child {

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

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

    span {

      color: #fff;

    }

  }

}

</style>



<style lang="scss">

.clean-time-picker {

    top: 208px !important;

    left: 343px !important;

    width: 624px !important;

  top: 208px !important;

  left: 343px !important;

  width: 624px !important;



    .el-picker-panel__sidebar {

      background: #EEF5FF;

      button {

        margin: 10px 0;

      }

  .el-picker-panel__sidebar {

    background: #eef5ff;

    button {

      margin: 10px 0;

    }

  }



    tbody {

        tr:first-child {

          background: #EEF5FF;

        }

      }

   }

  tbody {

    tr:first-child {

      background: #eef5ff;

    }

  }

}

</style>