Browse Source

统计管理

ming 3 years ago
parent
commit
3bb086efb6

+ 19 - 2
src/vab/plugins/permissions.js

@@ -5,6 +5,7 @@
 import router from '@/router'
 import store from '@/store'
 import getPageTitle from '@/utils/pageTitle'
+// import * as api from '@/api/publicList'
 import {
     authentication,
     loginInterception,
@@ -65,17 +66,33 @@ router.beforeEach(async(to, from, next) => {
                     console.log('accessRoutes')
                     console.log(accessRoutes)
 
-                    store.commit('getMiddleConfig')
+                    // api.getMiddleConfig().then((requset) => {
+                    //     if (requset.status === 'SUCCESS') {
+                    //         store.state.middleStatus = requset.data[0].middleStatus;
+                    //         if (store.state.middleStatus == 1) {
+                    //             next('/middle')
+                    //         } else {
+                    //             next(accessRoutes[0].children[0].path)
+                    //         }
+                    //     } else {
+                    //         console.log(111)
+                    //     }
+                    // })
 
-                    // alert('判断是否显示中间页的middleStatus值' + store.state.middleStatus)
 
 
+                    store.commit('getMiddleConfig')
+                        // alert('判断是否显示中间页的middleStatus值' + store.state.middleStatus)
                     if (store.state.middleStatus == 1) {
                         next('/middle')
                     } else {
                         next(accessRoutes[0].children[0].path)
                     }
 
+
+
+
+
                     // if (accessRoutes[1].path != '/') {
 
                     //     next('/middle')

+ 5 - 24
src/views/platManage/dialogComponent.vue

@@ -3,17 +3,14 @@
     :title="dialogTitle"
     v-model="showDialog"
     @open="open()"
-   
-  
     @close="closeDialog(0)"
   >
     <el-form
       ref="formInfo"
       :model="form"
-      class="demo-form-inline  aaa"
+      class="demo-form-inline aaa"
       label-width="150px"
       :rules="rules"
-
     >
       <el-form-item
         label="平台名称:"
@@ -30,7 +27,6 @@
           @node-click="handleNodeClick"
           show-checkbox
           node-key="id"
-          default-expand-all	
           :default-checked-keys="checkedArr"
           :check-strictly="isStrictly"
           @check="currentChecked"
@@ -94,10 +90,9 @@ export default defineComponent({
 
     const currentChecked = (nodeObj, SelectedObj) => {
       nodeObj, SelectedObj
-       console.log('SelectedObj.checkedNodes')
+      console.log('SelectedObj.checkedNodes')
       console.log(SelectedObj.checkedNodes)
       checkedArr.value = []
- 
 
       SelectedObj.checkedNodes.forEach((item) => {
         checkedArr.value.push(item.id)
@@ -164,12 +159,13 @@ export default defineComponent({
                   message: '新增成功',
                   type: 'success',
                 })
-                closeDialog()
+                showDialog.value = false
+                // closeDialog()
               } else {
                 ElMessage.error(requset.msg)
               }
             })
-          }else{
+          } else {
             ElMessage.warning('请至少选择一个权限保存')
           }
         } else {
@@ -251,7 +247,6 @@ export default defineComponent({
       beginTime,
       showDialog,
       checkedArr,
-
       initMap,
       nowDate,
       disabledDate,
@@ -273,7 +268,6 @@ export default defineComponent({
             trigger: 'blur',
           },
         ],
-        
       },
     }
   },
@@ -301,16 +295,8 @@ export default defineComponent({
 .demo-form-inline .el-form-item:not(.user-layout .el-form-item) {
   margin: 0 auto 20px 55px;
 }
-
-
-
-
-
-
-
 </style>
 <style lang="scss">
-
 // .aaa{
 
 //   .el-form-item:not(.user-layout .el-form-item){
@@ -328,9 +314,4 @@ export default defineComponent({
 // }
 
 // }
-  
-  
-
-
-
 </style>

+ 61 - 11
src/views/statisManage/loginLog/index.vue

@@ -4,7 +4,7 @@
     <div class="filter-container mb-10">
       <div class="left">
         <div>
-          <a class="" style="margin-right: 30px">登录日志列表待排版</a>
+          <a class="" style="margin-right: 30px">登录日志列表</a>
           <!-- <el-button
             icon="el-icon-plus"
             type="success"
@@ -19,13 +19,34 @@
     <div class="filter-container mb-10">
       <div style="margin-top: 20px">
         <div class="filter-item">
-          平台名称
+          登录地址
           <el-input
             v-model="platformName"
-            placeholder="请输入内容"
+            placeholder="请输入"
             style="width: 150px"
           ></el-input>
         </div>
+        <div class="filter-item">
+          用户名称/账号:
+          <el-input
+            v-model="platformName"
+            placeholder="请输入"
+            style="width: 150px"
+          ></el-input>
+        </div>
+        <div class="filter-item">
+          登录状态:
+          <el-select
+            v-model="status"
+            placeholder="请选择"
+            style="width: 130px"
+            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">
@@ -61,23 +82,53 @@
       :header-cell-style="headClass"
       :cell-style="cellStyle"
     >
-      <el-table-column type="index" label="序号" width="50px"></el-table-column>
+      <!-- <el-table-column type="index" label="序号" width="50px"></el-table-column> -->
+      <el-table-column
+        prop="tenantCount"
+        label="访问编号"
+      ></el-table-column>
       <el-table-column
-        prop="platformName"
-        label="平台名称"
+        prop="tenantCount"
+        label="用户名称"
+      ></el-table-column>
+      <el-table-column
+        prop="tenantCount"
+        label="账号"
+      ></el-table-column>
+      <el-table-column
+        prop="tenantCount"
+        label="登录地址"
+      ></el-table-column>
+      <el-table-column
+        prop="tenantCount"
+        label="登录地点"
+      ></el-table-column>
+      <el-table-column
+        prop="tenantCount"
+        label="浏览器"
+      ></el-table-column>
+      <el-table-column
+        prop="tenantCount"
+        label="操作系统"
+      ></el-table-column>
+      <el-table-column
+        prop="tenantCount"
+        label="登录状态"
       ></el-table-column>
       <el-table-column
         prop="tenantCount"
-        label="在用租户数"
+        label="操作信息"
+        
       ></el-table-column>
       <el-table-column
         prop="createTime"
-        label="创建时间"
+        label="登录时间"
+       width="170px"
       ></el-table-column>
      
 
   
-      <el-table-column fixed="right" label="操作" width="80">
+      <!-- <el-table-column fixed="right" label="操作" width="80">
         <template #default="scope">
           <el-button
             type="text"
@@ -86,9 +137,8 @@
           >
             编辑
           </el-button>
-          
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <!-- 表格end -->
 

+ 195 - 98
src/views/statisManage/operLog/dialogComponent.vue

@@ -2,6 +2,7 @@
   <el-dialog
     :title="dialogTitle"
     v-model="showDialog"
+    width="900px"
     @open="open()"
     @close="closeDialog(0)"
   >
@@ -12,28 +13,87 @@
       label-width="150px"
       :rules="rules"
     >
-      <el-form-item
-        label="平台名称:"
-        prop="platformName"
-        v-if="dialogTitle == '添加模板'"
-      >
-        <el-input v-model="form.platformName"></el-input>
+      <el-row>
+        <el-col :span="12" :gutter="20">
+          <el-form-item label="操作模块:" prop="tenantName">
+            <el-input v-model="form.tenantName"></el-input>
+          </el-form-item>
+          <el-form-item label="登录信息:" prop="tenantManager">
+            <el-input v-model="form.tenantManager"></el-input>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="12" :gutter="20">
+           <el-form-item label="请求地址:" prop="phoneNumber">
+            <el-input v-model="form.phoneNumber"></el-input>
+          </el-form-item>
+           <el-form-item label="请求方法:" prop="address">
+            <el-input v-model="form.address"></el-input>
+          </el-form-item>
+          
+         
+        </el-col>
+      </el-row>
+
+    
+      <el-form-item label="操作方法:" prop="remark">
+        <el-input
+          v-model="form.remark"
+          type="text"
+          placeholder="请输入..."
+          style="width: 670px"
+        />
+      </el-form-item>
+      <el-form-item label="请求参数:" prop="remark">
+        <el-input
+          v-model="form.remark"
+          type="text"
+          placeholder="请输入..."
+          style="width: 670px"
+        />
       </el-form-item>
-      <el-form-item label="" prop="aa">
-        <el-tree
-          v-if="data.length"
-          :data="data"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-          show-checkbox
-          node-key="id"
-          :default-expand-all="isExpand"
-          :default-checked-keys="checkedArr"
-          :check-strictly="isStrictly"
-          @check="currentChecked"
+      <el-form-item label="返回参数:" prop="remark">
+        <el-input
+          v-model="form.remark"
+          type="text"
+          placeholder="请输入..."
+          style="width: 670px"
         />
       </el-form-item>
 
+      <el-row>
+        <el-col :span="12" :gutter="20">
+          <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-col>
+        <el-col :span="12" :gutter="20">
+           <el-form-item label="操作时间:" prop="phoneNumber">
+            <el-input v-model="form.phoneNumber"></el-input>
+          </el-form-item>
+          <!-- <el-form-item label="有效期限:" prop="tenantTerm">
+            <el-radio-group v-model="form.tenantTerm">
+              <el-radio :label="3" value="3">2090-01-01</el-radio>
+              <el-radio :label="4" value="4">
+                <el-date-picker
+                  :min-time="nowDate"
+                  v-model="form.value1"
+                  :disabled-date="disabledDate"
+                  type="date"
+                  placeholder="请选择日期"
+                />
+              </el-radio>
+            </el-radio-group>
+          </el-form-item> -->
+          
+        </el-col>
+      </el-row>
+     
+
       <br />
 
       <div style="text-align: right">
@@ -48,8 +108,10 @@
 import AMap from 'AMap'
 import { useStore } from 'vuex'
 import { defineComponent, ref, watchEffect, onMounted } from 'vue'
-import * as api from '@/api/platManage/index.js'
+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',
@@ -72,8 +134,6 @@ export default defineComponent({
     const formInfo = ref(null)
     const nowDate = ref(new Date().getTime())
 
-    const data = ref([])
-    const checkedArr = ref([])
     const getPlatformBoxList = ref([])
 
     const roleValid = (rule, value, callback) => {
@@ -89,73 +149,30 @@ export default defineComponent({
       return time.getTime() < Date.now()
     }
 
-    const currentChecked = (nodeObj, SelectedObj) => {
-      nodeObj, SelectedObj
-       console.log('SelectedObj.checkedNodes')
-      console.log(SelectedObj.checkedNodes)
-      checkedArr.value = []
- 
-
-      SelectedObj.checkedNodes.forEach((item) => {
-        checkedArr.value.push(item.id)
-      })
-      console.log(checkedArr.value)
-    }
-
-    //树结构回显
-    function getPlatformMenu() {
-      var platformId = ''
-      if (props.dialogTitle == '添加模板') {
-        platformId = 0
-      } else {
-        platformId = form.value.id
-      }
-
-      api
-        .getPlatformMenu({
-          platformId: platformId,
-        })
-        .then((requset) => {
-          if (requset.status === 'SUCCESS') {
-            console.log('requset.data111')
-            console.log(requset.data)
-            var jsona = JSON.stringify(requset.data.menus)
-            var jsonb = jsona.replace(/"menu"/g, '"label"')
-            jsonb = jsonb.replace(/"authority"/g, '"children"')
-            jsonb = jsonb.replace(/"name"/g, '"label"')
-            var jsonc = JSON.parse(jsonb)
-            data.value = jsonc
-            console.log('data.value')
-            console.log(data.value)
-
-            checkedArr.value = requset.data.checkedKeys
-            console.log('checkedArr.value')
-            console.log(checkedArr.value)
-          } else {
-            ElMessage.error(requset.msg)
-          }
-        })
-    }
-
     // 保存操作
     const submitForm = () => {
       formInfo.value.validate((valid) => {
         if (valid) {
-          var params = {}
-          if (props.dialogTitle == '添加模板') {
-            params = {
-              platformId: 0,
-              platformName: form.value.platformName,
-              menuIds: checkedArr.value,
-            }
-          } else {
-            params = {
-              platformId: form.value.id,
-              menuIds: checkedArr.value,
+          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 (checkedArr.value.length) {
-            api.updatePlatformMenu(params).then((requset) => {
+
+          if (props.dialogTitle === '新增') {
+            api.addTenantData(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '新增成功',
@@ -166,8 +183,18 @@ export default defineComponent({
                 ElMessage.error(requset.msg)
               }
             })
-          }else{
-            ElMessage.warning('请至少选择一个权限保存')
+          } else {
+            api.updateTenantData(form.value).then((requset) => {
+              if (requset.status === 'SUCCESS') {
+                ElMessage.success({
+                  message: '修改成功',
+                  type: 'success',
+                })
+                closeDialog()
+              } else {
+                ElMessage.error(requset.msg)
+              }
+            })
           }
         } else {
           console.log('error submit!!')
@@ -186,7 +213,7 @@ export default defineComponent({
 
       var marker = new AMap.Marker({})
       map.on('click', function (e) {
-        form.value.geoPosition = e.lnglat.getLng() + ',' + e.lnglat.getLat()
+                form.value.geoPosition = e.lnglat.getLng() + ',' + e.lnglat.getLat()
 
         map.remove([marker])
         marker = new AMap.Marker({
@@ -194,22 +221,26 @@ export default defineComponent({
         })
 
         map.add([marker])
+
       })
       // AMap end
     }
 
     const open = () => {
+      // initMap()
+      setTimeout(function () {
+        initMap()
+      }, 10)
+
       form.value = props.itemInfo
       console.log('form.value')
       console.log(form.value)
 
-      // optionselect()
-      getPlatformMenu()
+      optionselect()
     }
 
     // 关闭弹框
     const closeDialog = (flag) => {
-      checkedArr.value = []
       resetForm()
       showDialog.value = false
       emit('closeDialog', flag)
@@ -219,6 +250,17 @@ export default defineComponent({
       formInfo.value.resetFields()
     }
 
+    //角色下拉请求
+    function optionselect() {
+      api.getPlatformBoxList().then((requset) => {
+        if (requset.status === 'SUCCESS') {
+          getPlatformBoxList.value = requset.data
+        } else {
+          ElMessage.error(requset.msg)
+        }
+      })
+    }
+
     watchEffect((fn, options) => {
       fn, options
       showDialog.value = props.show_Dialog
@@ -239,15 +281,10 @@ export default defineComponent({
       closeDialog,
       open,
 
-      data,
-
-      getPlatformMenu,
-
       // map123,
       store,
       beginTime,
       showDialog,
-      checkedArr,
 
       initMap,
       nowDate,
@@ -258,11 +295,63 @@ export default defineComponent({
       form,
       formInfo,
       getPlatformBoxList,
-      currentChecked,
 
       rules: {
-        platformName: [
-          { required: true, message: '请输入平台名称', trigger: 'blur' },
+        tenantName: [
+          { required: true, message: '请输入租户名称', trigger: 'blur' },
+          {
+            min: 1,
+            max: 30,
+            message: '长度在 1 到 30个字符',
+            trigger: 'blur',
+          },
+        ],
+        tenantManager: [
+          { required: true, message: '请输入租户负责人', trigger: 'blur' },
+          {
+            min: 1,
+            max: 10,
+            message: '长度在 1 到 10个字符',
+            trigger: 'blur',
+          },
+        ],
+        tenantTerm: [
+          { required: true, message: '请选择有效期限', trigger: 'change' },
+        ],
+        status: [{ 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',
+          },
+        ],
+        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: 30,
@@ -270,7 +359,15 @@ export default defineComponent({
             trigger: 'blur',
           },
         ],
-        
+        domain: [
+          { required: true, message: '请输入域名地址', trigger: 'blur' },
+          {
+            min: 1,
+            max: 250,
+            message: '长度在 1 到 250个字符',
+            trigger: 'blur',
+          },
+        ],
       },
     }
   },
@@ -296,7 +393,7 @@ export default defineComponent({
   margin-left: 100px;
 }
 .demo-form-inline .el-form-item:not(.user-layout .el-form-item) {
-  margin: 0 auto 20px 55px;
+  // margin: 0 auto 20px 55px;
 }
 </style>
 <style>

+ 148 - 36
src/views/statisManage/operLog/index.vue

@@ -4,29 +4,78 @@
     <div class="filter-container mb-10">
       <div class="left">
         <div>
-          <a class="" style="margin-right: 30px">操作日志列表待排版</a>
+          <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>
+
+      <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="platformName"
-            placeholder="请输入内容"
+            v-model="tenantName"
+            placeholder="请输入"
             style="width: 150px"
           ></el-input>
         </div>
-       
+        <div class="filter-item">
+          操作人员/账号:
+          <el-input
+            v-model="tenantManager"
+            placeholder="请输入"
+            style="width: 150px"
+          ></el-input>
+        </div>
+        <div class="filter-item">
+          操作类别:
+          <el-select
+            v-model="tenantType"
+            placeholder="请选择"
+            style="width: 150px"
+            clearable
+          >
+            <el-option label="类别1" :value="0"></el-option>
+            <el-option label="类别2" :value="1"></el-option>
+          </el-select>
+        </div>
+        <div class="filter-item">
+          操作状态:
+          <el-select
+            v-model="status"
+            placeholder="请选择"
+            style="width: 200px"
+            clearable
+          >
+            <el-option label="正常" :value="0"></el-option>
+            <el-option label="停用" :value="1"></el-option>
+          </el-select>
+        </div>
 
         <div class="filter-item planOutage">
           选择时间范围:
@@ -61,22 +110,85 @@
       :header-cell-style="headClass"
       :cell-style="cellStyle"
     >
-      <el-table-column type="index" label="序号" width="50px"></el-table-column>
+      <!-- <el-table-column type="index" label="序号" width="50px"></el-table-column> -->
       <el-table-column
-        prop="platformName"
-        label="平台名称"
+        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="tenantCount"
-        label="在用租户数"
+        prop="geoPosition"
+        label="请求方式"
+        min-width="160px"
       ></el-table-column>
       <el-table-column
-        prop="createTime"
-        label="创建时间"
+        prop="platformName"
+        label="操作人员"
+        min-width="140px"
       ></el-table-column>
+      <el-table-column prop="tenantType" label="操作账号" min-width="150px">
+       
+      </el-table-column>
+      <el-table-column
+        prop="tenantTerm"
+        label="操作地址"
+        min-width="110px"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="tenantTerm"
+        label="操作地点"
+        min-width="110px"
+      >
+      </el-table-column>
+      
      
 
-  
+      
+      
+
+       <el-table-column prop="status" label="操作状态" width="">
+        <template #default="scope">
+          <span
+            :style="{
+              color: scope.row.status == '0' ? '#8DCF6E' : '#FF747B',
+            }"
+          >
+            {{ scope.row.status === '0' ? '正常' : '停用' }}
+          </span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="tenantTerm"
+        label="操作业务"
+        min-width="110px"
+      >
+      </el-table-column>
+
+      <el-table-column
+        prop="tenantTerm"
+        label="IP"
+        min-width="110px"
+      >
+      </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
@@ -84,7 +196,7 @@
             size="small"
             @click.prevent="editRow(scope.row)"
           >
-            编辑
+            详情
           </el-button>
           
         </template>
@@ -123,7 +235,7 @@
 import { useStore } from 'vuex'
 import { defineComponent, onMounted, ref } from 'vue'
 import DialogComponent from './dialogComponent'
-import * as api from '@/api/platManage/index.js'
+import * as api from '@/api/tenantManage/tenantUnit.js'
 import { ElMessage } from 'element-plus'
 
 export default defineComponent({
@@ -143,9 +255,9 @@ export default defineComponent({
     const total = ref(0)
 
     const status = ref(0)
-    const createTime = ref('')
-    const platformName = ref('')
-    const tenantCount = ref('')
+    const tenantType = ref('')
+    const tenantName = ref('')
+    const tenantManager = ref('')
 
     const dateTime = ref('')
     const select = ref(1)
@@ -156,11 +268,11 @@ export default defineComponent({
     // 添加操作
     const addItem = () => {
       tableItem.value = {
-        platformName: '',
-        tenantCount: '',
+        tenantName: '',
+        tenantManager: '',
         tenantTerm: 3,
         geoPosition: '',
-        createTime: '',
+        tenantType: '',
         phoneNumber: '',
         systemName: '',
         email: '',
@@ -168,7 +280,7 @@ export default defineComponent({
         status:0,
         domain:''
       }
-      dialogTitle.value = '添加模板'
+      dialogTitle.value = '新增'
       showDialog.value = true
     }
     // 编辑操作
@@ -176,13 +288,13 @@ export default defineComponent({
       console.log(row)
       tableItem.value = {
         id:row.id,
-        platformName: row.platformName,
-        tenantCount: row.tenantCount,
+        tenantName: row.tenantName,
+        tenantManager: row.tenantManager,
         tenantTerm: row.tenantTerm=='永久有效'?3:4,
         value1:row.tenantTerm,
         status: Number(row.status),
         geoPosition: row.geoPosition,
-        createTime: Number(row.createTime),
+        tenantType: Number(row.tenantType),
         phoneNumber: row.phoneNumber,
         systemName: Number(row.systemName),
         email: row.email,
@@ -190,7 +302,7 @@ export default defineComponent({
         remark:row.remark,
         domain:row.domain
       }
-      dialogTitle.value = '编辑'
+      dialogTitle.value = '操作日志详情'
       showDialog.value = true
     }
 
@@ -224,20 +336,20 @@ export default defineComponent({
       console.log('cancel!')
     }
 
-    //查询列表
+    //查询设备列表
     function Select() {
       store.commit('TimeAll_function', dateTime.value)
       const time = store.state.Time_Data
       api
-        .getPlatformList({
+        .getTenantData({
           size: pageSize.value,
           page: currentPage.value,
           startTime: time[0] ? time[0] : '',
           endTime: time[1] ? time[1] : '',
-          // status: status.value,
-          // createTime: createTime.value,
-          platformName: platformName.value,
-          // tenantCount: tenantCount.value,
+          status: status.value,
+          tenantType: tenantType.value,
+          tenantName: tenantName.value,
+          tenantManager: tenantManager.value,
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
@@ -334,10 +446,10 @@ export default defineComponent({
       handleSizeChange,
       handleCurrentChange,
 
-      createTime,
+      tenantType,
       tableData,
-      platformName,
-      tenantCount,
+      tenantName,
+      tenantManager,
       status,
 
       showDialog,