qymljy 3 týždňov pred
rodič
commit
2a8a3177cf

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 44 - 1
src/HManagement/siteManage/securityConfig/components/applicationRuleSet/index.vue


+ 4 - 2
src/HManagement/siteManage/securityConfig/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <normalCompany >
+  <normalCompany style="margin-top: 5px">
     <div slot="titleRight">
       <el-button  :disabled="!tool.checkAuth($route.name,'update')" icon="el-icon-edit-outline" size="small" type="primary" class="editBtn-style"
                   @click="onShowDetail">{{$t('编 辑')}}</el-button>
@@ -24,6 +24,8 @@
       <div class="placement-border" style="background: #e6a23c">
         <placementSet ref="placementSetRef"></placementSet>
       </div>
+
+      <div style="height: 2px!important;"></div>
     </div>
   </normalCompany>
 </template>
@@ -248,6 +250,6 @@ export default {
 }
 .placement-border{
   /*background: #FFFFFF;*/
-  margin: -5px 15px 10px 15px;
+  margin: -5px 15px 0 15px;
 }
 </style>

+ 48 - 2
src/HManagement/siteManage/securityConfig/modules/setContentTemplate.vue

@@ -1,12 +1,58 @@
 <template>
   <div>
-    <el-button type="primary" size="small">{{$t(`设置`)}}</el-button>
+    <el-button size="small" style="width:120px" type="primary" @click="querySite_Parameter">{{ $t('设 置') }}</el-button>
+    <el-dialog :title="$t(dialog_title)" append-to-body :visible.sync="dialogEditVisible" width="860px">
+      <el-row :gutter="16" style="text-align: center">
+        <el-col :span="24" style="margin-top: -20px">
+          <span style="color: #8C8C8C">{{ $t(tip_content) }}?</span>
+        </el-col>
+        <el-col :span="24" style="margin-top: 20px">
+          <div style="width: 780px;" class="inline-16" >
+            <el-radio-group v-model="checkData">
+              <el-radio :label="1" style="color: #8C8C8C">{{ $t('开启') }}</el-radio>
+              <el-radio :label="0" style="color: #8C8C8C">{{$t('关闭')}}</el-radio>
+            </el-radio-group>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogEditVisible = false" class="normal-btn-width">{{$t('取 消')}}</el-button>
+        <el-button size="small" type="warning"  class="normal-btn-width btn-warning" @click="onSubmit">{{$t('确 定')}}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 export default {
-  name: "setContentTemplate"
+  name: "setContentTemplate",
+  props:["data","dialog_title","tip_content","set_name"],
+  data() {
+    return {
+      dialogEditVisible:false,
+      checkData:0,
+      form:{}
+    }
+  },
+  methods:{
+    querySite_Parameter(){
+      this.dialogEditVisible = true
+      this.form = Object.assign({},this.form,this.data)
+      this.checkData = this.form[this.set_name]
+    },
+    async onSubmit(){
+      this.form[this.set_name] = this.checkData
+      const res = await this.$api.requested({
+        "classname": "webmanage.site.site",
+        "method": "updateSite_Parameter",
+        "content": this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('onSuccess')
+        this.dialogEditVisible = false
+      })
+    }
+  }
 }
 </script>
 

+ 10 - 2
src/HManagement/siteManage/securityConfig/modules/setTemplate.vue

@@ -7,7 +7,15 @@
             <slot name="svgIcon"></slot>
           </div>
           <div style="margin-left: 10px">
-            <div class="title-font">{{$t(title)}}</div>
+            <div class="title-font">
+              {{$t(title)}}
+              <el-tooltip  effect="dark"  placement="top-start" class="inline-16" style="margin-top: 4px;margin-left: 5px" v-if="is_tip">
+                <div slot="content">
+                 <slot name="tipContent"></slot>
+                </div>
+                <img width="14px" height="14px" src="../../../../assets/icons/prompt_icon.svg" style="float: right">
+              </el-tooltip>
+            </div>
             <div class="result-font">{{$t(`当前设置:`) + $t(setResult)}}</div>
           </div>
           <div style="margin-left: 10px">
@@ -27,7 +35,7 @@
 import setContentTemplate from "@/HManagement/siteManage/securityConfig/modules/setContentTemplate";
 export default {
   name: "setTemplate",
-  props:['title','setResult'],
+  props:['title','setResult','is_tip'],
   components:{setContentTemplate}
 }
 </script>

+ 1 - 1
src/components/normal-basic-layout/normalCompany.vue

@@ -84,7 +84,7 @@ export default {
   padding: 16px 0;
 } */
 .basic__layout__panel{
-  height: calc(100vh - 130px);
+  /*height: calc(100vh - 130px);*/
   background: #F5F5F5;
 }
 .card__list{

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov