Merge branch 'master-v32-lushangqing' into 'master'

活动策略新增页面 的是否默认单选框的位置调整padding-left



See merge request !280

@@ -446,7 +446,11 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
         //删除收藏夹下的资源
         function deleteFavoriteResource(favId,resIds) {
             //确认提示框
-            layer.confirm('删除后将无法恢复，您确定要删除当前收藏夹吗？', {
+            /*
+            * 提示语更改
+            * 2021-12-24 by lushangqing
+            * */
+            layer.confirm('您确定要删除资源吗？删除后将无法恢复！', {
                 btn: ['确定', '取消'] //按钮
             }, function () {
                 layer.closeAll();

@@ -7889,4 +7889,7 @@ form[lay-filter="activewarning-form"] .layui-inline {
 .layui-notClick{
     pointer-events: none!important;
     cursor:not-allowed!important;
+}
+.padding-left-10{
+    padding-left:10px;
 }
\ No newline at end of file

@@ -21,7 +21,7 @@
         </div>
         <div class="layui-inline">
             <label class="layui-form-label">是否默认</label>
-            <div class="layui-input-inline">
+            <div class="layui-input-inline padding-left-10">
                 <input type="radio" name="policyType" value="1" title="默认">
                 <input type="radio" name="policyType" value="0" title="非默认" checked>
             </div>

@@ -24,7 +24,7 @@
         </div>
         <div class="layui-inline">
             <label class="layui-form-label">是否默认</label>
-            <div class="layui-input-inline">
+            <div class="layui-input-inline padding-left-10">
                 <input type="radio" name="policyType" lay-filter="rdo-policyType" value="1" title="默认">
                 <input type="radio" name="policyType" lay-filter="rdo-policyType" value="0" title="非默认" checked>
             </div>

@@ -30,7 +30,7 @@
                   <div class="flex-div-start">
                    <!-- <el-button type="primary" @click="onReset()">重置</el-button>
                     <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>-->
-                    <el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
+                    <el-button type="primary" :disabled="isLoading" @click="saveAll()">批量添加</el-button>
                     <el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
                   </div>
                 </div>

@@ -71,6 +71,7 @@ export default {
         let bizName=Vue.ref();
         let name=Vue.ref();
         let baseVisible=Vue.ref(false);
+        let isLoading=Vue.ref(false);
 
         // 监听编辑状态
         Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{
@@ -152,7 +153,7 @@ export default {
                 if(res && res.data){
                     proxy.count = res.count;
                     proxy.tableDataList=res.data;
-                    proxy.$emit('baseCount',proxy.count);
+                    // proxy.$emit('baseCount',proxy.count);
                 }
             })
 
@@ -164,10 +165,10 @@ export default {
 
             let params={
                 targetId:proxy.targetId,
-                npmList:[baseList]
+                baseList:[baseList]
             }
 
-            proxy.$http.post('/api-web/fault/conf/npm/batchAddNpm',params,function (res){
+            proxy.$http.post('/api-web/fault/conf/base/batchAddBaseInfo',params,function (res){
                 if(res && res.success){
                     proxy.$global.showMsg('添加成功','success');
                     proxy.targetId=res.str;
@@ -238,24 +239,24 @@ export default {
         }
         //添加选中的
         let saveAll=()=>{
-            let npmListSelectData=[];
+            let baseListSelectData=[];
             proxy.tableDataList.map(item=>{
                 if(item.checked){
-                    npmListSelectData.push(item)
+                    baseListSelectData.push(item)
                 }
 
             })
-            if(npmListSelectData.length==0){
+            if(baseListSelectData.length==0){
                 proxy.$global.showMsg('请选择配置','warning');
             }else{
                 proxy.isLoading=true;
 
                 let params={
                     targetId:proxy.targetId,
-                    npmList:npmListSelectData
+                    baseList:baseListSelectData
                 }
 
-                proxy.$http.post('/api-web/fault/conf/npm/batchAddNpm',params,function (res){
+                proxy.$http.post('/api-web/fault/conf/base/batchAddBaseInfo',params,function (res){
                     if(res && res.success){
                         proxy.$global.showMsg('添加成功','success');
                         proxy.targetId=res.str;
@@ -281,6 +282,7 @@ export default {
             proxy.$emit('callbackBase',obj);
         }
         return {
+            isLoading,
             closeDialog,
             addRes,
             saveAlldata,

@@ -770,12 +770,12 @@ export default {
             }
 
             if(this.type){
-                // if(this.type=='base' && this.faultEnvironmentRadio=='1'){
-                //     this.saveBase();
-                // }else{
+                if(this.type=='base' && this.faultEnvironmentRadio=='1'){
+                    this.saveBase();
+                }else{
                     this.saveConfigDetailOther();
 
-                // }
+                }
             }else{
                 this.saveFaultDefine();
             }
@@ -986,34 +986,36 @@ export default {
 
             }else{
                 this.getTargetId('base')
-                if(that.faultEnvironmentRadio==1){
+                that.saveConfigDetailOther();
+                /*if(that.faultEnvironmentRadio==1){
                     if(this.targetId){
                         this.$global.showMsg('环境基础数据已存在，不能重复保存','warning')
 
                     }else{
-                        let params={
-                            targetId:this.targetId,
-                            busId:this.busTypeArr
-                        }
-                        this.$http.post('/api-web/fault/conf/base/saveOrUpdate',params,function (res){
-                            if(res && res.success){
-                                that.targetId=res.str;
-                                that.setTargetId(that.targetId)
-                                // that.$global.showMsg(res.msg)
-                                // that.alarmList=res.data;
-                                that.saveConfigDetailOther();
-                            }else{
-                                that.$global.showMsg('基础环境保存失败','warning')
-
-                            }
-                            that.isLoading=false;
-
-                        })
+                        // let params={
+                        //     targetId:this.targetId,
+                        //     busId:this.busTypeArr
+                        // }
+                        // this.$http.post('/api-web/fault/conf/base/saveOrUpdate',params,function (res){
+                        //     if(res && res.success){
+                        //         that.targetId=res.str;
+                        //         that.setTargetId(that.targetId)
+                        //         // that.$global.showMsg(res.msg)
+                        //         // that.alarmList=res.data;
+                        //         that.saveConfigDetailOther();
+                        //     }else{
+                        //         that.$global.showMsg('基础环境保存失败','warning')
+                        //
+                        //     }
+                        //     that.isLoading=false;
+                        //
+                        // })
+                        that.saveConfigDetailOther();
                     }
                 }else{
                     that.saveConfigDetailOther();
 
-                }
+                }*/
 
 
             }