-

src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -21,9 +21,40 @@
               label-width="150px"
               :rules="rules"
             >
-              <el-form-item label="主页标题:" prop="middleTitle">
+              <el-form-item label="主页标题:" prop="homeTitle">
                 <el-input v-model="form.middleTitle"></el-input>
               </el-form-item>
+
+              <el-form-item label="主题样式:" prop="homeStyle">
+                <el-select v-model="form.homeStyle" placeholder="请选择">
+                  <el-option label="#f22636" value="#f22636">
+                    <div class="homeStyleColor" style="background:#f22636"></div>
+                  </el-option>
+                  <el-option label="#f75527" value="#f75527">
+                    <div class="homeStyleColor" style="background:#f75527"></div>
+                  </el-option>
+                  <el-option label="#fdaa30" value="#fdaa30">
+                    <div class="homeStyleColor" style="background:#fdaa30"></div>
+                  </el-option>
+                  <el-option label="#2bc1c5" value="#2bc1c5">
+                    <div class="homeStyleColor" style="background:#2bc1c5"></div>
+                  </el-option>
+                  <el-option label="#58c22d" value="#58c22d">
+                    <div class="homeStyleColor" style="background:#58c22d"></div>
+                  </el-option>
+                  <el-option label="#2292fc" value="#2292fc">
+                    <div class="homeStyleColor" style="background:#2292fc"></div>
+                  </el-option>
+                  <el-option label="#5159ea" value="#5159ea">
+                    <div class="homeStyleColor" style="background:#5159ea"></div>
+                  </el-option>
+                  <el-option label="#7537c1" value="#7537c1">
+                    <div class="homeStyleColor" style="background:#7537c1"></div>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+             
               <el-form-item label="主页logo:" prop="homeLogo">
                 <el-input v-model="form.homeLogo"></el-input>
                 <el-upload
@@ -65,8 +96,8 @@
 
               <el-form-item label="主页导航栏:" prop="homeLayout">
                 <el-radio-group v-model="form.homeLayout">
-                  <el-radio :label="1" value="1">顶部导航栏</el-radio>
                   <el-radio :label="2" value="2">左侧导航栏</el-radio>
+                  <el-radio :label="1" value="1">顶部导航栏</el-radio>
                 </el-radio-group>
               </el-form-item>
 
@@ -183,6 +214,9 @@
               <el-form-item label="是否开启中间页:" prop="middleStatus">
                 <el-switch v-model="form.middleStatus" size="large" />
               </el-form-item>
+              <el-form-item label="中间页标题:" prop="middleTitle">
+                <el-input v-model="form.middleTitle"></el-input>
+              </el-form-item>
               <el-form-item label="中间页logo:" prop="middleLogo">
                 <el-input v-model="form.middleLogo"></el-input>
                 <el-upload
@@ -230,7 +264,9 @@
 
               <div style="text-align: right">
                 <el-button @click="closeDialog(0)">取消</el-button>
-                <el-button type="primary" @click="submitForm3(formInfo3)">保存</el-button>
+                <el-button type="primary" @click="submitForm3(formInfo3)">
+                  保存
+                </el-button>
               </div>
             </el-form>
           </el-tab-pane>
