Merge remote-tracking branch 'origin/master'

jiangping

2024-02-29 e949929dda547c3ca3a68396afbaeff61ace1ee3

Merge remote-tracking branch 'origin/master'

 admin/.env

@@ -4,7 +4,7 @@
VUE_APP_ROUTER_MODE = 'hash'

# 项目上下文路径
VUE_APP_CONTEXT_PATH = '/hsvisit_admin'
VUE_APP_CONTEXT_PATH = '/admin'

# 接口前缀
VUE_APP_API_PREFIX = '/admin_api'
VUE_APP_API_PREFIX = '/admin_interface'

 admin/src/views/business/empower.vue

@@ -70,7 +70,7 @@
                        <span>止：{{row.endTime}}</span>
                    </template>
                </el-table-column>
                <el-table-column prop="sendDate" label="导入时间" min-width="150px"></el-table-column>
                <el-table-column prop="sendDate" label="创建时间" min-width="150px"></el-table-column>
<!--                <el-table-column prop="createrName" label="操作人员" min-width="100px"></el-table-column>-->
                <el-table-column label="下发状态" min-width="100px">
                    <template slot-scope="{row}">

 admin/src/views/business/internalMember.vue

@@ -94,7 +94,7 @@
                <el-table-column fixed="right" label="人脸信息" min-width="100px">
                    <template slot-scope="{row}">
                        <el-image
                            style="width: 100px; height: 100px"
                            style="width: 60px; height: 60px"
                            :src="row.faceImg"
                            :preview-src-list="[row.faceImg]">
                        </el-image>
@@ -103,7 +103,7 @@
                <el-table-column fixed="right" label="卡片信息" min-width="100px">
                    <template slot-scope="{row}">
                        <el-image
                            style="width: 100px; height: 100px"
                            style="width: 60px; height: 60px"
                            :src="row.faceImg"
                            :preview-src-list="[row.faceImg]">
                        </el-image>
@@ -176,6 +176,7 @@
    getfindCompanyTreePage () {
      fetchList(1)
        .then(res => {
          res[0].fsStatus = 1
          this.companyTree = res
          // this.searchForm.erpOrgId = res[0].erpId
          this.search()

 admin/src/views/business/visitorSources.vue

@@ -34,6 +34,9 @@
            <el-form-item label="访客答题说明:" prop="description">
                <el-input style="width: 50%;" type="textarea" v-model="form.description" placeholder="请输入" v-trim/>
            </el-form-item>
            <el-form-item label="入厂须知:" prop="description">
                <el-tiptap style="width: 50%;" v-model="form.description" :extensions="extensions" />
            </el-form-item>
            <el-form-item>
                <el-button type="primary" @click="submit">保存配置项</el-button>
            </el-form-item>
@@ -43,6 +46,31 @@

<script>
import { getVisitConfigDTO, updateVisitConfig } from '@/api/system/common'
import {
  // necessary extensions
  Doc,
  Text,
  Paragraph,
  Heading,
  Bold,
  Underline,
  Italic,
  Strike,
  ListItem,
  BulletList,
  OrderedList,
  Image,
  Blockquote,
  TextAlign,
  Indent,
  Table,
  TableHeader,
  TableCell,
  TableRow,
  TextColor,
  HorizontalRule
} from 'element-tiptap'
import { upload } from '@/api/system/common'
export default {
  name: 'visitorSources',

@@ -56,7 +84,39 @@
        isAnswer: 0,
        theme: '',
        description: ''
      },
      extensions: [
        new Doc(),
        new Text(),
        new Paragraph(),
        new Heading({ level: 5 }),
        new Bold({ bubble: true }),
        new Underline({ bubble: true, menubar: false }),
        new Italic(),
        new Strike(),
        new ListItem(),
        new BulletList(),
        new OrderedList(),
        new Image({
          uploadRequest (file) {
            const fd = new FormData()
            fd.append('folder', 'visit')
            fd.append('file', file)
            return upload(fd).then(res => {
              return res.url
            })
      }
        }),
        new Blockquote(),
        new TextAlign(),
        new Indent(),
        new Table(),
        new TableHeader(),
        new TableCell(),
        new TableRow(),
        new HorizontalRule(),
        new TextColor()
      ]
    }
  },


 admin/vue.config.js

@@ -1,8 +1,8 @@
// 详细配置请参考https://cli.vuejs.org/zh/config/#vue-config-js
const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length - 1)
// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length - 1)
module.exports = {
  publicPath: process.env.VUE_APP_CONTEXT_PATH,
  outputDir: outputDir === '/' ? 'dist' : outputDir,
  outputDir: 'admin',
  assetsDir: 'static',
  lintOnSave: false,
  devServer: {
@@ -14,8 +14,10 @@
        // http://192.168.0.110:10013   磊磊
        // http://192.168.0.132:10013   帅哥
        // http://192.168.0.126:10033   萍姐
        // http://192.168.0.129:10028   任康
        // https://dmtest.ahapp.net/admin_api   测试服
        target: 'http://192.168.0.126:10033',
        // http://10.10.99.63/admin_interface/  最新测试服
        target: 'http://192.168.0.129:10028',
        changeOrigin: true,
        pathRewrite: {
          [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''

 h5/main.js

@@ -9,6 +9,7 @@

Vue.prototype.$baseUrl = 'http://192.168.0.129:10027/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
// Vue.prototype.$baseUrl = 'http://10.10.99.63/web_interface/';
Vue.prototype.$store = store;

App.mpType = 'app'

 h5/manifest.json

@@ -81,7 +81,7 @@
    "h5" : {
        "router" : {
            "mode" : "hash",
            "base" : "/hsvisit_h5/"
            "base" : "/h5/"
        }
    }
}

 h5/pages/visitorApplication/visitorApplication.vue

@@ -220,7 +220,7 @@
                            <text>*</text>
                        </view>
                        <view class="adduser_list_item_ipt">
                            <input type="text" v-model="withUserList.idcardNo" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="请输入证件号码" />
                            <input type="text" v-model="withUserList.idcardNo" maxlength="18" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="请输入证件号码" />
                        </view>
                    </view>
                    <view class="adduser_list_item">