jiangping
2023-10-16 d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9
Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
已修改8个文件
52 ■■■■■ 文件已修改
minipro_standard/common/config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
minipro_standard/util/request/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platform_web/.env.development 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platform_web/.env.lingyang 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
platform_web/src/components/common/CommonHeader.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platform_web/src/views/business/clientManger.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platform_web/src/views/login.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web_standard/.env.lingyang 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
minipro_standard/common/config.js
@@ -2,7 +2,7 @@
    // baseUrl: 'http://106.14.20.42/test_hfznzz/',
    // baseUrl: 'https://hefei.dtkey.cn/test_hfznzz/',
    // baseUrl: 'http://192.168.0.18:10021',
    baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
    baseUrl: 'https://www.mes.red/doumeeplant',
    phoneRegular: /^1[3456789]\d{9}$/,
    mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
    positiveInteger: /^[0-9]*[1-9][0-9]*$/,
minipro_standard/util/request/index.js
@@ -1,6 +1,5 @@
// 引入配置
import { baseUrl } from '@/common/config'
console.log(baseUrl);
// 初始化请求配置
uni.$u.http.setConfig((defaultConfig) => {
    /* defaultConfig 为默认全局配置 */
platform_web/.env.development
@@ -16,11 +16,17 @@
#江萍本地
VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
# VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
#焦松
#VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
#刘磊磊本地
VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'
# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
# VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'
VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
# # 接口前缀
# VUE_APP_API_PREFIX = '/doumeeplant/'
# #正式环境
VUE_APP_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant/'
platform_web/.env.lingyang
@@ -14,4 +14,4 @@
VUE_APP_API_PREFIX = '/doumeeplant/'
#正式环境
VITE_BASE_URL = 'https://127.0.0.1/doumeeplant'
VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'
platform_web/src/components/common/CommonHeader.vue
@@ -149,10 +149,11 @@
      logout()
        .then(() => {
          this.setUserInfo(null)
          this.$router.push({ name: 'login' })
          // this.$router.push({ path: '/login' })
          window.location.reload()
        })
        .catch(e => {
          this.$tip.apiFailed(e)
          this.$tips.apiFailed(e)
        })
    }
  }
platform_web/src/views/business/clientManger.vue
@@ -1,6 +1,6 @@
<template>
  <!-- :permissions="['business:appliancechange:query']" -->
  <TableLayout>
  <TableLayout :permissions="['ext:companyext:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" label-suffix=":" inline>
      <el-form-item label="客户名称" prop="name">
@@ -26,11 +26,11 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar">
        <!-- v-permissions="['ext:workorderrecordext:exportExcel']" -->
        <li><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '新增客户')">新增</el-button></li>
        <!-- -->
        <li v-permissions="['ext:companyext:create']"><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '新增客户')">新增</el-button></li>
        <!-- <li><el-button type="primary" @click="exportExcel">调整有效期</el-button></li> -->
        <li><el-button type="primary" @click="resetUserPwd">重置主账号密码</el-button></li>
        <li><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">删除</el-button></li>
        <li v-permissions="['ext:companyext:delete']"><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">删除</el-button></li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe border
        @selection-change="handleSelectionChange">
@@ -65,13 +65,16 @@
              :inactive-value="0" @change="statusChange(row)"></el-switch>
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" min-width="220px" fixed="right">
        <el-table-column
          v-if="containPermissions(['ext:companyext:update', 'ext:companyext:delete'])"
          label="操作" align="center" min-width="220px" fixed="right">
          <template slot-scope="{ row }">
            <!-- <el-button type="text" @click="$refs.operaClientMangerWindow.open('编辑客户', row)">编辑</el-button> -->
            <el-button type="text" @click="showDetail(row, true)">编辑</el-button>
            <el-button type="text" @click="$refs.operaClientValidDateWindow.open('调整', row)">调整</el-button>
            <el-button type="text" @click="$refs.operaDDSettingWindow.open('钉钉配置', row)">钉钉配置</el-button>
            <el-button type="text" style="color:red" :loading="isWorking.delete"
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="showDetail(row, true)">编辑</el-button>
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaClientValidDateWindow.open('调整', row)">调整</el-button>
            <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaDDSettingWindow.open('钉钉配置', row)">钉钉配置</el-button>
            <el-button type="text" v-permissions="['ext:companyext:delete']" style="color:red" :loading="isWorking.delete"
              @click="deleteById(row, false)">删除</el-button>
          </template>
        </el-table-column>
platform_web/src/views/login.vue
@@ -46,7 +46,6 @@
      loading: false,
      username: '',
      password: '',
      companyId: 8,
      // 验证码
      captcha: {
        loading: false,
@@ -78,11 +77,13 @@
        username: this.username.trim(),
        password: this.password,
        code: this.captcha.value.trim(),
        companyId: this.companyId,
        uuid: this.captcha.uuid
      })
        .then(() => {
          window.location.href = process.env.VUE_APP_CONTEXT_PATH
          // console.log(process.env.VUE_APP_CONTEXT_PATH);
          // b7121c39-e109-472f-bb89-722b91289437
          // window.location.href = process.env.VUE_APP_CONTEXT_PATH
          window.location.reload()
        })
        .catch(e => {
          this.refreshCaptcha()
web_standard/.env.lingyang
@@ -13,4 +13,4 @@
# 接口前缀
VUE_APP_API_PREFIX = '/doumeeplant/'
VITE_BASE_URL = 'https://127.0.0.1/doumeeplant'
VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'