-

src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -41,7 +41,7 @@
                     上传
                   </el-button>
                   <template #tip>
-                    <div class="el-upload__tip">图片尺寸：1920*1080</div>
+                    <div class="el-upload__tip">图片尺寸：待更新</div>
                   </template>
                 </el-upload>
               </el-form-item>
@@ -75,7 +75,9 @@
 
               <div style="text-align: right">
                 <el-button @click="closeDialog(0)">取消</el-button>
-                <el-button type="primary" @click="submitForm()">保存</el-button>
+                <el-button type="primary" @click="submitForm('formInfo')">
+                  保存
+                </el-button>
               </div>
             </el-form>
           </el-tab-pane>
@@ -90,26 +92,84 @@
               label-width="150px"
               :rules="rules"
             >
-              <el-form-item label="登录页标题:" prop="tenantName">
-                <el-input v-model="form.tenantName"></el-input>
+              <el-form-item label="登录页标题:" prop="loginTitle">
+                <el-input v-model="form.loginTitle"></el-input>
               </el-form-item>
-              <el-form-item label="登录页logo:" prop="tenantManager">
-                <el-input v-model="form.tenantManager"></el-input>
+              <el-form-item label="登录页logo:" prop="loginLogo">
+                <!-- <el-input v-model="form.tenantManager"></el-input> -->
+                <el-input v-model="form.loginLogo"></el-input>
+                <el-upload
+                  ref="upload2"
+                  :action="uploadUrl"
+                  :on-success="handleUpAvatar2"
+                  :on-remove="handleRemove2"
+                  list-type="picture"
+                  :limit="1"
+                  :on-preview="handlePictureCardPreview"
+                  :headers="{ accessToken: [accessToken] }"
+                  :on-exceed="overLength"
+                >
+                  <el-button type="primary" style="margin-top: 10px">
+                    上传
+                  </el-button>
+                  <template #tip>
+                    <div class="el-upload__tip">图片尺寸：待更新</div>
+                  </template>
+                </el-upload>
               </el-form-item>
-              <el-form-item label="登录页背景:" prop="tenantManager">
-                <el-input v-model="form.tenantManager"></el-input>
+              <el-form-item label="登录页背景:" prop="loginBackUrl">
+                <!-- <el-input v-model="form.tenantManager"></el-input> -->
+                <el-input v-model="form.loginBackUrl"></el-input>
+                <el-upload
+                  ref="upload22"
+                  :action="uploadUrl"
+                  :on-success="handleUpAvatar22"
+                  :on-remove="handleRemove22"
+                  list-type="picture"
+                  :limit="1"
+                  :on-preview="handlePictureCardPreview"
+                  :headers="{ accessToken: [accessToken] }"
+                  :on-exceed="overLength"
+                >
+                  <el-button type="primary" style="margin-top: 10px">
+                    上传
+                  </el-button>
+                  <template #tip>
+                    <div class="el-upload__tip">图片尺寸：1920*1080</div>
+                  </template>
+                </el-upload>
               </el-form-item>
-              <el-form-item label="登录页底部名称:" prop="tenantName">
-                <el-input v-model="form.tenantName"></el-input>
+              <el-form-item label="登录页底部名称:" prop="loginFooter">
+                <el-input v-model="form.loginFooter"></el-input>
               </el-form-item>
-              <el-form-item label="标签页图标:" prop="tenantManager">
-                <el-input v-model="form.tenantManager"></el-input>
+              <el-form-item label="标签页图标:" prop="labelIcon">
+                <el-input v-model="form.labelIcon"></el-input>
+                <el-upload
+                  ref="upload222"
+                  :action="uploadUrl"
+                  :on-success="handleUpAvatar222"
+                  :on-remove="handleRemove222"
+                  list-type="picture"
+                  :limit="1"
+                  :on-preview="handlePictureCardPreview"
+                  :headers="{ accessToken: [accessToken] }"
+                  :on-exceed="overLength"
+                >
+                  <el-button type="primary" style="margin-top: 10px">
+                    上传
+                  </el-button>
+                  <template #tip>
+                    <div class="el-upload__tip">图片尺寸：待更新</div>
+                  </template>
+                </el-upload>
               </el-form-item>
               <br />
 
               <div style="text-align: right">
                 <el-button @click="closeDialog(0)">取消</el-button>
-                <el-button type="primary" @click="submitForm()">保存</el-button>
+                <el-button type="primary" @click="submitForm2('formInfo2')">
+                  保存
+                </el-button>
               </div>
             </el-form>
           </el-tab-pane>
@@ -190,10 +250,16 @@ export default defineComponent({
     const showDialog = ref(false)
     const form = ref({})
     const formInfo = ref(null)
+     const formInfo2 = ref(null)
+      const formInfo22 = ref(null)
+       const formInfo222 = ref(null)
     const value = ref(true)
     const accessToken = ref(store.state.user.accessToken)
 
     const upload = ref(null)
+    const upload2 = ref(null)
+    const upload22 = ref(null)
+    const upload222 = ref(null)
 
     const activeName = ref('first')
 
@@ -218,27 +284,105 @@ export default defineComponent({
       ElMessage.warning('只能上传一张')
     }
 
-    // //上传成功的回调
+    //上传成功的回调
     function handleUpAvatar(res) {
-      console.log('res')
-      console.log(res.data)
       form.value.homeLogo = window.PLATFROM_CONFIG.baseUrl + res.data
-
-      console.log(form.value.homeLogo)
+      
+    }
+    function handleUpAvatar2(res) {
+      form.value.loginLogo  = window.PLATFROM_CONFIG.baseUrl + res.data
+    }
+    function handleUpAvatar22(res) {
+      form.value.loginBackUrl  = window.PLATFROM_CONFIG.baseUrl + res.data
+    }
+    function handleUpAvatar222(res) {
+      form.value.labelIcon  = window.PLATFROM_CONFIG.baseUrl + res.data
     }
 
     function handleRemove() {
       form.value.homeLogo = ''
     }
+     function handleRemove2() {
+      form.value.loginLogo = ''
+    }
+     function handleRemove22() {
+      form.value.loginBackUrl = ''
+    }
+     function handleRemove222() {
+      form.value.labelIcon = ''
+    }
 
-    // 保存操作
+    // 主页配置保存操作
     const submitForm = () => {
+      // alert(params)
+      // if(params=='formInfo'){
+      //   alert(1)
+      // }
+ 
       formInfo.value.validate((valid) => {
         if (valid) {
-          form.value.tenantId = props.itemInfo.tenantId
+          var aa=
+            {
+              id: props.itemInfo.id,
+              tenantId: props.itemInfo.tenantId,
+              middleTitle :form.value.middleTitle,
+              homeLogo :form.value.homeLogo,
+              homePageUrl :form.value.homePageUrl,
+              homeLayout :form.value.homeLayout,
+            }
+
+
+          if (props.configStatus) {
+            alert('已配置修改提交')
+            api.updaMiddleConfig(aa).then((requset) => {
+              if (requset.status === 'SUCCESS') {
+                ElMessage.success({
+                  message: '修改配置成功',
+                  type: 'success',
+                })
+                closeDialog()
+              } else {
+                ElMessage.error(requset.msg)
+              }
+            })
+          } else {
+            alert('未配置新增提交')
+            api.addMiddleConfig(form.value).then((requset) => {
+              if (requset.status === 'SUCCESS') {
+                ElMessage.success({
+                  message: '新增配置成功',
+                  type: 'success',
+                })
+                closeDialog()
+              } else {
+                ElMessage.error(requset.msg)
+              }
+            })
+          }
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+
+    // 登录页配置保存操作
+    const submitForm2 = () => {
+      formInfo2.value.validate((valid) => {
+        if (valid) {
+          var aa=
+            {
+              id: props.itemInfo.id,
+              tenantId: props.itemInfo.tenantId,
+              loginLogo :form.value.loginLogo,
+              loginTitle :form.value.loginTitle,
+              loginBackUrl :form.value.loginBackUrl,
+              loginFooter :form.value.loginFooter,
+              labelIcon :form.value.labelIcon,
+            }
           if (props.configStatus) {
-            // alert('已配置修改提交')
-            api.updaMiddleConfig(form.value).then((requset) => {
+            alert('已配置修改提交')
+            api.updaMiddleConfig(aa).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '修改配置成功',
@@ -277,6 +421,8 @@ export default defineComponent({
         console.log(form.value)
 
         getMenuBoxList(props.itemInfo.tenantId)
+
+        
       }, 500)
 
       
@@ -286,8 +432,12 @@ export default defineComponent({
 
     // 关闭弹框
     const closeDialog = (flag) => {
+      activeName.value='second'
       resetForm()
       upload.value.clearFiles()
+       upload2.value.clearFiles()
+        upload22.value.clearFiles()
+         upload222.value.clearFiles()
       showDialog.value = false
       emit('closeDialog', flag)
     }
@@ -328,6 +478,7 @@ export default defineComponent({
       pickerEndDate,
       roleValid,
       submitForm,
+      submitForm2,
       closeDialog,
       open,
 
@@ -338,15 +489,27 @@ export default defineComponent({
       checked: true,
       form,
       formInfo,
+      formInfo2,
+      formInfo22,
+      formInfo222,
       homeUrlList,
 
       activeName,
       value,
       overLength,
       handleUpAvatar,
+      handleUpAvatar2,
+      handleUpAvatar22,
+      handleUpAvatar222,
       handleRemove,
+      handleRemove2,
+      handleRemove22,
+      handleRemove222,
       accessToken,
       upload,
+      upload2,
+      upload22,
+      upload222,
 
       rules: {
         middleTitle: [
@@ -361,13 +524,28 @@ export default defineComponent({
         homeLogo: [
           { required: true, message: '请输入主页logo', trigger: 'blur' },
         ],
-        // homePageUrl: [
-        //   { required: true, message: '请输入主页请求地址', trigger: 'blur' },
-        // ],
         homeLayout: [
           { required: true, message: '请选则主页导航布局', trigger: 'blur' },
         ],
+
+        loginTitle: [
+          { required: true, message: '请输入登录页标题', trigger: 'blur' },
+        ],
+        loginLogo: [
+          { required: true, message: '请选则登录页logo', trigger: 'blur' },
+        ],
+        loginBackUrl: [
+          { required: true, message: '请选择登录页背景图', trigger: 'blur' },
+        ],
+        loginFooter: [
+          { required: true, message: '请输入登录页底部标题', trigger: 'blur' },
+        ],
+        labelIcon: [
+          { required: true, message: '请输入标签页图标', trigger: 'blur' },
+        ],
+        
       },
+     
     }
   },
 })

src/views/tenantManage/systemConfig/index.vue

@@ -5,7 +5,6 @@
       <div class="left">
         <div>
           <a class="" style="margin-right: 30px">系统配置列表</a>
-         
         </div>
       </div>
 
@@ -169,19 +168,16 @@ export default defineComponent({
     const input = ref('')
     const region = ref()
 
-   
     // 配置操作
     const configRow = (row) => {
-      
       tableItem.value = {
-         tenantId: row.id,
+        tenantId: row.id,
       }
 
-       console.log('tableItem.value')
+      console.log('tableItem.value')
       console.log(tableItem.value)
-      
+
       getMiddleConfigList(row.id)
-      
 
       dialogTitle.value = '配置'
       showDialog.value = true
@@ -218,32 +214,26 @@ export default defineComponent({
     }
 
     //查询系统配置单个
-    function getMiddleConfigList(params) {  
+    function getMiddleConfigList(params) {
       api
         .getMiddleConfigList({
           tenantId: params,
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-    
-            
             // tableItem.value.tenantId=params
 
-
             console.log('tableItem.value')
             console.log(tableItem.value)
 
             if (requset.data.length) {
               console.log('已配置')
-                          tableItem.value=requset.data[0];
-
-              //  console.log('tableItem.value')
-              // console.log(tableItem.value)
+              tableItem.value = requset.data[0]
+              tableItem.value.homeLayout = Number(requset.data[0].homeLayout)
 
               configStatus.value = true
             } else {
-
-               console.log('暂无配置')
+              console.log('暂无配置')
               configStatus.value = false
             }
           } else {