-

src/api/tenantManage/systemConfig.js

@@ -44,6 +44,16 @@ export function updaMiddleConfig(params) {
     })
 }
 
+//系统配置-首页请求下拉
+export function getMenuBoxList(params) {
+    return request({
+        url: '/sysTenantConfig/getMenuBoxList',
+        method: 'GET',
+        params,
+    })
+}
+
+
 //单位配置-系统平台下拉
 export function getPlatformBoxList(params) {
     return request({

src/main.js

@@ -6,7 +6,7 @@ import store from './store'
 import 'ant-design-vue/dist/antd.css'
 import '@/vab'
 
-import 'default-passive-events'
+// import 'default-passive-events'
 
 // 引入 ElementUI
 import ElementPlus from 'element-plus'

src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -27,7 +27,7 @@
               <el-form-item label="主页logo:" prop="homeLogo">
                 <el-input v-model="form.homeLogo"></el-input>
                 <el-upload
-                ref="upload"
+                  ref="upload"
                   :action="uploadUrl"
                   :on-success="handleUpAvatar"
                   :on-remove="handleRemove"
@@ -47,7 +47,17 @@
               </el-form-item>
 
               <el-form-item label="首页请求地址:" prop="homePageUrl">
-                <el-input v-model="form.homePageUrl"></el-input>
+                <!-- <el-input v-model="form.homePageUrl"></el-input> -->
+
+                <el-select v-model="form.homePageUrl" placeholder="请选择">
+                  <el-option
+                    v-for="item in homeUrlList"
+                    :key="item.value"
+                    :label="item.menuName"
+                    :value="item.menuId"
+                  ></el-option>
+                </el-select>
+
                 <!-- <el-select v-model="form.homePageUrl" placeholder="请选择">
                   <el-option label="地址1" :value="1"></el-option>
                   <el-option label="地址2" :value="2"></el-option>
@@ -183,11 +193,11 @@ export default defineComponent({
     const value = ref(true)
     const accessToken = ref(store.state.user.accessToken)
 
-    const upload = ref(null);
+    const upload = ref(null)
 
     const activeName = ref('first')
 
-    const getPlatformBoxList = ref([])
+    const homeUrlList = ref([])
 
     const dataSet = reactive({
       uploadUrl:
@@ -206,21 +216,19 @@ export default defineComponent({
     }
     const overLength = () => {
       ElMessage.warning('只能上传一张')
-
     }
 
     // //上传成功的回调
     function handleUpAvatar(res) {
       console.log('res')
       console.log(res.data)
-      form.value.homeLogo = window.PLATFROM_CONFIG.baseUrl +res.data
+      form.value.homeLogo = window.PLATFROM_CONFIG.baseUrl + res.data
 
       console.log(form.value.homeLogo)
     }
 
-   function  handleRemove(){
-     form.value.homeLogo = ''
-
+    function handleRemove() {
+      form.value.homeLogo = ''
     }
 
     // 保存操作
@@ -229,7 +237,7 @@ export default defineComponent({
         if (valid) {
           form.value.tenantId = props.itemInfo.tenantId
           if (props.configStatus) {
-            alert('已配置修改提交')
+            // alert('已配置修改提交')
             api.updaMiddleConfig(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
@@ -242,7 +250,7 @@ export default defineComponent({
               }
             })
           } else {
-            alert('未配置新增提交')
+            // alert('未配置新增提交')
             api.addMiddleConfig(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
@@ -267,9 +275,11 @@ export default defineComponent({
         form.value = props.itemInfo
         console.log('子组件中form.value')
         console.log(form.value)
+
+        getMenuBoxList(props.itemInfo.tenantId)
       }, 500)
 
-      optionselect()
+      
 
       //  alert(props.configStatus)
     }
@@ -277,25 +287,27 @@ export default defineComponent({
     // 关闭弹框
     const closeDialog = (flag) => {
       resetForm()
-      upload.value.clearFiles();
+      upload.value.clearFiles()
       showDialog.value = false
       emit('closeDialog', flag)
     }
 
     function resetForm() {
-     
       formInfo.value.resetFields()
     }
 
     //角色下拉请求
-    function optionselect() {
-      api.getPlatformBoxList().then((requset) => {
-        if (requset.status === 'SUCCESS') {
-          getPlatformBoxList.value = requset.data
-        } else {
-          ElMessage.error(requset.msg)
-        }
-      })
+    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)
+          }
+        })
     }
 
     watchEffect((fn, options) => {
@@ -326,7 +338,7 @@ export default defineComponent({
       checked: true,
       form,
       formInfo,
-      getPlatformBoxList,
+      homeUrlList,
 
       activeName,
       value,
@@ -349,11 +361,11 @@ export default defineComponent({
         homeLogo: [
           { required: true, message: '请输入主页logo', trigger: 'blur' },
         ],
-        homePageUrl: [
-          { required: true, message: '请输入主页请求地址', trigger: 'blur' },
-        ],
+        // homePageUrl: [
+        //   { required: true, message: '请输入主页请求地址', trigger: 'blur' },
+        // ],
         homeLayout: [
-          { required: true, message: '请选则主页导航布局', trigger: 'change' },
+          { required: true, message: '请选则主页导航布局', trigger: 'blur' },
         ],
       },
     }
@@ -401,8 +413,8 @@ export default defineComponent({
   margin-left: 10px;
   display: inline-block;
 }
-::v-deep .el-upload-list__item{
-  width:100px!important
+::v-deep .el-upload-list__item {
+  width: 100px !important;
 }
 </style>
 <style>

src/views/tenantManage/systemConfig/index.vue

@@ -172,8 +172,16 @@ export default defineComponent({
    
     // 配置操作
     const configRow = (row) => {
+      
+      tableItem.value = {
+         tenantId: row.id,
+      }
+
+       console.log('tableItem.value')
+      console.log(tableItem.value)
+      
       getMiddleConfigList(row.id)
-      console.log(row)
+      
 
       dialogTitle.value = '配置'
       showDialog.value = true
@@ -210,24 +218,27 @@ 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('requset.data')
-            console.log(requset.data)
 
-            tableItem.value=requset.data[0];
+            console.log('tableItem.value')
+            console.log(tableItem.value)
 
             if (requset.data.length) {
               console.log('已配置')
-              
-               console.log('tableItem.value')
-              console.log(tableItem.value)
+                          tableItem.value=requset.data[0];
+
+              //  console.log('tableItem.value')
+              // console.log(tableItem.value)
 
               configStatus.value = true
             } else {

src/views/tenantManage/tenantUnit/dialogComponent.vue

@@ -34,6 +34,12 @@
               </el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="状态:" prop="status">
+            <el-select v-model="form.status" placeholder="请选择">
+              <el-option label="正常" :value="0"></el-option>
+              <el-option label="停用" :value="1"></el-option>
+            </el-select>
+          </el-form-item>
 
           <el-form-item label="地理位置:" prop="geoPosition">
             <el-input v-model="form.geoPosition"></el-input>
@@ -217,7 +223,7 @@ export default defineComponent({
       })
     }
 
-    function initMap(){
+    function initMap() {
       // AMap start
       var map = new AMap.Map('mapF', {
         resizeEnable: true,
@@ -227,18 +233,13 @@ export default defineComponent({
         form.value.geoPosition = e.lnglat.getLng() + ',' + e.lnglat.getLat()
       })
       // AMap end
-
     }
 
     const open = () => {
-      initMap()
-
-
-
-      
-
-
-
+      // initMap()
+      setTimeout(function () {
+        initMap()
+      }, 10)
 
       form.value = props.itemInfo
       console.log('form.value')
@@ -280,7 +281,8 @@ export default defineComponent({
       return time.getTime() <= Date.now() - timeRange * 1
     }
 
-    onMounted(() => {})
+    onMounted(() => {
+    })
 
     return {
       pickerEndDate,
@@ -323,6 +325,7 @@ export default defineComponent({
         tenantTerm: [
           { required: true, message: '请选择有效期限', trigger: 'change' },
         ],
+        status: [{ required: true, message: '请选择状态', trigger: 'change' }],
         geoPosition: [
           { required: true, message: '请选输入地理位置', trigger: 'blur' },
         ],

src/views/tenantManage/tenantUnit/index.vue

@@ -232,7 +232,7 @@ export default defineComponent({
     const pageSize = ref(15)
     const total = ref(0)
 
-    const status = ref('')
+    const status = ref(0)
     const tenantType = ref('')
     const tenantName = ref('')
     const tenantManager = ref('')
@@ -255,6 +255,7 @@ export default defineComponent({
         systemName: '',
         email: '',
         address: '',
+        status:''
       }
       dialogTitle.value = '新增'
       showDialog.value = true
@@ -268,6 +269,7 @@ export default defineComponent({
         tenantManager: row.tenantManager,
         tenantTerm: row.tenantTerm=='永久有效'?3:4,
         value1:row.tenantTerm,
+        status: Number(row.status),
         geoPosition: row.geoPosition,
         tenantType: Number(row.tenantType),
         phoneNumber: row.phoneNumber,