Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【无】对比分析列表搜索条件在一行；设置默认搜索条件，既默认第一个业务、第一个指标；添加/删除完成后重新加载整个页面



See merge request !920

@@ -532,8 +532,8 @@ export default {
                     // 已选择列表
                     // 已选择列表
                     tabFirstList.value = [];
                     tabFirstList.value = [];
                     // 关闭谈画框
                     // 关闭谈画框
-
-
+                    // lsq 刷新菜单 2022-08-29
+                    window.top.location.reload();
                     // window.top.location.href = window.top.location.origin + "/#/analysis/view/id=105"
                     // window.top.location.href = window.top.location.origin + "/#/analysis/view/id=105"
                     window.top.location.href = window.top.location.origin + '/#/' + res.str;
                     window.top.location.href = window.top.location.origin + '/#/' + res.str;
                 }
                 }
@@ -555,12 +555,23 @@ export default {
             proxy.$http.get("/api-web/manage/kpi/list", {}, function (res) {
             proxy.$http.get("/api-web/manage/kpi/list", {}, function (res) {
                 if (res && res.data) {
                 if (res && res.data) {
                     kpiList.value = res.data;
                     kpiList.value = res.data;
+                    //lsq 给默认数据，第一个数据
+                    if(kpiList.value.length>0){
+                        kpiTypeArr.value=[kpiList.value[0].kpiId];
+                        getParams.value.kpiId=kpiList.value[0].kpiId;
+                    }
+                    loeadTable();
                 }
                 }
             })
             })
 
 
             proxy.$http.get("/api-web/home/business/findAllBusType", {}, function (res) {
             proxy.$http.get("/api-web/home/business/findAllBusType", {}, function (res) {
                 if (res && res.data) {
                 if (res && res.data) {
                     busTypeList.value = res.data;
                     busTypeList.value = res.data;
+                    //lsq 给一个默认数据，第一个数据 2022-08-29
+                    if(busTypeList.value.length>0){
+                        busTypeArr.value=[busTypeList.value[0].busId];
+                        getParams.value.busId=busTypeList.value[0].busId;
+                    }
                 }
                 }
             })
             })
 
 
@@ -577,7 +588,6 @@ export default {
                     });
                     });
                 }
                 }
             });
             });
-
             //LH
             //LH
             setTimeout(function () {
             setTimeout(function () {
                 let arrs = timeRangeArr.value
                 let arrs = timeRangeArr.value
@@ -598,7 +608,7 @@ export default {
 
 
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
-
+            init();
 
 
             if (!id) {
             if (!id) {
                 activeName.value = 'second';
                 activeName.value = 'second';
@@ -609,7 +619,6 @@ export default {
                 //编辑追加场景分类数据加载
                 //编辑追加场景分类数据加载
                 analysisChange(true);
                 analysisChange(true);
             }
             }
-            loeadTable();
 
 
             // 先加载时间范围，然后在加载
             // 先加载时间范围，然后在加载
             loadTimeRange(function (defCode) {
             loadTimeRange(function (defCode) {
@@ -620,12 +629,12 @@ export default {
                     }
                     }
                 });
                 });
             });
             });
-            init();
             console.log('onMounted');
             console.log('onMounted');
         })
         })
 
 
 
 
         return {
         return {
+            getParams,
             resTypeList,
             resTypeList,
             kpiList,
             kpiList,
             busTypeList,
             busTypeList,

@@ -20,22 +20,17 @@
                     <el-button :size="$global.elementConfig.size.button" @click="searchData" class="search-text button-flex-div-center"
                     <el-button :size="$global.elementConfig.size.button" @click="searchData" class="search-text button-flex-div-center"
                                type="primary">搜索
                                type="primary">搜索
                     </el-button>
                     </el-button>
-
-                </div>
-
-            </el-col>
-        </el-row>
-        <el-row class="list-title">
-            <el-col :span="24" class="text-left">
+                    <!--lsq 条件在一行 2022-08-29-->
                     <router-link :to="'/analysis/add'" class="analysis link-type">
                     <router-link :to="'/analysis/add'" class="analysis link-type">
-                    <el-button :size="$global.elementConfig.size.button" class="button-flex-div-center" type="primary">
+                        <el-button :size="$global.elementConfig.size.button" style="margin-left:6px;" class="button-flex-div-center" type="primary">
                             <i class="el-icon-plus"></i>新增
                             <i class="el-icon-plus"></i>新增
                         </el-button>
                         </el-button>
                     </router-link>
                     </router-link>
+                </div>
 
 
-                <!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>-->
             </el-col>
             </el-col>
         </el-row>
         </el-row>
+
         <el-row class="analysis-table-div">
         <el-row class="analysis-table-div">
             <el-col :span="24">
             <el-col :span="24">
                 <el-table :data="tableData" @selection-change="handleSelectionChange" border ref="multipleTable" stripe
                 <el-table :data="tableData" @selection-change="handleSelectionChange" border ref="multipleTable" stripe

@@ -28,7 +28,6 @@ export default {
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             proxy.getData();
             proxy.getData();
-
         })
         })
         //获取对比分析列表
         //获取对比分析列表
         const getData = () => {
         const getData = () => {
@@ -83,6 +82,8 @@ export default {
                     $.get(proxy.domainName + proxy.apiUrl1 + '?access_token=' + localStorage.getItem('access_token'), params, function () {
                     $.get(proxy.domainName + proxy.apiUrl1 + '?access_token=' + localStorage.getItem('access_token'), params, function () {
                         proxy.$global.showMsg("删除成功", "success");
                         proxy.$global.showMsg("删除成功", "success");
                         proxy.getData();
                         proxy.getData();
+                        // lsq 刷新菜单 2022-08-29
+                        window.top.location.reload();
                     })
                     })
                 } else {
                 } else {
                     proxy.$global.showMsg("删除失败", "warning");
                     proxy.$global.showMsg("删除失败", "warning");