wangtao 11 months ago
parent
commit
16b2032849
6 changed files with 69 additions and 75 deletions
  1. 1 1
      .env.development
  2. 3 3
      src/api/index.js
  3. 6 28
      src/utils/request.js
  4. 43 35
      src/views/fillIn.vue
  5. 14 6
      src/views/validate.vue
  6. 2 2
      vite.config.js

+ 1 - 1
.env.development

@@ -4,6 +4,6 @@ VITE_APP_TITLE = "太仓访客预约系统"
 # 开发环境配置
 VITE_APP_ENV = 'development'
 # # 管理系统/开发环境
-VITE_APP_BASE_API = 'http://172.16.120.165:801/dev-api'
+# VITE_APP_BASE_API = 'http://218.4.219.62:8083/'
 # # #websocket请求地址
 VITE_APP_WEBSOCKET_API = 'ws://172.16.120.49:9891/websocket/'

+ 3 - 3
src/api/index.js

@@ -31,7 +31,7 @@ import request from "@/utils/request";
 // 新增访客(思倍云)
 export function addVisitor(data) {
     return request({
-        url: "http://218.4.219.62:8083/visitor/record",
+        url: "visitor/record",
         method: "post",
         data
     });
@@ -40,7 +40,7 @@ export function addVisitor(data) {
 // 查询访客(思倍云)
 export function getVisitor(data) {
     return request({
-        url: "http://218.4.219.62:8083/visitor/query",
+        url: "visitor/query",
         method: "post",
         data
     });
@@ -48,7 +48,7 @@ export function getVisitor(data) {
 // 访客签到(思倍云)
 export function signinoutVisitor(data) {
     return request({
-        url: "http://218.4.219.62:8083/visitor/signinout",
+        url: "visitor/signinout",
         method: "post",
         data
     });

+ 6 - 28
src/utils/request.js

@@ -61,35 +61,13 @@ const service = axios.create({
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+        console.log(res)
         // 未设置状态码则默认成功状态
-        const code = res.data.status;
-        // 获取错误信息
-        const msg = errorCode[code] || res.data.msg || errorCode['default']
-            // 二进制数据则直接返回
-        if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
-            return res.data
-        }
-        if (code == "SUCCESS" || res.data.msg == "操作成功") {
-            return res.headers['content-type'].indexOf("application/vnd.ms-excel") != -1 ? res : res.data
-        } else if (res.data.code == 0) { //系统监控=>定时任务
-            return res.data
-        } else {
-            if (res.data.code == "401") {
-                return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
-            } else if (res.data.code === 500) {
-                ElMessage({
-                    message: msg,
-                    type: 'error'
-                })
-                return msg && Promise.reject(new Error(msg)) || ""
-            } else if (res.data.code !== 0) {
-                ElNotification.error({
-                    title: msg
-                })
-                return Promise.reject('error')
-            } else {
-
-            }
+        const code = res.data.code;
+        if (code == 200) {
+            return  res.data
+        } else { //系统监控=>定时任务
+            return res.data.msg
         }
     },
     error => {

+ 43 - 35
src/views/fillIn.vue

@@ -78,7 +78,7 @@
             >
               <el-input
                 placeholder="请输入访客名称"
-                v-model="form.visitorPersonList.peopleName"
+                v-model="form.visitorPersonList[0].peopleName"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -89,13 +89,13 @@
             >
               <el-input
                 placeholder="请输入访客手机号"
-                v-model="form.visitorPersonList.peoplePhone"
+                v-model="form.visitorPersonList[0].peoplePhone"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">            
             <el-form-item label="性别" :rules="rules.sex">
-              <el-select v-model="form.visitorPersonList.sex" placeholder="请选择性别" style="width: 100%" >
+              <el-select v-model="form.visitorPersonList[0].sex" placeholder="请选择性别" style="width: 100%" >
                 <el-option
                  
                   v-for="item in sex"
@@ -110,7 +110,7 @@
             <el-form-item label="身份证号码"  :rules="rules.cardId">
               <el-input
                 placeholder="请输入身份证号码"
-                v-model="form.visitorPersonList.cardId"
+                v-model="form.visitorPersonList[0].cardId"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -118,7 +118,7 @@
             <el-form-item label="来访单位" :rules="rules.callerCorpName">
               <el-input
                 placeholder="请输入来访单位"
-                v-model="form.visitorPersonList.callerCorpName"
+                v-model="form.visitorPersonList[0].callerCorpName"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -161,23 +161,25 @@ const departData = ref(); //组织列表
 const phoneArray = ref([]); //人员电话号码合集
 const data = reactive({
   form: {
-    targetPeoplePhone:"",//被访人手机号
-    targetPeopleName:"",//被访人姓名 .
-    visitorReasonCode:"",//来访事由编码 .
-    visitorReasonInfo:"",//来访事由 .
-    visitorNumber:"",//来访人数 .
+    targetPeoplePhone:"13127578888",//被访人手机号
+    targetPeopleName:"金工",//被访人姓名 .
+    visitorReasonCode:"business_talks",//来访事由编码 .
+    visitorReasonInfo:"business_talks",//来访事由 .
+    visitorNumber:"3",//来访人数 .
     startTime:"", //开始时间 .
     endTime:"", //结束时间 .
-    visitorPersonList:{
-      peopleName:"",//访客姓名 .
-      peoplePhone:"",//访客手机号 .
-      sex:"",//访客性别 .
-      cardId:"341282199208123456",//证件号 .
-      cardType:"2",//证件类型 .
-      plates:"2",//车牌号 .
-      callerCorpName:"",//来访单位 .
-      signInOutState:"non",//签到/离状态 .
-    } //访客信息列表 .
+    visitorPersonList:[
+      {
+        peopleName:"王工",//访客姓名 .
+        peoplePhone:"13127578866",//访客手机号 .
+        sex:"",//访客性别 .
+        cardId:"341282199208123456",//证件号 .
+        cardType:"2",//证件类型 .
+        plates:"2",//车牌号 .
+        callerCorpName:"永天",//来访单位 .
+        signInOutState:"non",//签到/离状态 .
+      } //访客信息列表 .
+    ]
   },
   visitorReasonCodeList:[
     {label:"亲友拜访",value:"family_friends_visitor"},
@@ -284,21 +286,27 @@ function submitForm() {
     if (valid) {
       // form.value.sex = Number(form.value.sex);
       // form.value.accompanyNum = Number(form.value.accompanyNum);
-      console.log(form.value)
-      addVisitor(form.value).then((requset) => {
-        if (requset.success == true) {
-          ElMessage({
-            message: "访客预约申请成功,请稍后查看微信小程序推送信息",
-            type: "success",
-          });
-          setTimeout(function () {
-            formRef.value.resetFields(); //重置from校验
-            dateRange.value = [];
-            router.push({ path: "/" });
-          }, 5000);
-        } else {
-          ElMessage.error(requset.msg);
-        }
+      // console.log(form.value)
+      // axios
+      // .post(
+      //   "http://218.4.219.62:8083/visitor/record",form.value
+      // ).then((response) => {})
+      let a = JSON.stringify(form.value)
+console.log(a)
+      addVisitor(a).then((requset) => {
+        // if (requset.success == true) {
+        //   ElMessage({
+        //     message: "访客预约申请成功,请稍后查看微信小程序推送信息",
+        //     type: "success",
+        //   });
+        //   setTimeout(function () {
+        //     formRef.value.resetFields(); //重置from校验
+        //     dateRange.value = [];
+        //     router.push({ path: "/" });
+        //   }, 5000);
+        // } else {
+        //   ElMessage.error(requset.msg);
+        // }
       });
     }
   });

+ 14 - 6
src/views/validate.vue

@@ -11,8 +11,9 @@
         </div>
         <p v-if="!cardId">请将身份证置于读卡器上,自动获取身份证号码</p>
         <image style="width: 130px; height: 130px" src="@/assets/images/idcard.png"  v-if="!cardId" />
-        <div class="VisitorsRecord">
-          <div class="list">
+        <div class="VisitorsRecord" >
+          <p v-if="visitorsRecord == '查询数据为空' && visitorsRecordState"> 暂无访客记录 </p>
+          <!-- <div class="list" v-if="visitorsRecord.length>0">
             <div class="item" v-for="(item,index) in visitorsRecord" :key="index" @click="handle('select',item)" :class="item.targetPeopleCode == active ? 'active' : ''">
               <div>
                 <span class="p1">被访人姓名:</span><span class="p2">{{item.targetPeopleName}}</span>
@@ -30,7 +31,7 @@
                 <span class="p1">来访时间:</span><span class="p2">{{item.targetPeopleName}}</span>
               </div>
             </div>
-          </div>
+          </div> -->
         </div>  
         <el-button type="primary" @click="handle('signIn')" class="validate-contain-search-button" size="large" v-if="active" style="width:30%;margin:10% 35% 0;"> 签 到 </el-button>
       </div>
@@ -48,8 +49,9 @@ import 'animate.css';
 import layout from "@/components/layout/index.vue";
 /*----------------------------------变量声明-----------------------------------*/
 const timer = ref(null);
-const cardId = ref(123);
-const active = ref(null);
+const cardId = ref('341282199208123456');//身份证号码
+const active = ref(null); //当前选中的访客记录
+const visitorsRecordState = ref(false);//访客记录状态
 const visitorsRecord = ref([
   {
     targetPeoplePhone:"1111",
@@ -110,7 +112,13 @@ const visitorsRecord = ref([
 }
 function handle(type,item) {
   if(type === 'get'){ //获取访客记录
-    getVisitor({cardId:cardId.value})
+    getVisitor(JSON.stringify({cardId:cardId.value})).then((response) => {
+      visitorsRecordState.value = true
+      visitorsRecord.value = response.data
+      console.log(visitorsRecord.value)
+    }).catch((error) => {
+      visitorsRecordState.value = true
+    })
   }
   if(type ==='select'){ //选择访客记录
     active.value = item.targetPeopleCode;

+ 2 - 2
vite.config.js

@@ -53,8 +53,8 @@ export default defineConfig(({ mode, command }) => {
             host: true,
             open: true, // 自动打开浏览器
             proxy: {
-                '/dev-api': {
-                    target: '',
+                '/visitor': {
+                    target: 'http://218.4.219.62:8083/',
                     ws: true,
                     changeOrigin: true,
                     pathRewrite: {