Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

16 小时以前 09f0061cb76cbfc7a4798226c86f43b3d8744f3d

Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

 admin/.env.development

@@ -10,7 +10,7 @@
# VUE_APP_API_URL  = 'http://localhost:10010'

# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
# VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'

#key：045542fc5f436b75e6c911c5c84ff8cd
#密钥：8bd38497f9aee2b75e7a888a4dfd1e6c

 admin/.env.production

@@ -7,3 +7,4 @@

VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'



 admin/src/components/business/operaVisitsWindow.vue

@@ -110,7 +110,7 @@
        >
        </el-switch>
      </el-form-item>-->
      <el-form-item v-if="param.type == 2" label="施工内容">
      <el-form-item v-if="param.type == 1" label="施工内容" prop="constructionReason">
        <el-input
          v-model="param.constructionReason"
          placeholder="请输入施工内容"

 h5/utils/config.js

@@ -1,6 +1,6 @@

// export const baseUrl = 'zhyq_interface/'
export const baseUrl = 'http://192.168.1.54:10010/'
export const baseUrl = 'http://192.168.1.45:10010/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'