xq

src/utils/http.js

@@ -8,8 +8,13 @@ import qs from "qs";
 
 axios.defaults.timeout = 0;
 axios.defaults.headers = {
-  "X-Requested-With": "XMLHttpRequest"
+  "X-Requested-With": "XMLHttpRequest",
+  'Authorization':'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
 };
+// axios.auth= 'Basic c2FiZXI6c2FiZXJfc2VjcmV0',
+// axios.defaults.headers['Authorization'] = "Basic c2FiZXI6c2FiZXJfc2VjcmV0";
+// axios.defaults.headers.common['Authorization'] = 'Basic c2FiZXI6c2FiZXJfc2VjcmV0';
+
 axios.defaults.responseType = "json";
 // axios.defaults.withCredentials = true;
 

src/views/Login/login2.vue

 <!--
  * @Author: your name
  * @Date: 2021-09-08 10:36:43
- * @LastEditTime: 2021-09-08 15:45:16
+ * @LastEditTime: 2021-09-14 18:56:53
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\Login\login2.vue
@@ -59,6 +59,8 @@
 <script>
 import Vue from 'vue'
 import zoom from '@/utils/autosize'
+import { get, postJson, post } from "@/utils/http.js";
+import axios from 'axios';
 export default {
   data() {
     return {
@@ -68,6 +70,7 @@ export default {
       pass: require("../../assets/login/password.png"),
       username: "",
       password: "",
+      dlList:{},
     };
   },
   methods: {
@@ -88,14 +91,28 @@ export default {
 		},
    
     denglu() {
+      this.self =this;
       console.log('0');
       var self = this;
       self.info = ''
-      //假登录
-      if ((self.username == "admin" && self.password == "admin") || (self.username == "000006" && self.password == "000006")) {
-        console.log('信息验证成功');
-        self.dengLuData();
-      }
+      self.$set(self.dlList,'account',self.username)
+      self.$set(self.dlList,'password',self.password)
+      self.$set(self.dlList,'grantType','password')
+      self.$set(self.dlList,'tenantId','000000')
+      self.$set(self.dlList,'refreshToken','')
+      console.log(self.dlList);
+      postJson("/xqapi/blade-auth/token", self.dlList).then(res=>{
+        console.log(res);
+      })
+      // axios.post('/xqapi/blade-auth/token',self.dlList).then(res=>{
+      //   console.log(res);
+      // })
+      // 假登录
+      // if ((self.username == "admin" && self.password == "123456") || (self.username == "000006" && self.password == "000006")) {
+      //   console.log('信息验证成功');
+      //   self.dengLuData();
+      // }
+
     },
     /*解析登陆数据*/
     dengLuData() {

src/views/rwgl/rwglindex.vue

 <!--
  * @Author: your name
  * @Date: 2021-08-28 21:28:08
- * @LastEditTime: 2021-09-13 16:22:29
+ * @LastEditTime: 2021-09-14 15:23:30
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\rwgl\rwglindex.vue
 -->
 <template>
-  <div class="rwgl">
+  <div class="rwgl" id="rwglindex">
     <el-form ref="form" :model="selectPage" label-width="80px" :inline="true">
       <div class="rybdsearch">
         <el-form-item label="">
@@ -249,6 +249,7 @@ import Table from "@/components/Table.vue";
 import { get, postJson, post } from "@/utils/http.js";
 import axios from "axios";
 import utils from "@/utils/util.js";
+
 export default {
   components: {
     Table,
@@ -324,78 +325,7 @@ export default {
           width: "auto",
         },
       ], //表头的数据
-      tableData: [
-        {
-          RWMC: "任务一",
-          RYMPZS: "2000",
-          YPP: "236",
-          time: "262",
-          FKZT: "222",
-          FKZT: "333",
-          XT_ZXBZ: "32",
-          wcjd: "50%",
-        },
-        {
-          RWMC: "任务二",
-          RYMPZS: "2000",
-          YPP: "236",
-          time: "262",
-          FKZT: "222",
-          FKZT: "333",
-          XT_ZXBZ: "32",
-          wcjd: "50%",
-        },
-        {
-          RWMC: "任务三",
-          RYMPZS: "2000",
-          YPP: "236",
-          time: "262",
-          FKZT: "222",
-          FKZT: "333",
-          XT_ZXBZ: "32",
-          wcjd: "50%",
-        },
-        {
-          RWMC: "任务一",
-          RYMPZS: "2000",
-          YPP: "236",
-          time: "262",
-          FKZT: "222",
-          FKZT: "333",
-          XT_ZXBZ: "32",
-          wcjd: "50%",
-        },
-        {
-          RWMC: "任务一",
-          RYMPZS: "2000",
-          YPP: "236",
-          time: "262",
-          FKZT: "222",
-          FKZT: "333",
-          XT_ZXBZ: "32",
-          wcjd: "50%",
-        },
-        {
-          RWMC: "任务一",
-          RYMPZS: "2000",
-          YPP: "236",
-          time: "262",
-          FKZT: "222",
-          FKZT: "333",
-          XT_ZXBZ: "32",
-          wcjd: "50%",
-        },
-        {
-          RWMC: "任务一",
-          RYMPZS: "2000",
-          YPP: "236",
-          time: "262",
-          FKZT: "222",
-          FKZT: "333",
-          XT_ZXBZ: "32",
-          wcjd: "50%",
-        },
-      ], //表格的内容
+      tableData: [], //表格的内容
       form: {
         name: "",
         userId: "",

src/views/rwgl/rymplb.vue

 <!--
  * @Author: your name
  * @Date: 2021-08-27 15:52:57
- * @LastEditTime: 2021-09-13 16:10:29
+ * @LastEditTime: 2021-09-14 15:10:03
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\rymp.vue
@@ -50,13 +50,13 @@
           <div v-if="isSearch">
             <el-form-item label="年龄:" prop="age">
               <el-input
-                v-model="form.age"
+                v-model="rympForm.age"
                 placeholder="请输入人员年龄"
               ></el-input>
             </el-form-item>
             <el-form-item label="住址:" prop="address">
               <el-input
-                v-model="form.address"
+                v-model="rympForm.address"
                 placeholder="请输入人员姓名"
               ></el-input>
             </el-form-item>
@@ -88,7 +88,7 @@
       element-loading-text="拼命加载中"
       ref="itsmDataTable"
       tooltip-effect="dark"
-      max-height="550"
+      max-height="300"
       style="width: 99%; margin: 0 auto"
       width="100%"
       size="small"
@@ -145,13 +145,35 @@
     </Table> -->
     <!-- 详情 和 退回的diolog弹框 -->
     <div class="rymplbDialog">
-      <el-dialog title="详情信息" :visible.sync="rymplbdialogVisible" width="30%">
+      <el-dialog
+        title="详情信息"
+        :visible.sync="rymplbdialogVisible"
+        width="30%"
+      >
         <div class="xqdiolog">
-          <div>姓名：<el-tag type="success">{{ xqinfo.xm }}</el-tag></div>
-          <div>身份证号：<el-tag type="success" v-if="xqinfo.sfzh">{{ xqinfo.sfzh }}</el-tag></div>
-          <div>归属地：<el-tag type="success" v-if="xqinfo.gsd">{{ xqinfo.gsd }}</el-tag></div>
-          <div>手机号：<el-tag type="success" v-if="xqinfo.sjh">{{ xqinfo.sjh }}</el-tag></div>
-          <div>反馈状态 ：<el-tag type="success" v-if="xqinfo.fkzt">{{ xqinfo.fkzt }}</el-tag></div>
+          <div>
+            姓名：<el-tag type="success">{{ xqinfo.xm }}</el-tag>
+          </div>
+          <div>
+            身份证号：<el-tag type="success" v-if="xqinfo.sfzh">{{
+              xqinfo.sfzh
+            }}</el-tag>
+          </div>
+          <div>
+            归属地：<el-tag type="success" v-if="xqinfo.gsd">{{
+              xqinfo.gsd
+            }}</el-tag>
+          </div>
+          <div>
+            手机号：<el-tag type="success" v-if="xqinfo.sjh">{{
+              xqinfo.sjh
+            }}</el-tag>
+          </div>
+          <div>
+            反馈状态 ：<el-tag type="success" v-if="xqinfo.fkzt">{{
+              xqinfo.fkzt
+            }}</el-tag>
+          </div>
         </div>
 
         <span slot="footer" class="dialog-footer">
@@ -161,7 +183,12 @@
           >
         </span>
       </el-dialog>
-      <el-dialog title="退回" :visible.sync="dialogFormVisible">
+      <!-- 退回的diolog -->
+      <el-dialog
+        title="退回"
+        :visible.sync="dialogFormVisible"
+        @closed="closed"
+      >
         <el-form :model="thform" label-position="top">
           <el-form-item
             label="退回地址:"
@@ -192,6 +219,7 @@ import Table from "@/components/Table.vue";
 import { get, postJson } from "@/utils/http.js";
 import utils from "@/utils/util.js";
 import { mapMutations, mapState } from "vuex";
+import zoom from '@/utils/autosize'
 export default {
   name: "rymplb",
   components: {
@@ -253,10 +281,8 @@ export default {
       dataRyid: "", //人员 id
       selectRythb: "", //人员退回返回的信息
       showList: {
-        rwid: "2",
         page: 1,
         limit: 10,
-        ppzt: "0",
       },
     };
   },
@@ -291,6 +317,8 @@ export default {
     handleSizeChange(val) {
       this.curpage = val;
       console.log(`每页 ${val} 条`);
+      this.$set(this.showList, "limit", val);
+      this.getList(this.showList);
     },
     /**
      * @description: 当前页数
@@ -300,6 +328,8 @@ export default {
     handleCurrentChange(val) {
       this.atPage = val;
       console.log(`当前页: ${val}`);
+      this.$set(this.showList, "page", val);
+      this.getList(this.showList);
     },
     /**
      * @description: 重置按钮
@@ -337,12 +367,17 @@ export default {
       } else if (type == "th") {
         this.dialogFormVisible = true;
         this.dataRyid = row.ryid;
-        console.log("一行的信息", row);
-        console.log("人员的id", this.dataRyid);
+        // console.log("一行的信息", row);
+        // console.log("人员的id", this.dataRyid);
         postJson("/xqapi/rythb/selectRythb", { ryglid: this.dataRyid }).then(
           (res) => {
+            console.log("退回的数据", res);
             if (res.code == "200") {
+              if (res.data.rows) {
                 this.selectRythb = res.data.rows;
+                this.thform = res.data.rows;
+              }
+              console.log(res.data.rows);
             }
           }
         );
@@ -366,6 +401,7 @@ export default {
               message: "退回成功",
               type: "success",
             });
+            this.dialogFormVisible = false;
           }
         });
       } else {
@@ -377,6 +413,7 @@ export default {
               message: "退回成功",
               type: "success",
             });
+            this.dialogFormVisible = false;
           }
         });
       }
@@ -398,6 +435,15 @@ export default {
         }
       });
     },
+    /**
+     * @description: 关闭diolog清空列表
+     * @param {*}
+     * @return {*}
+     */
+    closed() {
+      console.log("00.00");
+      this.thform = {};
+    },
   },
   watch: {
     tableData: function (val, oldVal) {
@@ -425,6 +471,8 @@ export default {
         limit: 10,
         ppzt: "0",
       };
+      this.showList = formList;
+      console.log(this.showList);
       this.getList(formList);
     } else if (this.$route.params.type == "th") {
       let formList = {
@@ -433,15 +481,17 @@ export default {
         limit: 10,
         thzt: "0",
       };
+      this.showList = formList;
       this.getList(formList);
     } else if (this.$route.params.type == "ypp") {
-      var thformList = {
+      var formList = {
         rwid: this.$route.params.id,
         page: 1,
         limit: 10,
         ppzt: "1",
       };
-      this.getList(thformList);
+      this.showList = formList;
+      this.getList(formList);
     } else if (this.$route.params.type == "yfk") {
       let formList = {
         rwid: this.$route.params.id,
@@ -449,6 +499,7 @@ export default {
         limit: 10,
         fkzt: "1",
       };
+      this.showList = formList;
       this.getList(formList);
     } else if (this.$route.params.type == "wfk") {
       let formList = {
@@ -457,8 +508,13 @@ export default {
         limit: 10,
         fkzt: "0",
       };
+      this.showList = formList;
       this.getList(formList);
     }
+    zoom("loginBox");
+    window.addEventListener("resize", function () {
+      zoom("loginBox");
+    });
   },
 };
 </script>
@@ -474,10 +530,10 @@ export default {
     .col {
       width: 30%;
     }
-    .xqdiolog{
+    .xqdiolog {
       display: flex;
       flex-wrap: wrap;
-      div{
+      div {
         width: 33.3%;
         margin-bottom: 20px;
       }
@@ -560,7 +616,8 @@ export default {
     }
   }
   .pagin {
-    // position: fixed;
+    position: absolute;
+    top: calc(100vh - 180px);
     // bottom: 40px;
     margin-top: 10px;
     margin-bottom: 10px;
@@ -583,9 +640,6 @@ export default {
     .el-pagination__sizes {
       order: 1;
     }
-    .el-pagination .el-select .el-input {
-      height: 28.993px;
-    }
   }
 }
 .More {