-

src/views/tenantManage/authConfig/dialogComponent.vue

@@ -1,169 +1,525 @@
 <template>
-  <el-dialog
-    :title="dialogTitle"
-    v-model="dialogVisible"
-    width="640px"
-    @close="closeDialog()"
-    @open="open"
-  >
-    <el-form
-      ref="formInfo"
-      :model="form"
-      class="demo-form-inline userManageDialog"
-      label-width="100px"
-      :rules="rules"
+  <div class="aa">
+    <el-dialog
+      :title="dialogTitle"
+      v-model="showDialog"
+      @open="open()"
+      @close="closeDialog(0)"
     >
-      <el-form-item label="用户名：" prop="nickName">
-        <el-input
-          v-model="form.nickName"
-          :disabled="dialogTitle === '查看'"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="账号：" prop="userName">
-        <el-input
-          v-model="form.userName"
-          :disabled="dialogTitle === '查看'"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="性别：" prop="sex">
-        <el-radio-group v-model="form.sex" :disabled="dialogTitle === '查看'">
-          <el-radio label="1" value="1">男</el-radio>
-          <el-radio label="2" value="2">女</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item label="手机号码：" prop="phonenumber">
-        <el-input
-          v-model="form.phonenumber"
-          :disabled="dialogTitle === '查看'"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="密码" prop="password" v-if="dialogTitle == '新增'">
-        <el-input
-          v-model="form.password"
-          :disabled="dialogTitle === '查看'"
-        ></el-input>
-      </el-form-item>
-
-      <!-- <el-form-item
-        label="创建时间："
-        prop="createTime"
-        style="margin-top: 0px"
+      <el-form
+        ref="formInfo"
+        :model="form"
+        class="demo-form-inline"
+        label-width="150px"
+        :rules="rules"
       >
-        <el-date-picker
-          v-model="form.createTime"
-          width="100%"
-          type="datetime"
-          placeholder="选择日期时间"
-          :disabled="dialogTitle === '查看'"
-        ></el-date-picker>
-      </el-form-item> -->
-
-      <el-form-item label="角色名称：" prop="roleId">
-        <!-- <el-input v-model="form.roleName"></el-input> -->
-        <el-select
-          v-model="form.roleId"
-          placeholder="请选择"
-          clearable
-          :disabled="dialogTitle === '查看'"
-        >
-          <el-option
-            v-for="(item, index) in roleSelectData"
-            :key="index"
-            :label="item.roleName"
-            :value="item.roleId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="所属站点：" prop="siteId">
-         <el-select
-              v-model="form.siteId"
-              placeholder="请选择"
-              clearable
-               multiple
-              filterable
-              collapse-tags
-               @change="linkChange()"
-              
-            >
-              <el-option
-                v-for="site in store.state.siteList"
-                :key="site"
-                :label="site.siteName"
-                :value="site.id"
-                
-              ></el-option>
-            </el-select>
-      </el-form-item>
-
-
-      <br />
-      <br />
-      <br />
-      <div style="text-align: right">
-        <el-button @click="closeDialog(0)">取消</el-button>
-        <el-button
-          type="primary"
-          @click="submitForm('formInfo')"
-          :disabled="isDisable"
-          v-if="dialogTitle !== '查看'"
-        >
-          确定
-        </el-button>
-      </div>
-    </el-form>
-  </el-dialog>
+        <el-form-item label="菜单权限:" prop="aaa">
+          <div>
+            <el-checkbox
+              v-model="checked1"
+              label="展开/折叠"
+              size="large"
+              @change="handleExpandChange"
+            />
+            <el-checkbox v-model="checked2" label="全选/全不选" size="large" />
+            <el-checkbox v-model="checked3" label="父子联动" size="large"/>
+          </div>
+          <el-tree
+            v-if="data.length"
+            :data="data"
+            :props="defaultProps"
+            @node-click="handleNodeClick"
+            show-checkbox
+            :default-expand-all="isExpand"
+            :check-strictly="isStrictly"
+          />
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
 </template>
-
 <script>
-import { defineComponent, ref, onMounted, watchEffect,watch } from 'vue'
-import * as api from '@/api/systemManage/userManage.js'
-import { ElMessage } from 'element-plus'
-import { parseTime, validatorPhone } from '@/utils'
 import { useStore } from 'vuex'
