Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-28 e8158d16a13c2ea1f2d8566578137db4394ab610

Merge remote-tracking branch 'origin/master'

 admin/src/api/business/device.js

@@ -21,3 +21,8 @@
export function updateById (data) {
  return request.post('/business/device/updateById', data)
}

// 修改是否门禁入口
export function updateEntranceById (data) {
  return request.post('/business/device/updateEntranceById', data)
}

 admin/src/components/common/CommonHeader.vue

@@ -88,9 +88,9 @@
  },
  computed: {
    ...mapState(['menuData', 'userInfo']),
    title () {
      return this.$route.meta.title
    }
    // title () {
    //   return this.$route.meta.title
    // }
  },
  filters: {
    // 展示名称

 admin/src/views/business/carEvent.vue

@@ -8,7 +8,7 @@
            <el-form-item label="姓名/手机号" prop="keyWords">
                <el-input v-model="searchForm.keyWords" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="公司/部门名称" prop="companyName">
            <el-form-item label="公司/部门" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入公司/部门名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="人员类型" prop="memberType">
@@ -71,9 +71,9 @@
                </el-table-column>
              <el-table-column label="归属用户类型" min-width="100px">
                <template slot-scope="{row}">
                  <span v-if="row.personType === '0'">劳务访客</span>
                  <span v-if="row.personType === '1'">普通访客</span>
                  <span v-if="row.personType === '2'">内部人员</span>
                  <span v-if="row.personType == 0">劳务访客</span>
                  <span v-if="row.personType == 1">普通访客</span>
                  <span v-if="row.personType == 2">内部人员</span>
                </template>
              </el-table-column>
              <el-table-column prop="personName" label="姓名" min-width="100px"></el-table-column>

 admin/src/views/business/device.vue

@@ -8,6 +8,12 @@
            <el-form-item label="区域名称" prop="regionPathName">
                <el-input v-model="searchForm.regionPathName" placeholder="请输入区域名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="是否园区入口" prop="isEntrance">
                <el-select v-model="searchForm.isEntrance" placeholder="请选择">
                    <el-option label="是" value="1"></el-option>
                    <el-option label="否" value="0"></el-option>
                </el-select>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
@@ -28,6 +34,18 @@
                <el-table-column prop="regionPathName" label="区域名称"></el-table-column>
                <el-table-column prop="doorNo" label="门禁点编号"></el-table-column>
                <el-table-column prop="manufature" label="厂商"></el-table-column>
                <el-table-column label="是否园区入口">
                    <template slot-scope="{row}">
                        <el-switch
                            @change="changeManufature($event, row)"
                            v-model="row.isEntrance"
                            active-color="#13ce66"
                            inactive-color="#ff4949"
                            :active-value="1"
                            :inactive-value="0">
                        </el-switch>
                    </template>
                </el-table-column>
                <el-table-column prop="no" label="设备号"></el-table-column>
<!--                <el-table-column-->
<!--                    v-if="containPermissions(['business:device:update'])"-->
@@ -48,7 +66,7 @@
            </pagination>
        </template>
        <!-- 新建/修改 -->
        <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>
<!--        <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
    </TableLayout>
</template>

@@ -57,7 +75,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
import { syncDevices } from '@/api/business/device'
import { syncDevices, updateEntranceById } from '@/api/business/device'
import { memberSync } from '@/api/business/member'
export default {
  name: 'Device',
@@ -68,7 +86,8 @@
      // 搜索
      searchForm: {
        doorName: '',
        regionPathName: ''
        regionPathName: '',
        isEntrance: ''
      },
      options: []
    }
@@ -83,6 +102,12 @@
    this.search()
  },
  methods: {
    changeManufature(e, row) {
      updateEntranceById({
        id: row.id,
        isEntrance: e
      })
    },
    synchronousData () {
      this.$dialog.actionConfirm('操作确认提醒', '您确认同步全部信息吗？')
        .then(() => {

 admin/src/views/business/deviceEvent.vue

@@ -5,7 +5,7 @@
            <el-form-item label="姓名/手机号" prop="keyWords">
                <el-input v-model="searchForm.keyWords" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="公司/组织名称" prop="companyName">
            <el-form-item label="公司/组织" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入公司/组织名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="人员类型" prop="personType">

 admin/src/views/business/empower.vue

@@ -19,6 +19,9 @@
            <el-form-item label="公司" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="设备名称" prop="deviceName">
                <el-input v-model="searchForm.deviceName" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="下发起始时间" prop="startTime">
                <el-date-picker
                    @change="seleTime"
@@ -128,7 +131,8 @@
        startTime: '',
        endTime: '',
        sendStatus: '',
        radio: null
        radio: null,
        deviceName: ''
      },
      time: []
    }

 admin/src/views/business/retention.vue

@@ -5,7 +5,7 @@
            <el-form-item label="姓名/手机号" prop="keyWords">
                <el-input v-model="searchForm.keyWords" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="公司/部门名称" prop="companyName">
            <el-form-item label="公司/部门" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入公司/部门名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="人员类型" prop="type">

 h5/main.js

@@ -9,8 +9,8 @@

// Vue.prototype.$baseUrl = 'http://192.168.0.111:10027/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
// Vue.prototype.$baseUrl = 'http://218.23.218.228:9912/web_interface/'
// Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/'
Vue.prototype.$store = store;

App.mpType = 'app'

 h5/pages/appointmentDetails/appointmentDetails.vue

@@ -178,6 +178,7 @@
                align-items: center;
                margin-top: 30rpx;
                .box_list_item_label {
                    flex-shrink: 0;
                    font-size: 28rpx;
                    font-family: PingFangSC, PingFang SC;
                    font-weight: 400;

 h5/pages/userinfo/userinfo.vue

@@ -86,8 +86,8 @@
                    userAnswerId: '',
                    name: '',
                    phone: '',
                    idcardType: '',
                    idcardTypeName: '',
                    idcardType: '0',
                    idcardTypeName: '身份证',
                    idcardNo: '',
                    faceImg: '',
                    faceImgUrl: '',
@@ -221,7 +221,7 @@
                var that = this
                that.type = type
                if (type === 'faceImg') {
                    that.$refs.cropper.open()
                    that.$refs.cropper.chooseImage()
                    return
                }
                uni.chooseImage({

 h5/pages/visitorApplication/visitorApplication.vue

@@ -8,7 +8,7 @@
                    <text>*</text>
                </view>
                <view class="list_item_content">
                    <input type="number" maxlength="11" v-model="form1.phone1" placeholder="请输入手机号" @blur="getUser" placeholder-style="color: #999999;" />
                    <input type="number" maxlength="11" v-model="form1.phone1" :placeholder="verify == '0' ? '输入手机号后自动获取' : '请输入手机号'" @blur="getUser" placeholder-style="color: #999999;" />
                </view>
            </view>
            <view class="list_item">
@@ -57,7 +57,7 @@
                    <text>*</text>
                </view>
                <view class="list_item_content">
                    <input type="text" v-model="form1.reason" placeholder="请输入来访事由，您来做什么的" placeholder-style="color: #999999;" />
                    <input type="text" v-model="form1.reason" placeholder="请输入来访事由" placeholder-style="color: #999999;" />
                </view>
            </view>
            <view class="list_item">
@@ -1115,7 +1115,9 @@

            .list_item {
                width: 100%;
                height: 98rpx;
                // min-height: 98rpx;
                padding: 30rpx 0;
                box-sizing: border-box;
                display: flex;
                align-items: center;
                justify-content: space-between;

 h5/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue

@@ -353,6 +353,7 @@
                    success: (res) => {
                        this.resetData();
                        this.initImage(res.tempFiles[0].path);
                        // this.open()
                    }
                });
            },
@@ -369,6 +370,7 @@
             * @param {String} url 图片链接
             */
            initImage(url) {
                this.open()
                uni.getImageInfo({
                    src: url,
                    success: (res) => {