浏览代码

内容调整

ming 11 月之前
父节点
当前提交
e5bc19e051
共有 2 个文件被更改,包括 56 次插入78 次删除
  1. 35 62
      src/utils/request.js
  2. 21 16
      src/views/fillIn.vue

+ 35 - 62
src/utils/request.js

@@ -19,72 +19,45 @@ const service = axios.create({
         timeout: 30000
     })
     // request拦截器
-service.interceptors.request.use(config => {
-    //获取请求头参数
-    const {signature, timestamp, secret} = signatureGenerate(config)
-    config.headers['key'] = 'c65ba95718be44a88d69962b66094075' //富士接口key
-    config.headers['sign'] = signature //富士接口签名
-    config.headers['timestamp'] = timestamp
-    // console.log('post请求参数')
-    // console.log(config.data)
-    // 如果存在data,并且我们想替换body
-    if (config.data && config.method.toLowerCase() === 'post') {
-        // 将数据转换为JSON字符串
-        const data = JSON.stringify(config.data);
-        // 对数据进行Base64编码
-        const base64EncodedData = base64Encode(data);
-        // 替换请求体
-        config.data = base64EncodedData;
-    }
-    function base64Encode(str) {
-        // 先将字符串转换为Latin1编码
-        var latin1Str = unescape(encodeURIComponent(str));
-        // 然后使用btoa进行Base64编码
-        return btoa(latin1Str);
-    }
-    // 是否需要设置 token
-    const isToken = (config.headers || {}).isToken === false
-        // 是否需要防止数据重复提交
-    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-    // get请求映射params参数
-    if (config.method === 'get' && config.params) {
-        let url = config.url + '?' + tansParams(config.params);
-        url = url.slice(0, -1);
-        config.params = {};
-        config.url = url;
-    }
-    if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+    service.interceptors.request.use(config => {
 
-        const requestObj = {
-            url: config.url,
-            data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-            time: new Date().getTime()
+        // 是否需要设置 token
+        const isToken = (config.headers || {}).isToken === false
+        // 是否需要防止数据重复提交
+        const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+        if (localStorage.getItem("token725") && !isToken) {
+            config.headers['Authorization'] = localStorage.getItem("token725") // 让每个请求携带自定义token 请根据实际情况自行修改
         }
-        const sessionObj = cache.session.getJSON('sessionObj')
-        if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-            cache.session.setJSON('sessionObj', requestObj)
-        } else {
-            const s_url = sessionObj.url; // 请求地址
-            const s_data = sessionObj.data; // 请求数据
-            const s_time = sessionObj.time; // 请求时间
-            const interval = 1000; // 间隔时间(ms),小于此时间视为重复提交
-            // if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-            //     const message = '数据正在处理,请勿重复提交';
-            //     console.warn(`[${s_url}]: ` + message)
-            //     return Promise.reject(new Error(message))
-            // } else {
-            //     cache.session.setJSON('sessionObj', requestObj)
-            // }
-
-            cache.session.setJSON('sessionObj', requestObj)
+        // get请求映射params参数
+        if (config.method === 'get' && config.params) {
+            let url = config.url + '?' + tansParams(config.params);
+            url = url.slice(0, -1);
+            config.params = {};
+            config.url = url;
         }
-    }
-    config.headers['Content-Type'] = 'application/json;charset=utf-8'
+        if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
     
-    return config
-}, error => {
-    Promise.reject(error)
-})
+            const requestObj = {
+                url: config.url,
+                data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+                time: new Date().getTime()
+            }
+            const sessionObj = cache.session.getJSON('sessionObj')
+            if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+                cache.session.setJSON('sessionObj', requestObj)
+            } else {
+                const s_url = sessionObj.url; // 请求地址
+                const s_data = sessionObj.data; // 请求数据
+                const s_time = sessionObj.time; // 请求时间
+                const interval = 1000; // 间隔时间(ms),小于此时间视为重复提交
+                cache.session.setJSON('sessionObj', requestObj)
+            }
+        }
+        config.headers['Content-Type'] = 'application/json;charset=utf-8'
+        return config
+    }, error => {
+        Promise.reject(error)
+    })
 
 // 响应拦截器
 service.interceptors.response.use(res => {

+ 21 - 16
src/views/fillIn.vue

@@ -35,10 +35,14 @@
               label="来访事由"
               :rules="rules.visitorReasonCode"
             >
-              <el-input
-                placeholder="请输入拜访事由"
-                v-model="form.visitorReasonCode"
-              ></el-input>
+            <el-select v-model="form.visitorReasonCode" placeholder="请选择拜访事由" style="width: 100%" >
+                <el-option
+                  v-for="item in visitorReasonCodeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -90,7 +94,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">            
-            <el-form-item label="性别" prop="sex">
+            <el-form-item label="性别" :rules="rules.sex">
               <el-select v-model="form.visitorPersonList.sex" placeholder="请选择性别" style="width: 100%" >
                 <el-option
                  
@@ -192,8 +196,8 @@ const data = reactive({
     {label:"其他",value:"other"}
   ],
   sex:[
-    {label:"女",value:"man"},
-    {label:"男",value:"woman"},
+    {label:"女",value:"woman"},
+    {label:"男",value:"man"},
     {label:"未知",value:"unknown"},
   ],
   rules: {
@@ -262,24 +266,25 @@ function getData() {
 function submitForm() {
   if (dateRange.value == null) {
     dateRange.value = [];
-    form.value.visitorStartTime = "";
-    form.value.vistorEndTime = "";
+    form.value.startTime = "";
+    form.value.endTime = "";
   }
   if (JSON.stringify(dateRange.value) != "[]") {
-    form.value.visitorStartTime = dateRange.value[0].replace("T", " ");
-    form.value.vistorEndTime = dateRange.value[1].replace("T", " ");
+    form.value.startTime = dateRange.value[0].replace("T", " ");
+    form.value.endTime = dateRange.value[1].replace("T", " ");
   }
 
   //模拟身份证数据读取
-  form.value.visitorName = "袁明明";
-  form.value.sex = form.value.sex ='1';
-  form.value.identityCardNo = "411122199112078083";
+  // form.value.visitorName = "袁明明";
+  // form.value.sex = form.value.sex ='1';
+  // form.value.identityCardNo = "411122199112078083";
 
 
   proxy.$refs["formRef"].validate((valid) => {
     if (valid) {
-      form.value.sex = Number(form.value.sex);
-      form.value.accompanyNum = Number(form.value.accompanyNum);
+      // 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({