调整企业设置功能

src/HManagement/siteManage/messageSendtype/index.vue

@@ -3,7 +3,7 @@
     <div class="container normal-panel normal-margin">
       <p class="normal-title normal-margin">消息提醒设置</p>
       <div class="flex-align-center" style="padding:50px;border-bottom:1px solid #eeeeee">
-        <!-- <div class="flex-align-center switch-panel">
+         <div class="flex-align-center switch-panel">
           <small>系统弹窗提醒&emsp;</small>
           <el-switch
             :active-value="1"
@@ -11,7 +11,7 @@
             v-model="form.remind_showdialog"
             @change="updateSite_Parameter">
           </el-switch>
-        </div> -->
+        </div>
         <div class="flex-align-center switch-panel">
           <small>邮件提醒&emsp;</small>
           <el-switch

src/HManagement/siteManage/securityConfig/index.vue

@@ -17,34 +17,36 @@
           <img width="72" height="72" src="../../../assets/icons/login_type_1.png" alt="">
           <div class="text-panel">
             <p class="explain-title">密码安全强制要求</p>
-            <p class="explain-tips">例:<span class="color-yellow">密码{{obj.password_length}}位数，{{obj.password_needcapital == 1?'大写英文字母，':''}}{{obj.password_needlowercase==1?'小写英文字母，':''}}{{obj.password_neednum==1?'数字0-9，':''}}{{obj.password_needspecialchar == 1?'特殊符号~,!,@,#,$,%,^;':''}}</span></p>
+            <p class="explain-tips">当前设置:<span class="color-yellow">密码{{obj.password_length}}位数，{{obj.password_needcapital == 1?'大写英文字母，':''}}{{obj.password_needlowercase==1?'小写英文字母，':''}}{{obj.password_neednum==1?'数字0-9，':''}}{{obj.password_needspecialchar == 1?'特殊符号~,!,@,#,$,%,^;':''}}</span></p>
           </div>
         </div>
-        <set-password v-if="tool.checkAuth($route.name,'psdValidate')"></set-password>
+        <set-password v-if="tool.checkAuth($route.name,'psdValidate')" @setPassword="querySite_Parameter"></set-password>
       </div>
     </div>
-    <!-- <div class="panel">
+     <div class="panel">
       <div class="flex-align-center flex-between">
         <div class="flex-align-stretch">
-          <img width="72" height="72" src="../../../assets/icons/login_type_2.png" alt="">
+          <img v-if="watermarkImage.length === 0" width="72" height="72" src="../../../assets/icons/login_type_2.png" alt="">
+          <img v-else width="72" height="72" :src=watermarkImage.image alt="">
           <div class="text-panel">
             <p class="explain-title">企业水印图片</p>
-            <p class="explain-tips">当前设置：已上传水印图片</p>
+            <p class="explain-tips">当前设置：{{watermarkImage.length === 0 ? '还未上传水印图片' : '已上传水印图片'}}</p>
           </div>
         </div>
-        <set-watermark :basicInfo="basicInfo" v-if="tool.checkAuth($route.name,'setWatermark')"></set-watermark>
+        <set-watermark :basicInfo="basicInfo" v-if="tool.checkAuth($route.name,'setWatermark')" @setWatermark="queryEnterpriseWatermark"></set-watermark>
       </div>
-    </div> -->
+    </div>
     <div class="panel">
       <div class="flex-align-center flex-between">
         <div class="flex-align-stretch">
-          <img width="72" height="72" src="../../../assets/icons/login_type_2.png" alt="">
+          <img v-if="productImage.length === 0" width="72" height="72" src="../../../assets/icons/login_type_2.png" alt="">
+          <img v-else width="72" height="72" :src=productImage.image alt="">
           <div class="text-panel">
             <p class="explain-title">产品默认图</p>
-            <p class="explain-tips">当前设置：已上传产品默认图</p>
+            <p class="explain-tips">当前设置：{{productImage.length === 0 ? '还未上传产品默认图':'已上传产品默认图'}}</p>
           </div>
         </div>
-        <productImage></productImage>
+        <productImage @setProductImage="productImage"></productImage>
       </div>
     </div>
     <div class="panel" style="margin-bottom:16px">
@@ -53,10 +55,10 @@
           <img width="72" height="72" src="../../../assets/icons/login_type_3.png" alt="">
           <div class="text-panel">
             <p class="explain-title">登录方式</p>