-
+import { defineComponent, ref, watchEffect, watch, onMounted } from 'vue'
+import * as api from '@/api/tenantManage/tenantUnit.js'
+import { ElMessage } from 'element-plus'
+// import { parseTime } from '@/utils'
+import { validatorPhone, parseTime, isEmail } from '@/utils'
 export default defineComponent({
   name: 'DialogComponent',
   emits: ['closeDialog'],
   props: {
-    flag: Boolean,
+    show_Dialog: Boolean,
     dialogTitle: String,
-    itemInfo: Object,
+    itemInfo: {
+      type: Object,
+      default: function () {
+        return {}
+      },
+    },
   },
-  setup(props, context) {
-    context
+  setup(props, { emit }) {
     const store = useStore()
-    const dialogVisible = ref(false)
+    const beginTime = ref('')
+    const showDialog = ref(false)
+    const form = ref({})
     const formInfo = ref(null)
-    const isDisable = ref(false)
 
-    const form = ref([])
-    const roleSelectData = ref([])
+    const isExpand = ref(false)
+    const isStrictly=ref(true)
+    const getPlatformBoxList = ref([])
+    const checked1 = ref(false)
+    const checked2 = ref(false)
+    const checked3 = ref(false)
 
-    // open(): Dialog弹窗打开之前做的事
-    const open = () => {
-    
-      form.value = props.itemInfo.value
-       console.log('form.value')
-       console.log(form.value)
-      console.log(form.value.siteId)
+    const data = ref([
+      {
+        label: 'Level one 1',
+        children: [
+          {
+            label: 'Level two 1-1',
+            children: [
+              {
+                label: 'Level three 1-1-1',
+              },
+            ],
+          },
+        ],
+      },
+      {
+        label: 'Level one 2',
+        children: [
+          {
+            label: 'Level two 2-1',
+            children: [
+              {
+                label: 'Level three 2-1-1',
+              },
+            ],
+          },
+          {
+            label: 'Level two 2-2',
+            children: [
+              {
+                label: 'Level three 2-2-1',
+              },
+            ],
+          },
+        ],
+      },
+      {
+        label: 'Level one 3',
+        children: [
+          {
+            label: 'Level two 3-1',
+            children: [
+              {
+                label: 'Level three 3-1-1',
+              },
+            ],
+          },
+          {
+            label: 'Level two 3-2',
+            children: [
+              {
+                label: 'Level three 3-2-1',
+              },
+            ],
+          },
+        ],
+      },
+    ])
+
+    const handleNodeClick = (data, obj, node) => {
+      data, node
+      console.log(data)
     }
 
-  
+    //展开合并
+    const handleExpandChange = () => {
+      data.value = []
+      if (checked1.value) {
+        isExpand.value = true
+        setTimeout(function () {
+          data.value = [
+            {
+              label: 'Level one 1',
+              children: [
+                {
+                  label: 'Level two 1-1',
+                  children: [
+                    {
+                      label: 'Level three 1-1-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 2',
+              children: [
+                {
+                  label: 'Level two 2-1',
+                  children: [
+                    {
+                      label: 'Level three 2-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 2-2',
+                  children: [
+                    {
+                      label: 'Level three 2-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 3',
+              children: [
+                {
+                  label: 'Level two 3-1',
+                  children: [
+                    {
+                      label: 'Level three 3-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 3-2',
+                  children: [
+                    {
+                      label: 'Level three 3-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+          ]
+        }, 10)
+      } else {
+        isExpand.value = false
+        setTimeout(function () {
+          data.value = [
+            {
+              label: 'Level one 1',
+              children: [
+                {
+                  label: 'Level two 1-1',
+                  children: [
+                    {
+                      label: 'Level three 1-1-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 2',
+              children: [
+                {
+                  label: 'Level two 2-1',
+                  children: [
+                    {
+                      label: 'Level three 2-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 2-2',
+                  children: [
+                    {
+                      label: 'Level three 2-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 3',
+              children: [
+                {
+                  label: 'Level two 3-1',
+                  children: [
+                    {
+                      label: 'Level three 3-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 3-2',
+                  children: [
+                    {
+                      label: 'Level three 3-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+          ]
+        }, 10)
+      }
 
-    // 关闭弹框
-    const closeDialog = () => {
-      resetForm()
-      context.emit('closeDialog', false)
-      dialogVisible.value = false
+    
     }
 
-    watchEffect((fn, options) => {
-      fn, options
-      dialogVisible.value = props.flag
-    })
+    //全选全不选
+    const handleCheckedChange = () => {
+      data.value = []
+      if (checked2.value) {
+        isExpand.value = true
+        setTimeout(function () {
+          data.value = [
+            {
+              label: 'Level one 1',
+              children: [
+                {
+                  label: 'Level two 1-1',
+                  children: [
+                    {
+                      label: 'Level three 1-1-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 2',
+              children: [
+                {
+                  label: 'Level two 2-1',
+                  children: [
+                    {
+                      label: 'Level three 2-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 2-2',
+                  children: [
+                    {
+                      label: 'Level three 2-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 3',
+              children: [
+                {
+                  label: 'Level two 3-1',
+                  children: [
+                    {
+                      label: 'Level three 3-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 3-2',
+                  children: [
+                    {
+                      label: 'Level three 3-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+          ]
+        }, 10)
+      } else {
+        isExpand.value = false
+        setTimeout(function () {
+          data.value = [
+            {
+              label: 'Level one 1',
+              children: [
+                {
+                  label: 'Level two 1-1',
+                  children: [
+                    {
+                      label: 'Level three 1-1-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 2',
+              children: [
+                {
+                  label: 'Level two 2-1',
+                  children: [
+                    {
+                      label: 'Level three 2-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 2-2',
+                  children: [
+                    {
+                      label: 'Level three 2-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 3',
+              children: [
+                {
+                  label: 'Level two 3-1',
+                  children: [
+                    {
+                      label: 'Level three 3-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 3-2',
+                  children: [
+                    {
+                      label: 'Level three 3-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+          ]
+        }, 10)
+      }
+    }
+    const handleStrictlyChange=()=>{
+   
+      if (checked3.value) {
+        isStrictly.value = false
+        setTimeout(function () {
+          data.value = [
+            {
+              label: 'Level one 1',
+              children: [
+                {
+                  label: 'Level two 1-1',
+                  children: [
+                    {
+                      label: 'Level three 1-1-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 2',
+              children: [
+                {
+                  label: 'Level two 2-1',
+                  children: [
+                    {
+                      label: 'Level three 2-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 2-2',
+                  children: [
+                    {
+                      label: 'Level three 2-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 3',
+              children: [
+                {
+                  label: 'Level two 3-1',
+                  children: [
+                    {
+                      label: 'Level three 3-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 3-2',
+                  children: [
+                    {
+                      label: 'Level three 3-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+          ]
+        }, 10)
+      } else {
+        isStrictly.value = true
+        setTimeout(function () {
+          data.value = [
+            {
+              label: 'Level one 1',
+              children: [
+                {
+                  label: 'Level two 1-1',
+                  children: [
+                    {
+                      label: 'Level three 1-1-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 2',
+              children: [
+                {
+                  label: 'Level two 2-1',
+                  children: [
+                    {
+                      label: 'Level three 2-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 2-2',
+                  children: [
+                    {
+                      label: 'Level three 2-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+            {
+              label: 'Level one 3',
+              children: [
+                {
+                  label: 'Level two 3-1',
+                  children: [
+                    {
+                      label: 'Level three 3-1-1',
+                    },
+                  ],
+                },
+                {
+                  label: 'Level two 3-2',
+                  children: [
+                    {
+                      label: 'Level three 3-2-1',
+                    },
+                  ],
+                },
+              ],
+            },
+          ]
+        }, 10)
+      }
+      
 
+    }
     const roleValid = (rule, value, callback) => {
       rule
       if (value.length === 0) {
@@ -173,36 +529,42 @@ export default defineComponent({
       }
     }
 
-    // 保存-修改操作
+    // 保存操作
     const submitForm = () => {
-      form.value.createTime = parseTime(new Date())
-
       formInfo.value.validate((valid) => {
         if (valid) {
-          isDisable.value = true
-           setTimeout(() => {
-                  isDisable.value = false //点击一次时隔两秒后才能再次点击
-                }, 2000)
-          form.value.roleIds = [form.value.roleId] //roleIds 传给后台
+          var aa = form.value
+          if (aa.tenantTerm == 3) {
+            aa.tenantTerm = '永久有效'
+          }
+          if (aa.tenantTerm == 4) {
+            if (!form.value.value1) {
+              ElMessage.warning('请选择日期')
+              return
+            }
+            aa.tenantTerm = form.value.value1
+
+            parseTime
+
+            aa.tenantTerm
+              ? (aa.tenantTerm = parseTime(aa.tenantTerm).substring(0, 10))
+              : ''
+          }
+
           if (props.dialogTitle === '新增') {
-            api.userAdd(form.value).then((requset) => {
+            api.addTenantData(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '新增成功',
                   type: 'success',
                 })
-                setTimeout(() => {
-                  isDisable.value = false //点击一次时隔两秒后才能再次点击
-                }, 2000)
-
                 closeDialog()
               } else {
-                alert(requset.msg)
-                // ElMessage.error(requset.msg)
+                ElMessage.error(requset.msg)
               }
             })
           } else {
-            api.userUpdate(form.value).then((requset) => {
+            api.updateTenantData(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '修改成功',
@@ -221,97 +583,144 @@ export default defineComponent({
       })
     }
 
+    const open = () => {
+      form.value = props.itemInfo
+      console.log('form.value')
+      console.log(form.value)
+
+      optionselect()
+    }
+
+    // 关闭弹框
+    const closeDialog = (flag) => {
+      resetForm()
+      showDialog.value = false
+      emit('closeDialog', flag)
+    }
+
+    function resetForm() {
+      formInfo.value.resetFields()
+    }
+
     //角色下拉请求
     function optionselect() {
-      api.optionselect().then((requset) => {
+      api.getPlatformBoxList().then((requset) => {
         if (requset.status === 'SUCCESS') {
-     
-          roleSelectData.value = requset.data
+          getPlatformBoxList.value = requset.data
         } else {
           ElMessage.error(requset.msg)
         }
       })
     }
 
-    function resetForm() {
-      formInfo.value.resetFields()
-      
-      
-     
-    }
-    function linkChange(){
-
-
-    }
-
-     //监听变化
+    //监听变化
     watch(
-      () => props.siteIdArr,
+      () => checked1.value,
       (newVal) => {
-        alert(1)
-        newVal
-       
-      }
+        console.log(newVal)
+      },
+      { lazy: true }
     )
 
-    onMounted(() => {
-      optionselect()
+    watchEffect((fn, options) => {
+      fn, options
+      showDialog.value = props.show_Dialog
     })
 
+    //禁止选择以前的时间
+    const pickerEndDate = (time) => {
+      const timeRange = 1 * 24 * 60 * 60 * 1000
+      return time.getTime() <= Date.now() - timeRange * 1
+    }
+
+    onMounted(() => {})
+
     return {
-      store,
-      linkChange,
-      closeDialog,
-      dialogVisible,
+      pickerEndDate,
       roleValid,
-      formInfo,
-      form,
-      roleSelectData,
-      open,
       submitForm,
-      resetForm,
-      isDisable,
+      closeDialog,
+      open,
+
+      store,
+      beginTime,
+      showDialog,
+
+      checked: true,
+      form,
+      formInfo,
+      getPlatformBoxList,
+
+      handleNodeClick,
+      data,
+      isExpand,
+      isStrictly,
+      checked1,
+      checked2,
+      checked3,
+      handleExpandChange,
+      handleCheckedChange,
+      handleStrictlyChange,
+
       rules: {
-       
-        nickName: [
-          { required: true, message: '请输入用户名', trigger: 'blur' },
+        tenantName: [
+          { required: true, message: '请输入租户名称', trigger: 'blur' },
           {
-            min: 2,
-
-            message: '用户名长度至少2个字符',
+            min: 1,
+            max: 30,
+            message: '长度在 1 到 30个字符',
             trigger: 'blur',
           },
         ],
-        userName: [
-          { required: true, message: '请输入账号', trigger: 'blur' },
+        tenantManager: [
+          { required: true, message: '请输入租户负责人', trigger: 'blur' },
           {
+            min: 1,
             max: 10,
-            message: '账号最多输入 10 个字符',
+            message: '长度在 1 到 10个字符',
             trigger: 'blur',
           },
         ],
-        sex: [{ required: true, message: '请选择性别', trigger: 'change' }],
-        phonenumber: [
-          { required: true, message: '请输入手机号码', trigger: 'blur' },
+        tenantTerm: [
+          { required: true, message: '请选择有效期限', trigger: 'change' },
+        ],
+        geoPosition: [
+          { required: true, message: '请选输入地理位置', trigger: 'blur' },
+        ],
+
+        tenantType: [
+          { required: true, message: '请输入租户类型', trigger: 'blur' },
+        ],
+        phoneNumber: [
+          {
+            required: true,
+            message: '请输入负责人手机号码',
+            trigger: 'blur',
+          },
           {
             validator: validatorPhone,
             message: '输入的电话号码不正确',
             trigger: 'blur',
           },
         ],
-        createTime: [
-          { required: true, message: '请输入创建时间', trigger: 'blur' },
+        systemName: [
+          { required: true, message: '请选择系统平台', trigger: 'blur' },
         ],
-        roleId: [
-          { required: true, message: '请选择角色名称', trigger: 'blur' },
+        email: [
+          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
+
+          {
+            validator: isEmail,
+            message: '输入的邮箱地址不正确',
+            trigger: 'blur',
+          },
         ],
-         siteId:  [{ required: true, message: '请选择站点', trigger: 'blur' }],
-        password: [
-          { required: true, message: '请输入密码', trigger: 'blur' },
+        address: [
+          { required: true, message: '请输入联系地址', trigger: 'blur' },
           {
-            min: 3,
-            max: 6,
-            message: '长度在 3 到 6 个字符',
+            min: 1,
+            max: 15,
+            message: '长度在 1 到 15个字符',
             trigger: 'blur',
           },
         ],
@@ -323,9 +732,39 @@ export default defineComponent({
  
 <style scoped lang="scss">
 .el-input,
-.el-select {
+.el-select,
+.el-date-editor.el-input,
+.el-date-editor.el-input__inner {
   width: 240px;
 }
+
+.el-form-item {
+  margin: 0 0 20px !important;
+}
+// label样式
+.el-form-item__label {
+  width: 120px !important;
+}
+.el-form-item__content {
+  margin-left: 100px;
+}
+.demo-form-inline .el-form-item:not(.user-layout .el-form-item) {
+  // margin: 0 auto 20px 55px;
+}
+.el-form-item:not(.user-layout .el-form-item) {
+  max-width: 100%;
+}
+.el-tree {
+  border: 1px solid #c0c4cc;
+  padding: 15px;
+}
+
+.aa {
+  ::v-deep .el-form-item--small .el-form-item__label {
+    line-height: 40px !important;
+    // margin-top:10px
+  }
+}
 </style>
-<style lang="scss">
+<style>
 </style>

src/views/tenantManage/authConfig/index.vue

@@ -4,102 +4,179 @@
     <div class="filter-container mb-10">
       <div class="left">
         <div>
-          <span class="" style="margin-right: 30px">权限配置待排版444</span>
-          <el-button :disabled="store.state.authorities.indexOf('新增')==-1" icon="el-icon-plus" type="success" @click="addItem()">
+          <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>
+          </el-button> -->
         </div>
-        <div style="margin-top: 20px">
-          <div class="filter-item">
-            账号：
-            <el-input
-              v-model="userName"
-              placeholder="请输入内容"
-              style="width: 180px"
-               :disabled="store.state.authorities.indexOf('查询')==-1"
-            ></el-input>
-          </div>
-
-          <div class="filter-item">
-            账号状态:
-            <el-select
-              v-model="status"
-              placeholder="请选择"
-              style="width: 150px"
-              clearable
-               :disabled="store.state.authorities.indexOf('查询')==-1"
-            >
-              <el-option label="正常" value="0"></el-option>
-              <el-option label="停用" value="1"></el-option>
-            </el-select>
-          </div>
-
-          <div class="filter-item planOutage">
-            选择时间范围：
-            <el-date-picker
-              v-model="dateTime"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              style="width: auto"
-               :disabled="store.state.authorities.indexOf('查询')==-1"
-            ></el-date-picker>
-          </div>
-          <el-button
-          :disabled="store.state.authorities.indexOf('查询')==-1"
-            type="primary"
-            icon="el-icon-search"
-            class="search-button"
-            @click="list()"
+      </div>
+
+      <div class="right">
+        <el-button type="primary">全部导出</el-button>
+        <el-button
+          type="primary"
+        >
+          导出
+        </el-button>
+
+        <!-- <el-button
+          type="primary"
+          @click="DataReportExport()"
+          :disabled="store.state.authorities.indexOf('导出') == -1"
+        >
+          导出
+        </el-button> -->
+      </div>
+    </div>
+
+    <div class="filter-container mb-10">
+      <div style="margin-top: 20px">
+        <div class="filter-item">
+          租户名称：
+          <el-input
+            v-model="tenantName"
+            placeholder="请输入内容"
+            style="width: 150px"
+            :disabled="store.state.authorities.indexOf('查询') == -1"
+          ></el-input>
+        </div>
+        <div class="filter-item">
+          负责人：
+          <el-input
+            v-model="tenantManager"
+            placeholder="请输入内容"
+            style="width: 150px"
+            :disabled="store.state.authorities.indexOf('查询') == -1"
+          ></el-input>
+        </div>
+        <!-- <div class="filter-item">
+          客户类型:
+          <el-select
+            v-model="tenantType"
+            placeholder="请选择"
+            style="width: 150px"
+            clearable
+            :disabled="store.state.authorities.indexOf('查询') == -1"
           >
-            查询
-          </el-button>
+            <el-option label="试用租户" :value="0"></el-option>
+            <el-option label="正式租户" :value="1"></el-option>
+          </el-select>
         </div>
-      </div>
+        <div class="filter-item">
+          状态:
+          <el-select
+            v-model="status"
+            placeholder="请选择"
+            style="width: 200px"
+            clearable
+            :disabled="store.state.authorities.indexOf('查询') == -1"
+          >
+            <el-option label="正常" :value="0"></el-option>
+            <el-option label="停用" :value="1"></el-option>
+          </el-select>
+        </div>
+
+        <div class="filter-item planOutage">
+          选择时间范围：
+          <el-date-picker
+            v-model="dateTime"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: auto"
+            :disabled="store.state.authorities.indexOf('查询') == -1"
+          ></el-date-picker>
+        </div> -->
 
-      <!-- <div class="right">
-        <el-button type="primary">导出</el-button>
-      </div> -->
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          @click="Select()"
+          class="search-button"
+          :disabled="store.state.authorities.indexOf('查询') == -1"
+        >
+          查询
+        </el-button>
+      </div>
     </div>
+
     <!-- 筛选end -->
 
     <!-- 表格start -->
-    <el-table :data="tableData" border stripe :header-cell-style="headClass">
-      <!-- <el-table-column prop="xh" label="序号" width="70">
+    <el-table
+      :data="tableData"
+      border
+      stripe
+      :header-cell-style="headClass"
+      :cell-style="cellStyle"
+    >
+      <el-table-column type="index" label="序号" width="50px"></el-table-column>
+      <el-table-column
+        prop="tenantName"
+        label="租户名称"
+        min-width="140px"
+      ></el-table-column>
+      <el-table-column
+        prop="tenantManager"
+        label="负责人"
+        min-width="100px"
+      ></el-table-column>
+      <el-table-column
+        prop="phoneNumber"
+        label="负责人手机号"
+        min-width="125px"
+      ></el-table-column>
+      <!-- <el-table-column prop="tenantType" label="客户类型" min-width="80px">
+        <template #default="scope">
+          <span>
+            {{ scope.row.tenantType === '0' ? '使用租户' : '正式租户' }}
+          </span>
+        </template>
       </el-table-column> -->
-      <el-table-column prop="nickName" label="用户名"></el-table-column>
-      <el-table-column prop="userName" label="账号"></el-table-column>
-      <el-table-column prop="sex" label="性别" width="100">
+      <!-- <el-table-column
+        prop="geoPosition"
+        label="地理位置"
+        min-width="160px"
+      ></el-table-column>
+      <el-table-column prop="status" label="状态" width="">
         <template #default="scope">
-          <span>{{ scope.row.sex == 1 ? '男' : '女' }}</span>
+          <span
+            :style="{
+              color: scope.row.status == '0' ? '#8DCF6E' : '#FF747B',
+            }"
+          >
+            {{ scope.row.status === '0' ? '正常' : '停用' }}
+          </span>
         </template>
-      </el-table-column>
-      <el-table-column prop="phonenumber" label="手机号码" min-width="120"></el-table-column>
-      <el-table-column prop="createTime" label="创建时间" min-width="160"></el-table-column>
+      </el-table-column> -->
+
+      <el-table-column
+        prop="platformName"
+        label="系统平台"
+        min-width="140px"
+      ></el-table-column>
       <!-- <el-table-column
-        prop="roles.roleName"
-        label="角色名称"
-       
+        prop="tenantTerm"
+        label="到期时间"
+        min-width="110px"
       ></el-table-column> -->
-      <el-table-column fixed="right" label="操作" width="180">
+      <el-table-column fixed="right" label="操作" >
         <template #default="scope">
           <el-button
-            @click="checkItem(scope.row)"
-            type="text"
-            size="small"
-            class="delete-text"
-          >
-            查看
-          </el-button>
-          <el-button
-          :disabled="store.state.authorities.indexOf('修改')==-1"
             type="text"
             size="small"
             @click.prevent="editRow(scope.row)"
+            :disabled="store.state.authorities.indexOf('配置') == -1"
           >
-            编辑
+            配置
           </el-button>
+          
         </template>
       </el-table-column>
     </el-table>
@@ -108,7 +185,7 @@
     <!-- 分页start -->
     <div class="paginationBlock">
       <el-pagination
-        v-model:currentPage="currentPage"
+        v-model:currentPage="page"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
@@ -123,11 +200,10 @@
 
     <!--弹框组件开始-----------------------start-->
     <dialog-component
-      :dialogTitle="dialogTitle"
-      :itemInfo="tableItem"
+      :dialog-title="dialogTitle"
+      :item-info="tableItem"
       @closeDialog="closeDialog"
-      :flag="showDialog"
-      v-if="tableItem"
+      :show_Dialog="showDialog"
     ></dialog-component>
     <!--弹框组件开始-----------------------end-->
   </div>
@@ -135,186 +211,234 @@
 
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, ref, reactive, onMounted } from 'vue'
-import * as api from '@/api/systemManage/userManage.js'
-import { ElMessage } from 'element-plus'
-
+import { defineComponent, onMounted, ref } from 'vue'
 import DialogComponent from './dialogComponent'
+import * as api from '@/api/tenantManage/tenantUnit.js'
+import { ElMessage } from 'element-plus'
 
 export default defineComponent({
+  name: 'VariableList',
+
   components: { DialogComponent },
   setup() {
     const store = useStore()
-    const total = ref(0)
-    const pageSize = ref(10)
-    const currentPage = ref(1)
 
-    const dateTime = ref('')
-
-    const userName = ref('')
-    const phone = ref('')
-    const status = ref('')
-    const role = ref('')
-    const currentPage4 = ref(4)
+    const tableItem = ref()
     const dialogTitle = ref('')
     const showDialog = ref(false)
-    const tableData = ref([])
-    const siteIdArr=ref([])
 
-    // // 表头样式设置
-    const headClass = () => {
-      return 'background:#FAFAFA;'
-    }
+    const tableData = ref()
+    const currentPage = ref(1)
+    const pageSize = ref(15)
+    const total = ref(0)
 
-    const handleSizeChange = (val) => {
-      pageSize.value = val
-      list()
-    }
-    const handleCurrentChange = (val) => {
-      currentPage.value = val
-      list()
-    }
+    const status = ref('')
+    const tenantType = ref('')
+    const tenantName = ref('')
+    const tenantManager = ref('')
 
-    //用户列表
-    function list() {
-      store.commit('TimeAll_function', dateTime.value)
-      const time = store.state.Time_Data
-      api
-        .list({
-          pageSize: pageSize.value,
-          pageNum: currentPage.value,
-          status: status.value,
-          userName: userName.value,
-          beginTime: time[0],
-          endTime: time[1],
-          // platformAreaName: platformAreaName.value,
-        })
-        .then((requset) => {
-          if (requset.status === 'SUCCESS') {
-            tableData.value = requset.data.rows
-            total.value = requset.data.total
-          } else {
-            ElMessage.error(requset.msg)
-          }
-        })
-    }
+    const dateTime = ref('')
+    const select = ref(1)
+
+    const input = ref('')
+    const region = ref()
 
-    const tableItem = reactive([])
     // 添加操作
     const addItem = () => {
       tableItem.value = {
-        nickName: '',
-        userName: '',
-        sex: '1',
-        phonenumber: '',
-        createTime: '',
-        roleName: '',
-        password: '',
+        tenantName: '',
+        tenantManager: '',
+        tenantTerm: 3,
+        geoPosition: '',
+        tenantType: '',
+        phoneNumber: '',
+        systemName: '',
+        email: '',
+        address: '',
       }
       dialogTitle.value = '新增'
       showDialog.value = true
     }
-
-    // 查看
-    const checkItem = (row) => {
-      siteIdArr.value=[]
+    // 编辑操作
+    const editRow = (row) => {
       console.log(row)
-      api.authRole({}, row.userId).then((requset) => {
-        if (requset.status === 'SUCCESS') {
-          tableItem.value.roleId= requset.data.user.roles[0].roleId
-          var newArray= requset.data.userSite
-           newArray.forEach(function(item){
-             siteIdArr.value.push(item.siteId)
+      tableItem.value = {
+        id:row.id,
+        tenantName: row.tenantName,
+        tenantManager: row.tenantManager,
+        tenantTerm: row.tenantTerm=='永久有效'?3:4,
+        value1:row.tenantTerm,
+        geoPosition: row.geoPosition,
+        tenantType: Number(row.tenantType),
+        phoneNumber: row.phoneNumber,
+        systemName: Number(row.systemName),
+        email: row.email,
+        address: row.address,
+        remark:row.remark
+      }
+      dialogTitle.value = '配置'
+      showDialog.value = true
+    }
+
+    // 关闭操作
+    const closeDialog = (flag) => {
+      if (flag) {
+        // 重新刷新表格内容
+        // this.fetchData()
+        console.log(1)
+      }
+      showDialog.value = false
+      Select()
+    }
 
-           })
-           tableItem.value.siteId= siteIdArr.value
+    //删除 是否删除  ---- 是
+    const handleDelete = (row) => {
+      api.plannedOutageDel({ id: row.id }).then((requset) => {
+        if (requset.status === 'SUCCESS') {
+          ElMessage.success({
+            message: '删除成功',
+            type: 'success',
+          })
+          Select()
         } else {
           ElMessage.error(requset.msg)
         }
       })
-      tableItem.value = row
-      dialogTitle.value = '查看'
-      showDialog.value = true
+    }
+    //是否删除  ---- 否
+    const cancelEvent = () => {
+      console.log('cancel!')
     }
 
-    // 编辑操作
-    const editRow = (row) => {
-      siteIdArr.value=[]
-      console.log(row)
-      api.authRole({}, row.userId).then((requset) => {
-        if (requset.status === 'SUCCESS') {
-          tableItem.value.roleId= requset.data.user.roles[0].roleId
+    //查询设备列表
+    function Select() {
+      store.commit('TimeAll_function', dateTime.value)
+      // const time = store.state.Time_Data
+      api
+        .getTenantData({
+          size: pageSize.value,
+          page: currentPage.value,
+          // startTime: time[0] ? time[0] : '',
+          // endTime: time[1] ? time[1] : '',
+          // status: status.value,
+          // tenantType: tenantType.value,
+          tenantName: tenantName.value,
+          tenantManager: tenantManager.value,
+        })
+        .then((requset) => {
+          if (requset.status === 'SUCCESS') {
+            tableData.value = requset.data.records.map((val) => {
+              store.commit('getTimestampAll', val.startTime)
+              val.startTime = store.state.timeProcessing
+              store.commit('getTimestampAll', val.endTime)
+              val.endTime = store.state.timeProcessing
+              store.commit('getTimestampAll', val.createTime)
+              val.createTime = store.state.timeProcessing
+            })
+            tableData.value = requset.data.records
+            total.value = requset.data.total
+          } else {
+            ElMessage.error(requset.msg)
+          }
+        })
+    }
 
-           var newArray= requset.data.userSite
-           newArray.forEach(function(item){
-             siteIdArr.value.push(item.siteId)
+    onMounted(() => {
+      Select()
+    })
 
-           })
-           tableItem.value.siteId= siteIdArr.value
-            
-        } else {
-          ElMessage.error(requset.msg)
-        }
+    const handleSizeChange = (val) => {
+      pageSize.value = val
+      Select()
+    }
+    const handleCurrentChange = (val) => {
+      currentPage.value = val
+      Select()
+    }
+    // 表头样式设置
+    const goVariableList = () => {
+      // 跳转至订单列表页面传参
+      this.$router.push({
+        path: '../siteManage/variableList/index.vue',
       })
+      // this.$router.push({ name:'variableList'})
+    }
+    const headClass = () => {
+      return 'background:#FAFAFA;'
+    }
+    //处理状态状态值变色
+    const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
+      row, column, rowIndex
+      // console.log(row, column, rowIndex)
 
-
-      // tableItem.value = row
-      tableItem.value={
-        nickName:row.nickName,
-        userName:row.userName,
-        sex:row.sex,
-        phonenumber:row.phonenumber,
-        password:row.password,
-        createTime:row.createTime,
-        roleId:row.roleId,
-        userId:row.userId
+      if (columnIndex) {
+        // return `text-align:left;cursor:pointer;`
+      } else {
+        return ''
       }
-
-      dialogTitle.value = '编辑'
-      showDialog.value = true
     }
 
-    // 关闭操作
-    const closeDialog = () => {
-      showDialog.value = false
-      
-      list()
+    //导出
+    const DataReportExport = () => {
+      store.commit('TimeAll_function', dateTime.value)
+      const time = store.state.Time_Data
+      api
+        .outagePlanListExport({
+          type: region.value,
+          startTime: time[0] ? time[0] : '',
+          endTime: time[1] ? time[1] : '',
+        })
+        .then((requset) => {
+          if (requset.status === 'SUCCESS') {
+            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            ElMessage.success({
+              message: '导出成功',
+              type: 'success',
+            })
+          } else {
+            ElMessage.error(requset.msg)
+          }
+        })
     }
+    return {
+      cellStyle,
+      headClass,
+      goVariableList,
 
-    onMounted(() => {
-      list()
-    })
+      handleDelete,
+      cancelEvent,
+      closeDialog,
+      editRow,
+      addItem,
+      Select,
+
+      store,
 
-    return {
-      userName,
-      phone,
-      status,
-      role,
-      tableItem,
-      currentPage4,
-      dialogTitle,
-      showDialog,
-      tableData,
       total,
       pageSize,
       currentPage,
-
-      dateTime,
-      store,
-      siteIdArr,
-      list,
       handleSizeChange,
       handleCurrentChange,
-      headClass,
-      checkItem,
-      addItem,
-      editRow,
-      closeDialog,
+
+      tenantType,
+      tableData,
+      tenantName,
+      tenantManager,
+      status,
+
+      showDialog,
+      select,
+      dateTime,
+      tableItem,
+      dialogTitle,
+      input,
+      region,
+
+      DataReportExport,
     }
   },
 })
 </script>
 
-
 <style lang="scss" scoped>
 </style>

src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -26,6 +26,23 @@
               </el-form-item>
               <el-form-item label="主页logo:" prop="homeLogo">
                 <el-input v-model="form.homeLogo"></el-input>
+                <el-upload
+                  ref="upload"
+                  class="upload-demo"
+                  :action="uploadUrl"
+                  :on-success="handleUpAvatar"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                  :auto-upload="false"
+                  :headers="{ accessToken: [accessToken] }"
+                >
+                  <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="homePageUrl">
@@ -130,7 +147,7 @@
 </template>
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, ref, watchEffect, onMounted } from 'vue'
+import { defineComponent, ref, watchEffect, onMounted ,reactive,toRefs} from 'vue'
 import * as api from '@/api/tenantManage/systemConfig.js'
 import { ElMessage } from 'element-plus'
 // import { parseTime } from '@/utils'
@@ -156,11 +173,21 @@ export default defineComponent({
     const form = ref({})
     const formInfo = ref(null)
     const value = ref(true)
+    const accessToken = ref(store.state.user.accessToken)
 
     const activeName = ref('first')
 
     const getPlatformBoxList = ref([])
 
+    const dataSet = reactive({
+      uploadUrl:
+        window.PLATFROM_CONFIG.baseUrl +
+        '/patrolInspectionDevice/pictureUpload',
+      // uploadUrl:'https://wx.ewoogi.com/USKYOF/USKYOF.php/Home/MonitoringReporting/setUpload',
+      fileList: [],
+    })
+
+
     const roleValid = (rule, value, callback) => {
       rule
       if (value.length === 0) {
@@ -169,13 +196,21 @@ export default defineComponent({
         callback()
       }
     }
+    const handleExceed=()=>{
+      alert('只能上传一张')
+    }
+
+    //上传成功的回调
+    function handleUpAvatar(res) {
+      alert(1)
+      console.log(res)
+    }
 
     // 保存操作
     const submitForm = () => {
-
       formInfo.value.validate((valid) => {
         if (valid) {
-          form.value.tenantId=props.itemInfo.tenantId
+          form.value.tenantId = props.itemInfo.tenantId
           if (props.configStatus) {
             alert('已配置修改提交')
             api.updaMiddleConfig(form.value).then((requset) => {
@@ -190,7 +225,7 @@ export default defineComponent({
               }
             })
           } else {
-             alert('未配置新增提交')
+            alert('未配置新增提交')
             api.addMiddleConfig(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
@@ -258,6 +293,8 @@ export default defineComponent({
     onMounted(() => {})
 
     return {
+
+      ...toRefs(dataSet),
       pickerEndDate,
       roleValid,
       submitForm,
@@ -275,27 +312,29 @@ export default defineComponent({
 
       activeName,
       value,
+      handleExceed,
+      handleUpAvatar,
+      accessToken,
 
       rules: {
-          middleTitle: [
-            { required: true, message: '请输入主页标题', trigger: 'blur' },
-            {
-              min: 1,
-              max: 30,
-              message: '长度在 1 到 30个字符',
-              trigger: 'blur',
-            },
-          ],
-          homeLogo: [
-            { required: true, message: '请输入主页logo', trigger: 'blur' },
-           
-          ],
-          homePageUrl: [
-            { required: true, message: '请输入主页请求地址', trigger: 'blur' },
-          ],
-          homeLayout: [
-            { required: true, message: '请选则主页导航布局', trigger: 'change' },
-          ],
+        middleTitle: [
+          { required: true, message: '请输入主页标题', trigger: 'blur' },
+          {
+            min: 1,
+            max: 30,
+            message: '长度在 1 到 30个字符',
+            trigger: 'blur',
+          },
+        ],
+        homeLogo: [
+          { required: true, message: '请输入主页logo', trigger: 'blur' },
+        ],
+        homePageUrl: [
+          { required: true, message: '请输入主页请求地址', trigger: 'blur' },
+        ],
+        homeLayout: [
+          { required: true, message: '请选则主页导航布局', trigger: 'change' },
+        ],
       },
     }
   },
@@ -337,6 +376,11 @@ export default defineComponent({
 .demo-form-inline .el-form-item:not(.user-layout .el-form-item) {
   // margin: 0 auto 20px 55px;
 }
+
+.el-upload__tip {
+  margin-left: 10px;
+  display: inline-block;
+}
 </style>
 <style>
 .systemCard .el-dialog__body {

src/views/tenantManage/tenantUnit/dialogComponent.vue

@@ -85,9 +85,9 @@
 
       <el-form-item label="">
         <div
-          style="width: 670px; height: 130px; background: rgba(0, 0, 0, 0.2)"
+          style="width: 670px; height: 130px; background: rgba(0, 0, 0, 0.2);text-align:center"
         >
-          地图
+          地图api待接入
         </div>
       </el-form-item>
       <el-form-item label="备注:" prop="remark">