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

对比分析添加选择菜单选项



See merge request !455

@@ -143,8 +143,14 @@
                 </el-radio-group>
                 </el-radio-group>
             </div>
             </div>
             <div v-if="!isAdd " style="padding: 3px 10px;">
             <div v-if="!isAdd " style="padding: 3px 10px;">
+                <el-select style="width: 100%" v-model="form.addFirstPId" placeholder="请选择菜单" filterable @change="dataFilter">
+                    <el-option v-for="item in firstMenu" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+            </div>
+            <div v-if="!isAdd " style="padding: 3px 10px;">
                 <el-input v-model="form.parentName" placeholder="请输入场景分类"/>
                 <el-input v-model="form.parentName" placeholder="请输入场景分类"/>
             </div>
             </div>
+
             <div v-if="!isAdd  " style="padding: 3px 10px;">
             <div v-if="!isAdd  " style="padding: 3px 10px;">
                 <el-input v-model="form.desc" placeholder="请输入场景分类描述"/>
                 <el-input v-model="form.desc" placeholder="请输入场景分类描述"/>
             </div>
             </div>
@@ -159,10 +165,10 @@
                     </el-option>
                     </el-option>
                 </el-select>
                 </el-select>
             </div>
             </div>
-<!--            xwx 2021-12-13注 基于任务167注-->
-<!--            <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;">-->
-<!--                <span>比对分析场景</span>-->
-<!--            </div>-->
+            <!--            xwx 2021-12-13注 基于任务167注-->
+            <!--            <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;">-->
+            <!--                <span>比对分析场景</span>-->
+            <!--            </div>-->
             <div style="padding: 3px 10px;">
             <div style="padding: 3px 10px;">
                 <el-input v-model="form.scene.name" placeholder="请输入场景名称"/>
                 <el-input v-model="form.scene.name" placeholder="请输入场景名称"/>
             </div>
             </div>

@@ -147,18 +147,20 @@ export default {
         const tabSecondList = Vue.ref([]);
         const tabSecondList = Vue.ref([]);
         let dialogFormVisible = Vue.ref(false);
         let dialogFormVisible = Vue.ref(false);
         let parentList = Vue.ref([]);
         let parentList = Vue.ref([]);
+        let firstMenu = Vue.ref([]);
 
 
         var isEdit=Vue.ref(false);
         var isEdit=Vue.ref(false);
         var isAdd = Vue.ref(false);
         var isAdd = Vue.ref(false);
-            if(false==id){
-                isEdit=false;
-            }else{
-                isEdit=true;
-            }
+        if(false==id){
+            isEdit=false;
+        }else{
+            isEdit=true;
+        }
         let count=Vue.ref(0);
         let count=Vue.ref(0);
         let countFirst=Vue.ref(0);
         let countFirst=Vue.ref(0);
 
 
         let form = Vue.ref({
         let form = Vue.ref({
+            addFirstPId:'',
             parentId: '',
             parentId: '',
             parentName: '',
             parentName: '',
             desc: '',
             desc: '',
@@ -286,6 +288,19 @@ export default {
             getChartData();
             getChartData();
         }
         }
 
 
+        //根菜单选择事件
+        let dataFilter=(val)=>{
+            if (val) { //val存在
+                this.options = this.firstMenu.filter((item) => {
+                    if (!!~item.label.indexOf(val) || !!~item.label.toUpperCase().indexOf(val.toUpperCase())) {
+                        return true
+                    }
+                })
+            } else { //val为空时，还原数组
+                this.options = this.firstMenu;
+            }
+        }
+
         let addRes = (row, index) => {
         let addRes = (row, index) => {
             tabFirstList.value.push(row);
             tabFirstList.value.push(row);
             activeName.value = 'first'
             activeName.value = 'first'
@@ -410,6 +425,7 @@ export default {
         }
         }
 
 
         let analysisChange = (val) => {
         let analysisChange = (val) => {
+
             if (val && val === true && parentList.value.length == 0) {
             if (val && val === true && parentList.value.length == 0) {
                 // 加载数据
                 // 加载数据
                 proxy.$http.post(`/api-web/ContrastAnalysis/selectScene`, {}, function (res) {
                 proxy.$http.post(`/api-web/ContrastAnalysis/selectScene`, {}, function (res) {
@@ -417,6 +433,7 @@ export default {
                         parentList.value = res.data;
                         parentList.value = res.data;
                     }
                     }
                 });
                 });
+
             }
             }
         }
         }
         let saveAnalysis = () => {
         let saveAnalysis = () => {
@@ -424,6 +441,7 @@ export default {
             let formVal = form.value;
             let formVal = form.value;
             let parentName = formVal.parentName;
             let parentName = formVal.parentName;
             let parentId = formVal.parentId;
             let parentId = formVal.parentId;
+            let addFirstPId=formVal.addFirstPId;
             let desc = formVal.scene.desc;
             let desc = formVal.scene.desc;
             let name = formVal.scene.name;
             let name = formVal.scene.name;
             let sort = formVal.scene.sort;
             let sort = formVal.scene.sort;
@@ -467,6 +485,12 @@ export default {
                     proxy.$global.showMsg("请输入场景分类！","warning");
                     proxy.$global.showMsg("请输入场景分类！","warning");
                     return;
                     return;
                 }
                 }
+                //判断根节点菜单是否选中
+                if(addFirstPId==''){
+                    proxy.$global.showMsg("请选择菜单！","warning");
+                    return;
+                }
+                addParam['addFirstPId']=addFirstPId;
                 addParam['parentName'] = parentName;
                 addParam['parentName'] = parentName;
                 addParam['desc'] = formVal.desc;
                 addParam['desc'] = formVal.desc;
                 url = '/api-web/ContrastAnalysis/insertScene';
                 url = '/api-web/ContrastAnalysis/insertScene';
@@ -486,6 +510,7 @@ export default {
                     onReset();
                     onReset();
                     // 清空数据
                     // 清空数据
                     form.value = {
                     form.value = {
+                        addFirstPId:'',
                         parentId: '',
                         parentId: '',
                         parentName: '',
                         parentName: '',
                         desc: '',
                         desc: '',
@@ -532,6 +557,14 @@ export default {
                     busTypeList.value = res.data;
                     busTypeList.value = res.data;
                 }
                 }
             })
             })
+
+
+            //LH 加载新增树菜单
+            proxy.$http.get(`/api-web/ContrastAnalysis/getRootMenu`,{menuName:''}, function (res) {
+                if (res.length>0 ) {
+                    firstMenu.value = res;
+                }
+            });
         }
         }
 
 
 
 
@@ -596,6 +629,7 @@ export default {
             timeRangeArr,
             timeRangeArr,
             loadTimeRange,
             loadTimeRange,
             timeRangeChange,
             timeRangeChange,
+            dataFilter,//根菜单选择事件
 
 
             isAdd,
             isAdd,
             isEdit,
             isEdit,
@@ -604,6 +638,7 @@ export default {
             showDialogForm,
             showDialogForm,
             saveAnalysis,
             saveAnalysis,
             parentList,
             parentList,
+            firstMenu,//菜单
             getChartData,
             getChartData,
             count,
             count,
             countFirst
             countFirst