-            <p class="explain-tips">当前设置：账号登录，微信登录</p>
+            <p class="explain-tips">当前设置：{{obj.loginmode_account === 1?'账号登录,':''}}{{obj.loginmode_phonenumber ===1?'手机动态短信登录,':''}}{{obj.loginmode_wechat ===1?'微信登录,':''}}</p>
           </div>
         </div>
-        <login-select v-if="tool.checkAuth($route.name,'loginType')"></login-select>
+        <login-select v-if="tool.checkAuth($route.name,'loginType')" @setLogin="querySite_Parameter"></login-select>
       </div>
     </div>
     <div class="container normal-panel" style="display:flex;justify-content:space-around;border-bottom:none">
@@ -95,7 +97,9 @@ export default {
   data () {
     return {
       basicInfo:{},
-      obj:{}
+      obj:{},
+      watermarkImage:{},
+      productImage:{}
     }
   },
   computed:{
@@ -114,6 +118,7 @@ export default {
       console.log(1);
       
     },
+    /*安全配置信息*/
     async querySite_Parameter () {
       
       const res = await this.$api.requested({
@@ -127,13 +132,52 @@ export default {
         password_needlowercase:res.data.password_needlowercase,
         password_neednum:res.data.password_neednum,
         password_needspecialchar:res.data.password_needspecialchar,
-        password_length:res.data.password_length
+        password_length:res.data.password_length,
+        loginmode_account:res.data.loginmode_account,
+        loginmode_phonenumber:res.data.loginmode_phonenumber,
+        loginmode_wechat:res.data.loginmode_wechat
+      }
+    },
+    /*企业水印*/
+    async queryEnterpriseWatermark(){
+      const res = await this.$api.requested({
+        "classname": "system.attachment.Attachment",
+        "method": "queryFileLink",
+        "content": {
+          "ownertable": 'sys_site',
+          "ownerid": this.siteinfo.siteuid,
+          "usetype":'watermark'//传空返回有所
+        }
+      })
+      console.log(res,'企业水印信息')
+      this.watermarkImage = {
+        length:res.data.length,
+        image:res.data.length !== 0 ? res.data[0].url: ''
       }
+      console.log(this.watermarkImage)
     },
+    /*产品默认图*/
+    async queryProductImage(){
+      const res = await this.$api.requested({
+        "classname": "system.attachment.Attachment",
+        "method": "queryFileLink",
+        "content": {
+          "ownertable": 'system',
+          "ownerid": 1,
+          "usetype":'defaultImage'//传空返回有所
+        }
+      })
+      this.productImage = {
+        length:res.data.length,
+        image:res.data.length !== 0 ? res.data[0].url: ''
+      }
+    }
   },
   mounted () {
     this.infoData()
     this.querySite_Parameter()
+    this.queryEnterpriseWatermark()
+    this.queryProductImage()
   }
 }
 

src/HManagement/siteManage/securityConfig/modules/loginSelect.vue

@@ -75,6 +75,7 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.dialogEditVisible = false
+        this.$emit('setLogin')
       })
     },
   }

src/HManagement/siteManage/securityConfig/modules/password.vue

@@ -96,9 +96,8 @@ export default {
         "content": this.form
       })
       if (res.code === 1) {
-        this.disabled?this.$message({
-          message:'修改成功',
-          type:'success'
+        this.disabled?this.tool.showMessage(res,()=>{
+          this.$emit("setPassword")
         }):this.setDefaultPassword()
         this.disabled?this.dialogFormVisible = false:''
       } else {

src/HManagement/siteManage/securityConfig/modules/productImage.vue

@@ -15,7 +15,7 @@
       </el-row>
       <div class="dialog-footer">
         <el-button size="small" @click="dialogEditVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="dialogEditVisible = false" class="normal-btn-width btn-warning">确 定</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -60,6 +60,10 @@ export default {
       })
       res.data[0]?this.image = res.data[0]:this.image = {url:''}
     },
+    onSubmit(){
+      this.dialogEditVisible = false
+      this.$emit('setProductImage')
+    }
   }
 }
 

src/HManagement/siteManage/securityConfig/modules/watermark.vue

@@ -15,7 +15,7 @@
       </el-row>
       <div class="dialog-footer">
         <el-button size="small" @click="dialogEditVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="dialogEditVisible = false" class="normal-btn-width btn-warning">确 定</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -60,6 +60,10 @@ export default {
       })
       res.data[0]?this.image = res.data[0]:this.image = {url:''}
     },
+    onSubmit(){
+      this.dialogEditVisible = false
+      this.$emit('setWatermark')
+    }
   }
 }