优化

.env.development

@@ -20,4 +20,7 @@ VITE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
 VITE_APP_UPLOAD_URL = 'http://192.168.2.28:9000/lsf/'
 
 #统一登录地址
-VITE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
+VITE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
+
+#天地图key
+VITE_APP_TIANDIKEY = '873e4a15f0f80945cd0ba56f069c19bc'

.env.production

@@ -23,5 +23,12 @@ VITE_BUILD_COMPRESS = gzip
 VITE_APP_UPLOAD_URL = 'http://192.168.2.28:9000/lsf/'
 
 #统一登录地址
+# 正式
 # VITE_APP_LOGIN_URL = 'https://sso.lzlxylsf.com/#/'
-VITE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
+# 开发
+# VITE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
+# 测试
+VITE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth/'
+
+#天地图key
+VITE_APP_TIANDIKEY = '873e4a15f0f80945cd0ba56f069c19bc'

.env.test

@@ -0,0 +1,26 @@
+# 页面标题
+VITE_APP_TITLE = 数字招商
+
+# 开发环境配置
+VITE_APP_ENV = 'test'
+
+# 若依管理系统/开发环境
+VITE_APP_BASE_API = '/szzs'
+
+# 应用访问路径 例如使用前缀 /admin/
+VITE_APP_CONTEXT_PATH = '/'
+
+# 监控地址
+VITE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/applications'
+
+# xxl-job 控制台地址
+VITE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
+
+#上传地址
+VITE_APP_UPLOAD_URL = 'http://192.168.2.28:9000/lsf/'
+
+#统一登录地址
+VITE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth/'
+
+#天地图key
+VITE_APP_TIANDIKEY = '873e4a15f0f80945cd0ba56f069c19bc'

index.html

@@ -6,6 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <meta charset="utf-8" name="referrer" content="strict-origin-when-cross-origin" /> 
   <link rel="icon" href="/favicon.ico">
   <title>数字招商</title>
   <!-- <script type="text/javascript" src="http://api.tianditu.gov.cn/api?v=4.0&tk=873e4a15f0f80945cd0ba56f069c19bc"></script> -->

package.json

@@ -7,6 +7,7 @@
   "scripts": {
     "dev": "vite",
     "build:prod": "vite build",
+    "build:test": "vite build --mode test",
     "preview": "vite preview"
   },
   "repository": {

src/main.js

@@ -139,11 +139,12 @@ const importJS = () => { // 引入 "天地图"
       }
       head.appendChild(script)
     }
-
-    importHandle('http://api.tianditu.gov.cn/api?v=4.0&tk=873e4a15f0f80945cd0ba56f069c19bc')
+    let key = import.meta.env.VITE_APP_TIANDIKEY
+    importHandle('https://api.tianditu.gov.cn/api?v=4.0&tk=' + key)
     importHandle('/static/js/xlsx.full.min.js')
 
   })
+  
 }
 
 
