-

public/static/config.js

@@ -3,6 +3,11 @@ var PLATFROM_CONFIG = {};
 // PLATFROM_CONFIG.baseUrl = "http://172.16.120.104:8010/" //杨强本地
 // PLATFROM_CONFIG.baseUrl = "http://172.16.1.196:8010/" //超博本地
 
+// let aUrl = window.location.host
+// let arrUrl = aUrl.split(':')
+
+// alert(arrUrl[0])
+
 PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/uskypower/" //线上--->测试
 PLATFROM_CONFIG.images = "https://qhome.usky.cn/uskyfile/" //线上图片--->测试
 PLATFROM_CONFIG.fileUrl = "https://qhome.usky.cn/uskyfile/" //xlsx文件访问路径--->测试

src/views/statisManage/operLog/dialogComponent.vue

@@ -15,48 +15,46 @@
     >
       <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 label="操作模块:" prop="title">
+            <el-input v-model="form.title"></el-input>
           </el-form-item>
-          <el-form-item label="登录信息:" prop="tenantManager">
+          <!-- <el-form-item label="登录信息:" prop="tenantManager">
             <el-input v-model="form.tenantManager"></el-input>
+          </el-form-item> -->
+            <el-form-item label="请求方法:" prop="requestMethod">
+            <el-input v-model="form.requestMethod"></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 label="请求地址:" prop="operUrl">
+            <el-input v-model="form.operUrl"></el-input>
           </el-form-item>
+         
           
          
         </el-col>
       </el-row>
 
     
-      <el-form-item label="操作方法:" prop="remark">
+      <el-form-item label="操作方法:" prop="method">
         <el-input
-          v-model="form.remark"
+          v-model="form.method"
           type="text"
-          placeholder="请输入..."
           style="width: 670px"
         />
       </el-form-item>
-      <el-form-item label="请求参数:" prop="remark">
+      <el-form-item label="请求参数:" prop="operParam">
         <el-input
-          v-model="form.remark"
+          v-model="form.operParam"
           type="text"
-          placeholder="请输入..."
           style="width: 670px"
         />
       </el-form-item>
-      <el-form-item label="返回参数:" prop="remark">
+      <el-form-item label="返回参数:" prop="jsonResult">
         <el-input
-          v-model="form.remark"
+          v-model="form.jsonResult"
           type="text"
-          placeholder="请输入..."
           style="width: 670px"
         />
       </el-form-item>
@@ -66,14 +64,14 @@
           <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-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 label="操作时间:" prop="operTime">
+            <el-input v-model="form.operTime"></el-input>
           </el-form-item>
           <!-- <el-form-item label="有效期限:" prop="tenantTerm">
             <el-radio-group v-model="form.tenantTerm">
@@ -97,21 +95,20 @@
       <br />
 
       <div style="text-align: right">
-        <el-button @click="closeDialog(0)">取消</el-button>
-        <el-button type="primary" @click="submitForm()">保存</el-button>
+        <el-button @click="closeDialog(0)">关闭</el-button>
       </div>
     </el-form>
   </el-dialog>
 </template>
 <script>
 // 地图
-import AMap from 'AMap'
+// import AMap from 'AMap'
 import { useStore } from 'vuex'
 import { defineComponent, ref, watchEffect, onMounted } from 'vue'
-import * as api from '@/api/tenantManage/tenantUnit.js'
-import { ElMessage } from 'element-plus'
+// import * as api from '@/api/tenantManage/tenantUnit.js'
+// import { ElMessage } from 'element-plus'
 // import { parseTime } from '@/utils'
