-

src/views/tenantManage/adminConfig/component/adminDialog.vue

@@ -78,7 +78,7 @@ export default defineComponent({
   components: {},
   emits: ['closeNo', 'select'],
   props: {
-    admin_dialog: Boolean,
+    show_dialog2: Boolean,
     DialogArray: Object,
     dialogTitle: String,
     itemInfo: {
@@ -153,7 +153,7 @@ export default defineComponent({
 
     watchEffect((fn, options) => {
       fn, options
-      cloneDialog.value = props.admin_dialog
+      cloneDialog.value = props.show_dialog2
     })
 
     return {

src/views/tenantManage/adminConfig/component/checkAdminList.vue

@@ -35,13 +35,13 @@
           >
             编辑
           </el-button>
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             style="color: #409eff"
           >
             密码重置
-          </el-button>
+          </el-button> -->
           <el-popconfirm
               confirm-button-text="是"
               cancel-button-text="否"
@@ -83,7 +83,7 @@
     <admin-Dialog
       :dialog-title="dialogTitle2"
       :item-info="tableItem"
-      :admin_dialog="adminDialogBool"
+      :admin_dialog="dialogBoolean"
       @closeNo="closeNo"
       @Select="Select"
       :DialogArray="DialogArray"
@@ -132,7 +132,7 @@ export default defineComponent({
     const showDialog = ref(false)
 
     const DialogArray = ref([])
-    const adminDialogBool = ref(false)
+    const dialogBoolean = ref(false)
 
     const handleSizeChange = (val) => {
       pageSize.value = val
@@ -180,6 +180,7 @@ export default defineComponent({
 
     //管理员配置  （修改操作）
     const adminConfig = (row) => {
+      alert('编辑操作')
        console.log('row')
       console.log(row)
 
@@ -195,7 +196,7 @@ export default defineComponent({
       }
       DialogArray.value = row
       dialogTitle2.value = '修改'
-      adminDialogBool.value = true
+      dialogBoolean.value = true
     }
 
     const open = () => {
@@ -270,7 +271,7 @@ export default defineComponent({
       showDialog,
 
       DialogArray,
-      adminDialogBool,
+      dialogBoolean,
 
       total,
       pageSize,

src/views/tenantManage/adminConfig/index.vue

@@ -128,7 +128,7 @@
       :dialog-title="dialogTitle"
       :item-info="tableItem"
       @closeNo="closeNo"
-      :admin_dialog="adminDialogBool"
+      :show_dialog2="showDialog2"
       :DialogArray="DialogArray"
     ></admin-Dialog>
 
@@ -171,7 +171,7 @@ export default defineComponent({
     const region = ref()
 
     const DialogArray = ref([])
-    const adminDialogBool = ref(false)
+    const showDialog2 = ref(false)
 
     //查询设备列表
     function Select() {
@@ -218,7 +218,7 @@ export default defineComponent({
       }
       DialogArray.value = row
       dialogTitle.value = '配置管理员'
-      adminDialogBool.value = true
+      showDialog2.value = true
     }
 
     // 关闭操作
@@ -234,7 +234,7 @@ export default defineComponent({
 
     //管理员配置弹窗关闭
     const closeNo = (value) => {
-      adminDialogBool.value = value
+      showDialog2.value = value
     }
 
     onMounted(() => {
@@ -329,7 +329,7 @@ export default defineComponent({
       DataReportExport,
 
       DialogArray,
-      adminDialogBool,
+      showDialog2,
 
       adminConfig, //管理员配置按钮事件
       closeNo, //管理员配置弹窗关闭事件

src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -175,7 +175,7 @@ export default defineComponent({
 
       formInfo.value.validate((valid) => {
         if (valid) {
-          form.value.tenantId=1006
+          form.value.tenantId=props.itemInfo.tenantId
           if (props.configStatus) {
             alert('已配置修改提交')
             api.updaMiddleConfig(form.value).then((requset) => {
@@ -296,41 +296,6 @@ export default defineComponent({
           homeLayout: [
             { required: true, message: '请选则主页导航布局', trigger: 'change' },
           ],
-        //   tenantType: [
-        //     { required: true, message: '请输入租户类型', trigger: 'blur' },
-        //   ],
-        //   phoneNumber: [
-        //     {
-        //       required: true,
-        //       message: '请输入负责人手机号码',
-        //       trigger: 'blur',
-        //     },
-        //     {
-        //       validator: validatorPhone,
-        //       message: '输入的电话号码不正确',
-        //       trigger: 'blur',
-        //     },
-        //   ],
-        //   systemName: [
-        //     { required: true, message: '请选择系统平台', trigger: 'blur' },
-        //   ],
-        //   email: [
-        //     { required: true, message: '请输入邮箱地址', trigger: 'blur' },
-        //     {
-        //       validator: isEmail,
-        //       message: '输入的邮箱地址不正确',
-        //       trigger: 'blur',
-        //     },
-        //   ],
-        //   address: [
-        //     { required: true, message: '请输入联系地址', trigger: 'blur' },
-        //     {
-        //       min: 1,
-        //       max: 15,
-        //       message: '长度在 1 到 15个字符',
-        //       trigger: 'blur',
-        //     },
-        //   ],
       },
     }
   },

src/views/tenantManage/systemConfig/index.vue

@@ -5,14 +5,7 @@
       <div class="left">
         <div>
           <a class="" style="margin-right: 30px">系统配置列表</a>
-          <!-- <el-button
-            icon="el-icon-plus"
-            type="success"
-            @click="addItem()"
-            :disabled="store.state.authorities.indexOf('新增') == -1"
-          >
-            新增
-          </el-button> -->
+         
         </div>
       </div>
 
@@ -176,22 +169,7 @@ export default defineComponent({
     const input = ref('')
     const region = ref()
 
-    // 添加操作
-    const addItem = () => {
-      tableItem.value = {
-        tenantName: '',
-        tenantManager: '',
-        tenantTerm: 1,
-        geoPosition: '',
-        tenantType: '',
-        phoneNumber: '',
-        systemName: '',
-        email: '',
-        address: '',
-      }
-      dialogTitle.value = '新增'
-      showDialog.value = true
-    }
+   
     // 配置操作
     const configRow = (row) => {
       getMiddleConfigList(row.id)
@@ -239,6 +217,7 @@ export default defineComponent({
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
+
             console.log('requset.data')
             console.log(requset.data)
 
@@ -252,7 +231,7 @@ export default defineComponent({
 
               configStatus.value = true
             } else {
-              
+
                console.log('暂无配置')
               configStatus.value = false
             }
@@ -355,7 +334,6 @@ export default defineComponent({
       cancelEvent,
       closeDialog,
       configRow,
-      addItem,
       Select,
 
       store,

src/views/tenantManage/tenantUnit/index.vue

@@ -176,21 +176,7 @@
           >
             编辑
           </el-button>
-          <!-- <el-popconfirm
-            confirm-button-text="是"
-            cancel-button-text="否"
-            icon="el-icon-info"
-            icon-color="red"
-            title="确定删除?"
-            @confirm="handleDelete(scope.row)"
-            @cancel="cancelEvent"
-          >
-            <template #reference>
-              <el-button type="text" size="small" class="delete-text" :disabled="store.state.authorities.indexOf('删除')==-1">
-                删除
-              </el-button>
-            </template>
-          </el-popconfirm> -->
+          
         </template>
       </el-table-column>
     </el-table>