@@ -280,18 +316,18 @@ export default defineComponent({
     const showDialog = ref(false)
     const form = ref({})
     const formInfo = ref(null)
-     const formInfo2 = ref(null)
-      const formInfo3 = ref(null)
+    const formInfo2 = ref(null)
+    const formInfo3 = 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 upload3 = ref(null)
     const upload33 = ref(null)
- 
 
     const activeName = ref('first')
 
@@ -319,58 +355,55 @@ export default defineComponent({
     //上传成功的回调
     function handleUpAvatar(res) {
       form.value.homeLogo = window.PLATFROM_CONFIG.fileUrl + res.data
-      
     }
     function handleUpAvatar2(res) {
-      form.value.loginLogo  = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.loginLogo = window.PLATFROM_CONFIG.fileUrl + res.data
     }
     function handleUpAvatar22(res) {
-      form.value.loginBackUrl  = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.loginBackUrl = window.PLATFROM_CONFIG.fileUrl + res.data
     }
     function handleUpAvatar222(res) {
-      form.value.labelIcon  = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.labelIcon = window.PLATFROM_CONFIG.fileUrl + res.data
     }
     function handleUpAvatar3(res) {
-      form.value.middleLogo  = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.middleLogo = window.PLATFROM_CONFIG.fileUrl + res.data
     }
     function handleUpAvatar33(res) {
-      form.value.middleBackUrl  = window.PLATFROM_CONFIG.fileUrl + res.data
+      form.value.middleBackUrl = window.PLATFROM_CONFIG.fileUrl + res.data
     }
 
     function handleRemove() {
       form.value.homeLogo = ''
     }
-     function handleRemove2() {
+    function handleRemove2() {
       form.value.loginLogo = ''
     }
-     function handleRemove22() {
+    function handleRemove22() {
       form.value.loginBackUrl = ''
     }
-     function handleRemove222() {
+    function handleRemove222() {
       form.value.labelIcon = ''
     }
     function handleRemove3() {
       form.value.middleLogo = ''
     }
-     function handleRemove33() {
+    function handleRemove33() {
       form.value.middleBackUrl = ''
     }
 
     // 主页配置保存操作
     const submitForm = () => {
-
       formInfo.value.validate((valid) => {
         if (valid) {
-          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,
-            }
-
+          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,
+            homeStyle: form.value.homeStyle,
+          }
 
           if (props.configStatus) {
             // alert('已配置修改提交')
@@ -410,16 +443,15 @@ export default defineComponent({
     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,
-            }
+          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(aa).then((requset) => {
@@ -458,15 +490,15 @@ export default defineComponent({
     const submitForm3 = () => {
       formInfo3.value.validate((valid) => {
         if (valid) {
-          var aa=
-            {
-              id: props.itemInfo.id,
-              tenantId: props.itemInfo.tenantId,
-              middleStatus :form.value.middleStatus?1:0,
-              middleLogo :form.value.middleLogo,
-              middleBackUrl :form.value.middleBackUrl,
-              middleFooter :form.value.middleFooter,
-            }
+          var aa = {
+            id: props.itemInfo.id,
+            tenantId: props.itemInfo.tenantId,
+            middleStatus: form.value.middleStatus ? 1 : 0,
+            middleLogo: form.value.middleLogo,
+            middleTitle: form.value.middleTitle,
+            middleBackUrl: form.value.middleBackUrl,
+            middleFooter: form.value.middleFooter,
+          }
           if (props.configStatus) {
             // alert('已配置修改提交')
             api.updaMiddleConfig(aa).then((requset) => {
@@ -501,36 +533,34 @@ export default defineComponent({
       })
     }
 
-
     const open = () => {
       setTimeout(function () {
         form.value = props.itemInfo
-        form.value.middleStatus=props.itemInfo.middleStatus?true:false
-        form.value.homePageUrl=Number(props.itemInfo.homePageUrl)
+        form.value.middleStatus = props.itemInfo.middleStatus ? true : false
+        form.value.homePageUrl = Number(props.itemInfo.homePageUrl)
+        // form.value.homeStyle = Number(props.itemInfo.homeStyle)
+        form.value.homeLayout = 2
+        form.value.homePageUrl = ''
         console.log('子组件中form.value')
         console.log(form.value)
 
         getMenuBoxList(props.itemInfo.tenantId)
-
-        
       }, 500)
 
-      
-
       //  alert(props.configStatus)
     }
 
     // 关闭弹框
     const closeDialog = (flag) => {
-      activeName.value='first'
+      activeName.value = 'first'
       resetForm()
       upload.value.clearFiles()
-       upload2.value.clearFiles()
-        upload22.value.clearFiles()
-         upload222.value.clearFiles()
-         upload3.value.clearFiles()
-       upload33.value.clearFiles()
-      
+      upload2.value.clearFiles()
+      upload22.value.clearFiles()
+      upload222.value.clearFiles()
+      upload3.value.clearFiles()
+      upload33.value.clearFiles()
+
       showDialog.value = false
       emit('closeDialog', flag)
     }
@@ -541,16 +571,14 @@ export default defineComponent({
 
     //角色下拉请求
     function getMenuBoxList(params) {
-      api
-        .getMenuBoxList({ tenantId: params})
-        .then((requset) => {
-          if (requset.status === 'SUCCESS') {
-            console.log(requset.data)
-            homeUrlList.value = requset.data
-          } else {
-            ElMessage.error(requset.msg)
-          }
-        })
+      api.getMenuBoxList({ tenantId: params }).then((requset) => {
+        if (requset.status === 'SUCCESS') {
+          console.log(requset.data)
+          homeUrlList.value = requset.data
+        } else {
+          ElMessage.error(requset.msg)
+        }
+      })
     }
 
     watchEffect((fn, options) => {
@@ -576,6 +604,7 @@ export default defineComponent({
       closeDialog,
       open,
 
+
       store,
       beginTime,
       showDialog,
@@ -611,7 +640,7 @@ export default defineComponent({
       upload33,
 
       rules: {
-        middleTitle: [
+        homeTitle: [
           { required: false, message: '请输入主页标题', trigger: 'blur' },
           {
             min: 1,
@@ -620,6 +649,9 @@ export default defineComponent({
             trigger: 'blur',
           },
         ],
+        homeStyle: [
+          { required: false, message: '请输入主页logo', trigger: 'blur' },
+        ],
         homeLogo: [
           { required: false, message: '请输入主页logo', trigger: 'blur' },
         ],
@@ -643,11 +675,19 @@ export default defineComponent({
           { required: false, message: '请输入标签页图标', trigger: 'blur' },
         ],
 
-
         // middleStatus: [
         //   { required: false, message: '请选则中间页状态', trigger: 'blur' },
         // ],
-         middleLogo: [
+        middleTitle: [
+          { required: false, message: '请输入中间页标题', trigger: 'blur' },
+          {
+            min: 1,
+            max: 30,
+            message: '长度在 1 到 30个字符',
+            trigger: 'blur',
+          },
+        ],
+        middleLogo: [
           { required: false, message: '请输入中间页logo', trigger: 'blur' },
         ],
         middleBackUrl: [
@@ -656,11 +696,7 @@ export default defineComponent({
         middleFooter: [
           { required: false, message: '请输入中间页底部标题', trigger: 'blur' },
         ],
-       
-
-        
       },
-     
     }
   },
 })
@@ -709,9 +745,22 @@ export default defineComponent({
 ::v-deep .el-upload-list__item {
   width: 100px !important;
 }
+
+.homeStyleColor{
+  width: 100%;
+    height: 20px;
+    margin-top: 7px;
+    color:#fff;
+    // line-height:20px;
+    // padding-left:5px
+
+} 
+
 </style>
 <style>
 .systemCard .el-dialog__body {
   padding-top: 10px !important;
 }
+
+
 </style>

src/views/tenantManage/tenantUnit/dialogComponent.vue

@@ -82,6 +82,9 @@
           <el-form-item label="联系地址:" prop="address">
             <el-input v-model="form.address"></el-input>
           </el-form-item>
+          <el-form-item label="域名配置:" prop="domain">
+            <el-input v-model="form.domain"></el-input>
+          </el-form-item>
         </el-col>
       </el-row>
 
@@ -380,6 +383,15 @@ export default defineComponent({
             trigger: 'blur',
           },
         ],
+        domain: [
+          { required: true, message: '请输入域名地址', trigger: 'blur' },
+          {
+            min: 1,
+            max: 250,
+            message: '长度在 1 到 250个字符',
+            trigger: 'blur',
+          },
+        ],
       },
     }
   },

src/views/tenantManage/tenantUnit/index.vue

@@ -37,7 +37,7 @@
     <div class="filter-container mb-10">
       <div style="margin-top: 20px">
         <div class="filter-item">
-          租户名称：
+          单位名称：
           <el-input
             v-model="tenantName"
             placeholder="请输入内容"
@@ -55,7 +55,7 @@
           ></el-input>
         </div>
         <div class="filter-item">
-          客户类型:
+          试用租户/正式租户:
           <el-select
             v-model="tenantType"
             placeholder="请选择"
@@ -119,7 +119,7 @@
       <el-table-column type="index" label="序号" width="50px"></el-table-column>
       <el-table-column
         prop="tenantName"
-        label="租户名称"
+        label="单位名称"
         min-width="140px"
       ></el-table-column>
       <el-table-column
@@ -132,7 +132,7 @@
         label="负责人手机号"
         min-width="125px"
       ></el-table-column>
-      <el-table-column prop="tenantType" label="客户类型" min-width="80px">
+      <el-table-column prop="tenantType" label="试用租户/正式租户" min-width="150px">
         <template #default="scope">
           <span>
             {{ scope.row.tenantType === '0' ? '试用租户' : '正式租户' }}
@@ -140,11 +140,25 @@
         </template>
       </el-table-column>
       <el-table-column
+        prop="tenantTerm"
+        label="到期时间"
+        min-width="110px"
+      ></el-table-column>
+      <!-- <el-table-column
         prop="geoPosition"
         label="地理位置"
         min-width="160px"
+      ></el-table-column> -->
+     
+
+      <el-table-column
+        prop="platformName"
+        label="系统平台"
+        min-width="140px"
       ></el-table-column>
-      <el-table-column prop="status" label="状态" width="">
+      
+
+       <el-table-column prop="status" label="状态" width="">
         <template #default="scope">
           <span
             :style="{
@@ -155,17 +169,7 @@
           </span>
         </template>
       </el-table-column>
-
-      <el-table-column
-        prop="platformName"
-        label="系统平台"
-        min-width="140px"
-      ></el-table-column>
-      <el-table-column
-        prop="tenantTerm"
-        label="到期时间"
-        min-width="110px"
-      ></el-table-column>
+      
       <el-table-column fixed="right" label="操作" width="80">
         <template #default="scope">
           <el-button
@@ -255,7 +259,8 @@ export default defineComponent({
         systemName: '',
         email: '',
         address: '',
-        status:0
+        status:0,
+        domain:''
       }
       dialogTitle.value = '新增'
       showDialog.value = true
@@ -276,7 +281,8 @@ export default defineComponent({
         systemName: Number(row.systemName),
         email: row.email,
         address: row.address,
-        remark:row.remark
+        remark:row.remark,
+        domain:row.domain
       }
       dialogTitle.value = '编辑'
       showDialog.value = true