@@ -161,7 +162,6 @@ const omsLogin = () => {
       if(ssoToken) {
         data.token = ssoToken
       }
-      console.log('开始');
       useUserStore().getTokenHandle({url:url,data:data})
       // request({
       //   url: url,
@@ -169,7 +169,6 @@ const omsLogin = () => {
       //   params:data
       // })
       .then(() => {
-        console.log('成功')
         resolve(true)
       }).catch(err =>{
         let msg = '未知错误，请联系管理员！'

src/router/index.js

@@ -70,7 +70,7 @@ export const constantRoutes = [
         path: '/index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+        meta: { title: '首页', icon: 'dashboard', affix: true, noCache:true }
       }
     ]
   },

src/views/base/adManage/index.vue

@@ -42,7 +42,7 @@
         {
           span:10,
           labelWidth:100,
-          label:'创建时间',
+          label:'申请时间',
           prop:'time',
           component:'by-date',
           compConfig:{
@@ -119,7 +119,7 @@
         component:shallowRef(rangTime)
       },
       {
-        title:'创建时间',
+        title:'申请时间',
         field:'planCreateTime'
       },
       {
@@ -163,28 +163,42 @@
         },
         columns:[
           [{
-            label:'广告ID',
-            prop:'planId'
-          }],
-          [{
-            label:'广告计划',
+            label:'广告名称',
+            colspan:1,
             prop:'planName'
           }],
           [{
             label:'广告负责人',
+            colspan:1,
             prop:'principalName'
           }],
           [{
             label:'联系方式',
+            colspan:1,
             prop:'principalTelephone'
           }],
+          [{
+            label:'申请时间',
+            colspan:1,
+            prop:'planCreateTime'
+          }],
+          [{
+            label:'开始时间',
+            colspan:1,
+            prop:'planStartTime'
+          }],
+          [{
+            label:'结束时间',
+            colspan:1,
+            prop:'planEndTime'
+          }],
           // [{
           //   label:'上下架状态',
           //   prop:'onState'
           // }],
           [{
             label:'商品图片',
-            colspan:2,
+            colspan:3,
             prop:'goodsLogo',
             showComp:true,
             component:shallowRef(goodsImg)
@@ -219,7 +233,7 @@
   }
 
   const detail = row => {
-    config.value.modal.tool.tools.save = true;
+    // config.value.modal.tool.tools.save = true;
     delete config.value.modal.tool.tools.add;
     proxy.$refs.view.initFormTool();
     getDetailData(row.planId)

src/views/base/adPlan/components/auModal.vue

@@ -16,7 +16,7 @@
             <el-image style="width: 60px; height: 60px" :src="value.goodsLogo" fit="contain" />
           </div>
         </el-descriptions-item>
-        <el-descriptions-item label="广告计划ID">{{ value.planId }}</el-descriptions-item>
+        <el-descriptions-item label="广告名称">{{ value.planName }}</el-descriptions-item>
         <el-descriptions-item label="来源平台">{{ value.appName }}</el-descriptions-item>
        
         <el-descriptions-item label="申请商户">{{ value.commercialName }}</el-descriptions-item>

src/views/base/equipment/components/adModal.vue

@@ -54,10 +54,10 @@
         align:'center',
       },
       columns:[
-      {
-        title:'广告ID',
-        field:'planId'
-      },
+      // {
+      //   title:'广告ID',
+      //   field:'planId'
+      // },
       {
         title:'广告名称',
         field:'planName'

src/views/base/equipment/index.vue

@@ -25,7 +25,7 @@
     search:{
       columns:[
         [{
-          span:6,
+          span:8,
           // label:'设备名称',
           labelWidth:1,
           prop:'searchText',

src/views/base/orderManage/index.vue

@@ -149,7 +149,7 @@ const requestList = data => {
   delete data.time;
   list(data).then(res => {
     load.value = false;
-    proxy.$refs.view.setTableValue(res.data.recoeds);
+    proxy.$refs.view.setTableValue(res.data.records);
     let page = {
       pageNo: res.data.current, //当前页
       pageSize: 20, //每页条数

src/views/base/shopManage/components/mapRang.vue

@@ -110,7 +110,16 @@
 
   const initPoint = () => {
     let points = [];
+    let totalLng = 0;
+    let totalLat = 0;
+    if(lnglat.value.length == 0) return
     for(const item of lnglat.value){
+      if(Number(item.lng)){
+        totalLng = totalLng + Number(item.lng)
+      }
+      if(Number(item.lat)){
+        totalLat = totalLat + Number(item.lat)
+      }
       points.push(new T.LngLat(item.lng, item.lat));
     }
     //创建面对象
@@ -118,7 +127,7 @@
     //向地图上添加面
     map.value.addOverLay(polygon);
     handler.value.close()
-    map.value.centerAndZoom(new T.LngLat(lnglat.value[0].lng,lnglat.value[0].lat), zoom.value);
+    map.value.centerAndZoom(new T.LngLat(totalLng/lnglat.value.length,totalLat/lnglat.value.length), zoom.value);
   }
   const searchResult = result => {
     if(result.getStatus() == 0){

src/views/base/userManage/index.vue

@@ -82,15 +82,15 @@
         field:'startEquipmentName'
       },
       {
-        title:'扫描时间',
+        title:'扫码时间',
         field:'startTime'
       },
       {
-        title:'近期扫描设备',
+        title:'近期扫码设备',
         field:'endEquipmentName'
       },
       {
-        title:'近期扫描时间',
+        title:'近期扫码时间',
         field:'endTime'
       },
       {

src/views/index.vue

@@ -140,15 +140,15 @@
   const getAdCount = () => {
     planTotal().then(res => {
       adNum.value = res.data.total;
-      time.value = res.data.time;
+      // time.value = res.data.time;
     }).catch(() =>{})
   }
 
   const getEquipTotal = () => {
     equipTotal().then(res => {
       equipNum.value = res.data.total;
-      dis.value = res.data[1]
-      suc.value = res.data[0]
+      dis.value = res.data[0]
+      suc.value = res.data[1]
       maintenance.value = res.data[2]
     }).catch(() =>{})
   }

src/views/system/user/profile/index.vue

@@ -1,7 +1,7 @@
 <template>
    <div class="app-container">
       <el-row :gutter="20">
-         <el-col :span="6" :xs="24">
+         <el-col :span="24" :xs="24">
             <el-card class="box-card">
                <template v-slot:header>
                  <div class="clearfix">
@@ -41,7 +41,7 @@
                </div>
             </el-card>
          </el-col>
-         <el-col :span="18" :xs="24">
+         <!-- <el-col :span="18" :xs="24">
             <el-card>
                <template v-slot:header>
                  <div class="clearfix">
@@ -57,7 +57,7 @@
                   </el-tab-pane>
                </el-tabs>
             </el-card>
-         </el-col>
+         </el-col> -->
       </el-row>
    </div>
 </template>