场景编辑回显参数过滤逻辑修改

hanbaoshan

2020-09-18 3c093da398a4a9271c463341556d7621c1e4d0df

场景编辑回显参数过滤逻辑修改

 src/pages/analysisPower/index/App.vue

@@ -504,7 +504,9 @@
    height: 190px;
    min-width: 1609px;
    display: flex;
    
    .sysinfo-box .eCharts-box{
      width: 36%;
    }
    .progressBar {
      width: 26%;
    }

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

@@ -1131,21 +1131,6 @@
      this.sdkGroup = []

      this.group_id = ''



      // this.sdkGroup = ruleGroup;

      //  sdkGroup: [

      //   {

      //     sdkObj: {},

      //     polygonObj: {},

      //     is_save_anyhow: true,

      //     isSpread: true,

      //     argDef: [],

      //     initAddOptional: false,

      //     defaultArg: [],

      //     optionalArg: [],

      //     optArg: [],

      //     optNames: []

      //   }

      // ],

      ruleGroup.forEach(rule => {

        debugger

        let tempObj = {}

@@ -1188,26 +1173,7 @@
        debugger

        defaultArg = argDef.filter(arg => !arg.config.isOptional)

        optionalArg = argDef.filter(arg => arg.config.isOptional)

        //过滤掉rule.sdk_set里没有出现的可选配置项

        let isConfiged = false;

        let configedAlias = [];

        optionalArg.forEach(optArg=>{

          rule.sdk_set.forEach(sdkSet => {

            if(sdkSet.sdk_arg_alias == optArg.alias){

              isConfiged = true;

              configedAlias.push(optArg)

            }

          })

        });

        if(!isConfiged){

          optionalArg = [];

        }

        if(isConfiged){

          optionalArg = configedAlias

        }

        rule.sdk_set.forEach(sdkSet => {

          rule.sdk_set

        })



        rule.sdk_set.forEach(arg => {

          let optItem = optionalArg.find(oarg => {

            if (oarg.sort == arg.sort) {


 src/pages/visual/components/eCharts/pie.vue

@@ -52,27 +52,28 @@
          formatter: "{a} <br/>{b}: {c} ({d}%)"
        },
        legend: {
          show: false,
          // type:"scroll",
          // orient: "horizontal",
          // left: '10px',
          // right: '10px',
          // top: '35px',
          // align: 'auto',
          // textStyle: {
          //   color: 'rgba(136,136,136,.6)'
          // },
          // pageTextStyle:{
          //   color: 'rgba(136,136,136,.6)'
          // }
          //show: false,
          type:"scroll",
          orient: "horizontal",
          left: '10px',
          right: '10px',
          top: '35px',
          align: 'auto',
          textStyle: {
            color: 'rgba(136,136,136,.6)'
          },
          pageTextStyle:{
            color: 'rgba(136,136,136,.6)'
          }
        },
        series: [
          {
            name: this.seriesName,
            fontSize: 14,
            type: "pie",
            radius: this.radiusType,
            top: 40,
            height: "68%",
            height: "90%",
            // labelLine: {
            //   length: 15
            // },