ymy 1 éve
szülő
commit
e5da754acf

+ 3 - 3
.env.production

@@ -20,15 +20,15 @@ VITE_APP_BASE_API = '/szzs'
 VITE_BUILD_COMPRESS = gzip
 
 #上传地址
-VITE_APP_UPLOAD_URL = 'http://192.168.2.28:9000/lsf/'
+VITE_APP_UPLOAD_URL = '/data/access/lsf/'
 
 #统一登录地址
 # 正式
-# VITE_APP_LOGIN_URL = 'https://sso.lzlxylsf.com/#/'
+VITE_APP_LOGIN_URL = 'https://sso.lzlxylsf.com/#/'
 # 开发
 # VITE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
 # 测试
-VITE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth/'
+# VITE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth/'
 
 #天地图key
 VITE_APP_TIANDIKEY = '873e4a15f0f80945cd0ba56f069c19bc'

+ 1 - 1
.env.test

@@ -17,7 +17,7 @@ VITE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/applications'
 VITE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
 
 #上传地址
-VITE_APP_UPLOAD_URL = 'http://192.168.2.28:9000/lsf/'
+VITE_APP_UPLOAD_URL = '/data/access/lsf/'
 
 #统一登录地址
 VITE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth/'

+ 1 - 0
index.html

@@ -7,6 +7,7 @@
   <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" /> 
+  <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />
   <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> -->

+ 1 - 1
src/benyun/components/byForm/byForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="by-form" :style="{width:attrs.width}">
     <el-descriptions v-if="attrs.showType=='desc'" :title="attrs.title" :column="attrs.itemCount" :border="attrs.border" :direction="attrs.direction" 
-    :size="attrs.size?attrs.size:'medium'" :colon="attrs.colon">
+    :size="attrs.size?attrs.size:'default'" :colon="attrs.colon">
       <template v-for="(itemChild,index) of columns">
         <el-descriptions-item :label="item.label" v-for="(item,_ind) of itemChild" :span="item.colspan" :key="index+'-'+_ind">
           <slot v-if="item.descSlot" :name='item.prop+"_desc"' :value='value'></slot>

+ 6 - 0
src/components/mapMaker/index.vue

@@ -150,6 +150,9 @@
         if(geocoder.value){
           if(address.value){
             zoom.value = 17;
+          }else if(props.parentValue.addrInfo) {
+            address.value = props.parentValue.addrInfo
+            zoom.value = 17;
           }
           geocoder.value.getPoint(area.value + address.value, searchResult);
         }
@@ -158,6 +161,9 @@
     $bus.on('addressEvent',data => {
       address.value = data;
       if(address.value && geocoder.value){
+        if(!area.value && props.parentValue.addrCodeInfo) {
+          area.value = props.parentValue.addrCodeInfo.replaceAll('/','');
+        }
         zoom.value = 17;
         geocoder.value.getPoint(area.value + address.value, searchResult);
       }

+ 1 - 1
src/components/upload/upload.vue

@@ -14,7 +14,7 @@
           :initial-index="4"
           fit="cover"
         />
-        <!-- <img :src="pathUrl + pathImg" /> -->
+        <!-- <img :src="pathUrl + pathImg" style="width: 60px;" /> -->
       </div>
       <div class="del" @click="delPath">删除</div>
     </div>

+ 2 - 3
src/views/base/merchantManage/components/upload.vue

@@ -1,11 +1,10 @@
 <template>
   <div class="upload">
-    <div>{{ pathUrl + pathImg }}</div>
     <el-button type="primary" @click="uploadHandle" v-if="!pathImg">点击上传</el-button>
     <div class="msg" v-if="!pathImg">只能上传jpg/png文件,且不超过2MB</div>
-    
     <div class="uopload-box" v-if="pathImg">
       <div class="upload-img">
+        <!-- <img :src="pathUrl + pathImg" style="width: 60px;" /> -->
         <el-image
           style="width: 60px; height: 60px"
           :src="pathUrl + pathImg"
@@ -16,7 +15,6 @@
           :initial-index="4"
           fit="cover"
         />
-        <!-- <img :src="pathUrl + pathImg" /> -->
       </div>
       <div class="del" @click="delPath">删除</div>
     </div>
@@ -66,6 +64,7 @@
         data:data
       }).then(res => {
         pathImg.value = res.data.fileName
+        srcList.value[0] = pathUrl.value + res.data.fileName
         onChange()
       }).catch(err => {
         if(err && err.msg) {

+ 0 - 1
src/views/index.vue

@@ -70,7 +70,6 @@
   const { proxy } = getCurrentInstance();
   import * as echarts from 'echarts';
   import scanModal from './components/scanModal.vue';
-
   const scanNum = ref(0);
   const time = ref('');
   const adNum = ref(0);