-import { validatorPhone, parseTime, isEmail } from '@/utils'
+// import { validatorPhone, parseTime, isEmail } from '@/utils'
 
 export default defineComponent({
   name: 'DialogComponent',
@@ -149,94 +146,13 @@ export default defineComponent({
       return time.getTime() < Date.now()
     }
 
-    // 保存操作
-    const submitForm = () => {
-      formInfo.value.validate((valid) => {
-        if (valid) {
-          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.addTenantData(form.value).then((requset) => {
-              if (requset.status === 'SUCCESS') {
-                ElMessage.success({
-                  message: '新增成功',
-                  type: 'success',
-                })
-                closeDialog()
-              } else {
-                ElMessage.error(requset.msg)
-              }
-            })
-          } 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!!')
-          return false
-        }
-      })
-    }
     const marker = ref([])
 
-    function initMap() {
-      // AMap start
-      var map = new AMap.Map('mapF', {
-        resizeEnable: true,
-      })
-      //为地图注册click事件获取鼠标点击出的经纬度坐标
-
-      var marker = new AMap.Marker({})
-      map.on('click', function (e) {
-                form.value.geoPosition = e.lnglat.getLng() + ',' + e.lnglat.getLat()
-
-        map.remove([marker])
-        marker = new AMap.Marker({
-          position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-        })
-
-        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()
     }
 
     // 关闭弹框
@@ -250,43 +166,23 @@ 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
     })
 
-    //禁止选择以前的时间
-    const pickerEndDate = (time) => {
-      const timeRange = 1 * 24 * 60 * 60 * 1000
-      return time.getTime() <= Date.now() - timeRange * 1
-    }
-
     onMounted(() => {})
 
     return {
-      pickerEndDate,
       roleValid,
-      submitForm,
       closeDialog,
       open,
 
-      // map123,
       store,
       beginTime,
       showDialog,
 
-      initMap,
+   
       nowDate,
       disabledDate,
       marker,
@@ -297,77 +193,7 @@ export default defineComponent({
       getPlatformBoxList,
 
       rules: {
-        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,
-            message: '长度在 1 到 30个字符',
-            trigger: 'blur',
-          },
-        ],
-        domain: [
-          { required: true, message: '请输入域名地址', trigger: 'blur' },
-          {
-            min: 1,
-            max: 250,
-            message: '长度在 1 到 250个字符',
-            trigger: 'blur',
-          },
-        ],
+      
       },
     }
   },

src/views/statisManage/operLog/index.vue

@@ -292,24 +292,27 @@ export default defineComponent({
     // 编辑操作
     const editRow = (row) => {
       console.log(row)
-      tableItem.value = {
-        id: row.id,
-        tenantName: row.tenantName,
-        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,
-        systemName: Number(row.systemName),
-        email: row.email,
-        address: row.address,
-        remark: row.remark,
-        domain: row.domain,
-      }
+      tableItem.value=row
+      // tableItem.value = {
+      //   id: row.id,
+      //   tenantName: row.tenantName,
+      //   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,
+      //   systemName: Number(row.systemName),
+      //   email: row.email,
+      //   address: row.address,
+      //   remark: row.remark,
+      //   domain: row.domain,
+      // }
       dialogTitle.value = '操作日志详情'
       showDialog.value = true
+
+      Select(row.operId)
     }
 
     // 关闭操作
@@ -343,7 +346,7 @@ export default defineComponent({
     }
 
     //查询设备列表
-    function Select() {
+    function Select(params) {
       store.commit('TimeAll_function', dateTime.value)
       const time = store.state.Time_Data
       api
@@ -356,6 +359,7 @@ export default defineComponent({
           title: title.value,
           operName: operName.value,
           businessType: businessType.value,
+          operId:params
 
           
 

src/views/tenantManage/tenantUnit/index.vue

@@ -138,6 +138,21 @@
             {{ scope.row.tenantType === '0' ? '试用客户' : '正式客户' }}
           </span>
         </template>
+      </el-table-column>
+      <el-table-column
+        prop="domain"
+        label="域名"
+        min-width="200px"
+      >
+
+      <template #default="scope">
+          <a  target="_blank" :href='`http://${scope.row.domain}`'> 
+            {{ scope.row.domain}}
+          </a>
+        </template>
+
+      
+      
       </el-table-column>
       <el-table-column
         prop="tenantTerm"
@@ -320,6 +335,8 @@ export default defineComponent({
         }
       })
     }
+
+ 
     //是否删除  ---- 否
     const cancelEvent = () => {
       console.log('cancel!')