Merge branch 'master-V32-LH' into 'master'

Master v32 lh



See merge request !383

@@ -132,22 +132,23 @@
     <cm-dialog title="保存场景" width="500px" :showDialogVisible="dialogFormVisible" @hidedialog="showDialogForm"
                @okfunc="saveAnalysis">
         <template v-slot>
-            <div style="display:inline-block;margin-bottom: 10px">
+            <div style="display:inline-block;margin-bottom: 10px" >
                 <el-radio-group v-model="isAdd" @change="analysisChange">
-                    <el-radio :label="false" border>
+                    <el-radio  :label="false" border :disabled="isEdit">
                         新增场景分类
                     </el-radio>
-                    <el-radio :label="true" border>
+                    <el-radio  :label="true" border >
                         追加场景分类
                     </el-radio>
                 </el-radio-group>
             </div>
-            <div v-if="!isAdd" style="padding: 3px 10px;">
+            <div v-if="!isAdd " style="padding: 3px 10px;">
                 <el-input v-model="form.parentName" placeholder="请输入场景分类"/>
             </div>
-            <div v-if="!isAdd" style="padding: 3px 10px;">
+            <div v-if="!isAdd  " style="padding: 3px 10px;">
                 <el-input v-model="form.desc" placeholder="请输入场景分类描述"/>
             </div>
+
             <div v-else style="padding: 3px 10px;">
                 <el-select v-model="form.parentId" placeholder="请选择场景分类" style="width: 100%">
                     <el-option

@@ -147,7 +147,14 @@ export default {
         const tabSecondList = Vue.ref([]);
         let dialogFormVisible = Vue.ref(false);
         let parentList = Vue.ref([]);
-        let isAdd = Vue.ref(false);
+
+        var isEdit=Vue.ref(false);
+        var isAdd = Vue.ref(false);
+            if(false==id){
+                isEdit=false;
+            }else{
+                isEdit=true;
+            }
         let count=Vue.ref(0);
         let countFirst=Vue.ref(0);
 
@@ -167,10 +174,12 @@ export default {
 
 
         let getResType = (arr) => {
+
             var types = arr.map(function (v) {
                 return v.id;
             });
             resTypeArr.value = types;
+            getParams.value.resType=resTypeArr.value.join(',');
             loeadTable();
         }
         let getKpiType = (arr) => {
@@ -179,6 +188,7 @@ export default {
                 return v.kpiId;
             });
             kpiTypeArr.value = types;
+            getParams.value.kpiId=  kpiTypeArr.value.join(',');
             loeadTable();
         }
         let getBizType = (arr) => {
@@ -186,10 +196,11 @@ export default {
                 return v.busId;
             });
             busTypeArr.value = types;
+            getParams.value.busId = busTypeArr.value.join(',');
             loeadTable();
         }
         // 查询参数
-        let getParams = Vue.ref({
+        var getParams = Vue.ref({
             keyWords: keyWords.value,
             resType: resTypeArr.value.join(','),
             kpiId: kpiTypeArr.value.join(','),
@@ -235,7 +246,6 @@ export default {
         let getPageInfoSecond = ({page, limit}) => {
             getParams.value.page = page;
             getParams.value.limit = limit;
-
             // 下一页搜索
             loadSecondList();
         }
@@ -380,6 +390,11 @@ export default {
 
         // 点击按钮搜索
         let onBtnSearch = () => {
+            getParams.value.busId = busTypeArr.value.join(',');
+            getParams.value.resType=resTypeArr.value.join(',');
+            getParams.value.kpiId=  kpiTypeArr.value.join(',');
+            getParams.value .keyWords = keyWords.value;
+
             loeadTable(true);
         }
 
@@ -443,6 +458,10 @@ export default {
             }
 
             let url = '';
+            if(id && parentId == ''){
+                proxy.$global.showMsg("请切换场景并选择场景分类","warning");
+                return;
+            }
             if (isAdd.value == false) {
                 if(parentName == ''){
                     proxy.$global.showMsg("请输入场景分类！","warning");
@@ -463,7 +482,7 @@ export default {
             proxy.$http.post(url, addParam, function (res) {
                 if (res && res.success) {
                     proxy.$global.showMsg("添加成功！");
-
+                    showDialogForm(false);
                     onReset();
                     // 清空数据
                     form.value = {
@@ -482,7 +501,7 @@ export default {
                     // 已选择列表
                     tabFirstList.value = [];
                     // 关闭谈画框
-                    showDialogForm(false);
+
 
                     // window.top.location.href = window.top.location.origin + "/#/analysis/view/id=105"
                     window.top.location.href =  window.top.location.origin + '/#/' + res.str;
@@ -579,6 +598,7 @@ export default {
             timeRangeChange,
 
             isAdd,
+            isEdit,
             analysisChange,
             dialogFormVisible,
             showDialogForm,