diff --git a/package.json b/package.json
index d01037e..c3d8bbb 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "axios": "^0.21.0",
     "core-js": "^3.6.5",
+    "dayjs": "^1.10.3",
     "element-ui": "^2.14.1",
     "postcss": "^8.1.10",
     "vue": "^2.6.11",
diff --git a/src/components/EntryInformation.vue b/src/components/EntryInformation.vue
index c93a362..8d6fb2a 100644
--- a/src/components/EntryInformation.vue
+++ b/src/components/EntryInformation.vue
@@ -6,18 +6,17 @@
       </div>
       <el-form ref="form"  label-width="100px">
         <el-form-item label="身份证：">
-          <a href="../assets/wzx.jpg"> <img src="../assets/wzx.jpg" alt="" class="pic"/></a>
-          <a href="../assets/wzx.jpg"> <img src="../assets/wzx.jpg" alt="" class="pic"/></a>
+          <a :href="url + form.idcard1"> <img :src="url + form.idcard1" alt="" class="pic"/></a>
+          <a :href="url + form.idcard2"> <img :src="url + form.idcard2" alt="" class="pic"/></a>
         </el-form-item>
         <el-form-item label="银行卡：">
-          <a href="../assets/wzx.jpg"> <img src="../assets/wzx.jpg" alt=""/></a>
+          <a :href="url + form.bankcard"> <img :src="url + form.bankcard" alt=""/></a>
         </el-form-item>
         <el-form-item label="学籍证明：">
-          <a href="../assets/wzx.jpg"> <img src="../assets/wzx.jpg" alt=""/></a>
+          <a :href="url + form.studentstatuscertificate1"> <img :src="url + form.studentstatuscertificate1" alt=""/></a>
         </el-form-item>
         <el-form-item label="其他：">
-          <a href="../assets/wzx.jpg"> <img src="../assets/wzx.jpg" alt=""/></a>
-          <a href="../assets/wzx.jpg"> <img src="../assets/wzx.jpg" alt=""/></a>
+          <a :href="url + form.otheradd1"> <img :src="url + form.otheradd1" alt=""/></a>
         </el-form-item>
       </el-form>
     </el-card>
@@ -30,8 +29,20 @@ export default {
     return {
       idCard: "", //身份证
       bankCard: "", //银行卡
-      studentStatusCertificate: "" //学籍证明
+      studentStatusCertificate: "", //学籍证明
+      form:{},
+      url:""
     };
+  },
+  mounted(){
+    this.url = this.galoData.url
+     this.$http("/findEntryInfo",{
+                params: {
+                    entryid: this.$route.query.id
+                }
+            }).then((res)=>{
+                this.form = res.data.resp
+            })
   }
 };
 </script>
diff --git a/src/components/EntryStatus.vue b/src/components/EntryStatus.vue
index 62eaa55..826353e 100644
--- a/src/components/EntryStatus.vue
+++ b/src/components/EntryStatus.vue
@@ -1,279 +1,396 @@
 <template>
-  <div class="isituation">
-    <el-page-header @back="goBack" content="入职情况"> </el-page-header>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>正在查看 <i class="redz">xxxxxx</i> 入职情况</span>
-        <div class="rightbutton">
-          <el-button type="danger" @click="add">添加入职情况</el-button>
-        </div>
-      </div>
-      <!-- 下方内容 -->
-      <div>
-        <el-table :data="tableData" border style="width: 100%">
-          <el-table-column prop="entryTime" label="入职时间" width="100">
-          </el-table-column>
-          <el-table-column prop="entrySalary" label="入职薪资" width="65">
-          </el-table-column>
-          <el-table-column prop="subsidy" label="补助" width="65">
-          </el-table-column>
+    <div class="isituation">
+        <el-page-header @back="goBack" content="入职情况"> </el-page-header>
+        <el-card class="box-card">
+            <div slot="header" class="clearfix">
+                <span>正在查看 <i class="redz">xxxxxx</i> 入职情况</span>
+                <div class="rightbutton">
+                    <el-button type="danger" @click="add"
+                        >添加入职情况</el-button
+                    >
+                </div>
+            </div>
+            <!-- 下方内容 -->
+            <div>
+                <el-table :data="tableData" border style="width: 100%">
+                    <el-table-column
+                        prop="entrytime"
+                        label="入职时间"
+                        width="100"
+                    >
+                     <template slot-scope="scope">
+                         <div>{{gettime(scope.row.entrytime)}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        prop="entrysalary"
+                        label="入职薪资"
+                        width="65"
+                    >
+                    </el-table-column>
+                    <el-table-column prop="subsidy" label="补助" width="65">
+                    </el-table-column>
 
-          <el-table-column prop="entryPosition" label="入职岗位" width="70">
-          </el-table-column>
-          <el-table-column
-            prop="emergencyContact"
-            label="紧急联系人"
-            width="65"
-          >
-          </el-table-column>
-          <el-table-column prop="name" label="姓名" width="65">
-          </el-table-column>
-          <el-table-column prop="telephone" label="电话"> </el-table-column>
-          <el-table-column prop="homeAddress" label="家庭住址">
-          </el-table-column>
-          <el-table-column prop="currentAddress" label="现住址">
-          </el-table-column>
+                    <el-table-column
+                        prop="entryposition"
+                        label="入职岗位"
+                        width="70"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                        prop="emergencycontact"
+                        label="紧急联系人"
+                        width="65"
+                    >
+                    </el-table-column>
+                    <el-table-column prop="name" label="姓名" width="65">
+                    </el-table-column>
+                    <el-table-column prop="telephone" label="电话">
+                    </el-table-column>
+                    <el-table-column prop="homeaddress" label="家庭住址">
+                    </el-table-column>
+                    <el-table-column prop="currentaddress" label="现住址">
+                    </el-table-column>
 
-          <el-table-column prop="other" label="其他"> </el-table-column>
-          <el-table-column label="操作">
-            <template>
-              <el-button size="mini" type="danger" @click="edit"
-                >编辑</el-button
-              >
-              <el-button size="mini" type="danger" @click="viewEntryInformation"
-                >详情</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-card>
-    <!-- 弹框 -->
-    <el-dialog
-      :title="this.title == false ? `编辑信息` : `添加入职情况`"
-      :visible.sync="aisDialogVisible"
-      center
-    >
-      <el-form ref="form" :model="form" label-width="100px">
-        <el-form-item label="入职时间">
-          <el-date-picker
-            type="date"
-            placeholder="确定面试者何时入职"
-            v-model="form.entryTime"
-            style="width: 100%"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="入职薪资">
-          <el-input v-model="form.entrySalary"></el-input>
-        </el-form-item>
-        <el-form-item label="补助">
-          <el-input v-model="form.subsidy"></el-input>
-        </el-form-item>
-        <el-form-item label="入职岗位">
-          <el-input v-model="form.entryPosition"></el-input>
-        </el-form-item>
-        <el-form-item label="入职资料">
-          <el-upload
-            class="upload-demo"
-            action="https://jsonplaceholder.typicode.com/posts/"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :before-remove="beforeRemove"
-            multiple
-            :limit="3"
-            :on-exceed="handleExceed"
-            :file-list="entryInformation"
-          >
-            <el-button size="small" type="primary">点击上传身份证</el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
+                    <el-table-column prop="other" label="其他">
+                    </el-table-column>
+                    <el-table-column label="操作">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="danger" @click="edit(scope.row.entryid)"
+                                >编辑</el-button
+                            >
+                            <el-button
+                                size="mini"
+                                type="danger"
+                                @click="viewEntryInformation(scope.row.entryid)"
+                                >详情</el-button
+                            >
+                        </template>
+                    </el-table-column>
+                </el-table>
             </div>
-          </el-upload>
-          <el-upload
-            class="upload-demo"
-            action="https://jsonplaceholder.typicode.com/posts/"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :before-remove="beforeRemove"
-            multiple
-            :limit="3"
-            :on-exceed="handleExceed"
-            :file-list="entryInformation"
-          >
-            <el-button size="small" type="primary">点击上传银行卡</el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-          <el-upload
-            class="upload-demo"
-            action="https://jsonplaceholder.typicode.com/posts/"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :before-remove="beforeRemove"
-            multiple
-            :limit="3"
-            :on-exceed="handleExceed"
-            :file-list="entryInformation"
-          >
-            <el-button size="small" type="primary">点击上传学籍证明</el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-          <el-upload
-            class="upload-demo"
-            action="https://jsonplaceholder.typicode.com/posts/"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :before-remove="beforeRemove"
-            multiple
-            :limit="3"
-            :on-exceed="handleExceed"
-            :file-list="entryInformation"
-          >
-            <el-button size="small" type="primary">点击上传其他资料</el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-        </el-form-item>
-        <el-form-item label="紧急联系人">
-          <el-input v-model="form.emergencyContact"></el-input>
-        </el-form-item>
-        <el-form-item label="姓名">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="电话">
-          <el-input v-model="form.telephone"></el-input>
-        </el-form-item>
-        <el-form-item label="家庭住址">
-          <el-input v-model="form.homeAddress"></el-input>
-        </el-form-item>
-        <el-form-item label="现住址">
-          <el-input v-model="form.currentAddress"></el-input>
-        </el-form-item>
-        <el-form-item label="其他">
-          <el-input type="textarea" v-model="form.other"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="aisDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="aisDialogVisible = false"
-          >确 定</el-button
+        </el-card>
+        <!-- 弹框 -->
+        <el-dialog
+            :title="this.title == false ? `编辑信息` : `添加入职情况`"
+            :visible.sync="aisDialogVisible"
+            center
         >
-      </span>
-    </el-dialog>
-  </div>
+            <el-form ref="form" :model="form" label-width="100px">
+                <el-form-item label="入职时间">
+                    <el-date-picker
+                        type="date"
+                        placeholder="确定面试者何时入职"
+                        v-model="seldate"
+                        style="width: 100%"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="入职薪资">
+                    <el-input v-model="form.entrysalary"></el-input>
+                </el-form-item>
+                <el-form-item label="补助">
+                    <el-input v-model="form.subsidy"></el-input>
+                </el-form-item>
+                <el-form-item label="入职岗位">
+                    <el-input v-model="form.entryposition"></el-input>
+                </el-form-item>
+                <el-form-item label="入职资料">
+                    <el-upload
+                        class="upload-demo"
+                        action="http://192.168.1.2:8090/personnal/fileup"
+                        :show-file-list="false"
+                        :on-success="shangchaunzhengmian"
+                    >
+                        <el-button size="small" type="primary"
+                            >点击上传身份证正面</el-button
+                        >
+                        <div slot="tip" class="el-upload__tip">
+                            只能上传jpg/png文件
+                        </div>
+                    </el-upload>
+                     <el-upload
+                        class="upload-demo"
+                        action="http://192.168.1.2:8090/personnal/fileup"
+                        :show-file-list="false"
+                        :on-success="shangchaunfanmian"
+                    >
+                        <el-button size="small" type="primary"
+                            >点击上传身份证反面</el-button
+                        >
+                        <div slot="tip" class="el-upload__tip">
+                            只能上传jpg/png文件
+                        </div>
+                    </el-upload>
+                    <el-upload
+                        class="upload-demo"
+                        action="http://192.168.1.2:8090/personnal/fileup"
+                        :show-file-list="false"
+                        :on-success="shangchaunyinhangka"
+                    >
+                        <el-button size="small" type="primary"
+                            >点击上传银行卡</el-button
+                        >
+                        <div slot="tip" class="el-upload__tip">
+                            只能上传jpg/png文件
+                        </div>
+                    </el-upload>
+                    <el-upload
+                        class="upload-demo"
+                        action="http://192.168.1.2:8090/personnal/fileup"
+                        :show-file-list="false"
+                        :on-success="shangchaunxuejizhengming"
+                    >
+                        <el-button size="small" type="primary"
+                            >点击上传学籍证明</el-button
+                        >
+                        <div slot="tip" class="el-upload__tip">
+                            只能上传jpg/png文件
+                        </div>
+                    </el-upload>
+                    <el-upload
+                        class="upload-demo"
+                        action="http://192.168.1.2:8090/personnal/fileup"
+                        :show-file-list="false"
+                        :on-success="shangchauqitaziliao"
+                    >
+                        <el-button size="small" type="primary"
+                            >点击上传其他资料</el-button
+                        >
+                        <div slot="tip" class="el-upload__tip">
+                            只能上传jpg/png文件
+                        </div>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="紧急联系人">
+                    <el-input v-model="form.emergencycontact"></el-input>
+                </el-form-item>
+                <el-form-item label="姓名">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="电话">
+                    <el-input v-model="form.telephone"></el-input>
+                </el-form-item>
+                <el-form-item label="家庭住址">
+                    <el-input v-model="form.homeaddress"></el-input>
+                </el-form-item>
+                <el-form-item label="现住址">
+                    <el-input v-model="form.currentaddress"></el-input>
+                </el-form-item>
+                <el-form-item label="其他">
+                    <el-input type="textarea" v-model="form.other"></el-input>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="aisDialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="tijiao">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
 </template>
 <script>
+import dayjs from "dayjs";
 export default {
-  data() {
-    return {
-      title: false,
-      invitingPerson: "", //邀约人
-      typeOfInvitation: "", //邀约类型
-      invitationTime: "", //邀约时间
-      interviewPosition: "", //面试职位
-      invitationDetails: "", //邀约详情
-      whetherToFaceOrNot: "", //是否到面
-      remarks: "", //备注
-      // 添加面试情况弹框
-      aisDialogVisible: false,
-      //   弹框内容
-      form: {
-        entryTime: "", //入职时间
-        entrySalary: "", //入职薪资
-        subsidy: "", //补助
-        entryPosition: "", //入职岗位
+    data() {
+        return {
+            title: false,
+            invitingPerson: "", //邀约人
+            typeOfInvitation: "", //邀约类型
+            invitationTime: "", //邀约时间
+            interviewPosition: "", //面试职位
+            invitationDetails: "", //邀约详情
+            whetherToFaceOrNot: "", //是否到面
+            remarks: "", //备注
+            // 添加面试情况弹框
+            aisDialogVisible: false,
+            //   弹框内容
+            form: {
+                entrytime: "2020-11-12", //入职时间
+                entrysalary: "", //入职薪资
+                subsidy: "", //补助
+                entryposition: "", //入职岗位
 
-        emergencyContact: "", //紧急联系人
-        name: "", //姓名
-        telephone: "", //电话
-        homeAddress: "", //家庭住址
-        currentAddress: "", //现住址
-        other: "" //其他
-      },
-      entryInformation: [], //入职资料
-      //   展示列表
-      tableData: [
-        {
-          entryTime: "2020-11-12", //入职时间
-          entrySalary: "3000", //入职薪资
-          subsidy: "无", //补助
-          entryPosition: "前端", //入职岗位
+                emergencycontact: "", //紧急联系人
+                name: "", //姓名
+                telephone: "", //电话
+                homeaddress: "", //家庭住址
+                currentaddress: "", //现住址
+                other: "", //其他
+            },
+            entryInformation: [], //入职资料
+            //   展示列表
+            tableData: [
+        
+            ],
+            seldate:"",
+            xiugaiid:""
+        };
+    },
+    methods: {
+        goBack() {
+            this.$router.push("/");
+        },
+        // 添加邀约情况
+        add() {
+            this.form = {}
+            this.title = true;
+            this.aisDialogVisible = true;
+        },
+        // 编辑信息
+        edit(id) {
+            this.title = false;
+            this.aisDialogVisible = true;
+            this.xiugaiid = id;
+            this.$http("/findEntryInfo",{
+                params: {
+                    entryid: id
+                }
+            }).then((res)=>{
+                this.form = res.data.resp
+                this.seldate = res.data.resp.entrytime &&  dayjs(res.data.resp.entrytime).format("YYYY-MM-DD");
+            })
+        },
+        // 上传入职资料
+        handleRemove(file, entryInformation) {
+            console.log(file, entryInformation);
+        },
+        handlePreview(file) {
+            console.log(file);
+        },
+        handleExceed(files, entryInformation) {
+            this.$message.warning(
+                `当前限制选择 3 个文件，本次选择了 ${
+                    files.length
+                } 个文件，共选择了 ${
+                    files.length + entryInformation.length
+                } 个文件`
+            );
+        },
+        beforeRemove(file) {
+            return this.$confirm(`确定移除 ${file.name}？`);
+        },
+        // 查看入职资料
+        viewEntryInformation(id) {
+            this.$router.push("/entryinformation?id=" + id);
+        },
+        tijiao() {
+            console.log(this.form);
+            this.form.interviewerid = this.$route.query.uid
+            this.form.entrytime =
+                this.seldate &&
+                dayjs(this.seldate).format("YYYY-MM-DD");
+            if(this.xiugaiid){
+                this.$http.get("/updateEntryInfo", {
+                    params: {
+                        ...this.form,
+                        entryid: this.xiugaiid
+                    },
+                }).then(()=>{
+                    this.aisDialogVisible = false
+                    this.getlist()
+                })
+                this.xiugaiid = 0;
+            }else{
+                this.$http.get("/insertEntryInfo", {
+                    params: {
+                        ...this.form,
+                    },
+                }).then(()=>{
+                    this.aisDialogVisible = false
+                    this.getlist()
+                })
+            }
+            this.form = {
+                entrytime: "2020-11-12", //入职时间
+                entrysalary: "", //入职薪资
+                subsidy: "", //补助
+                entryposition: "", //入职岗位
 
-          emergencyContact: "谢谢谢", //紧急联系人
-          name: "蟹蟹蟹", //姓名
-          telephone: "13562691187", //电话
-          homeAddress: "山东省济南市历城区港沟街道小汉峪", //家庭住址
-          currentAddress: "山东省济南市历城区港沟街道小汉峪", //现住址
-          other:
-            "山东省济南市历城区港沟街道小汉峪山东省济南市历城区港沟街道小汉峪山东省济南市历城区港沟街道小汉峪山东省济南市历城区港沟街道小汉峪" //其他
+                emergencycontact: "", //紧急联系人
+                name: "", //姓名
+                telephone: "", //电话
+                homeaddress: "", //家庭住址
+                currentaddress: "", //现住址
+                other: "", //其他
+            }
+        },
+        chenggong(){
+            this.$message({
+                message: '上传成功',
+                type: 'success'
+            });
+        },
+        shangchaunzhengmian(res){
+          console.log(res)
+          this.form.idcard1 = res.resp
+          this.chenggong()
+          
+        },
+         shangchaunfanmian(res){
+          console.log(res)
+          this.form.idcard2 = res.resp
+          this.chenggong()
+
+        },
+        shangchaunyinhangka(res){
+          this.form.bankcard = res.resp
+          console.log(res)
+          this.chenggong()
+
+        },
+         shangchaunxuejizhengming(res){
+          console.log(res)
+          this.form.studentstatuscertificate1 = res.resp
+          this.chenggong()
+
+
+        },
+         shangchauqitaziliao(res){
+          this.form.otheradd1 = res.resp
+          console.log(res)
+          this.chenggong()
+
+        },
+        getlist(){
+            this.$http.get("/findEntryInfos", {
+                params: {
+                    interviewerid: this.$route.query.uid,
+                },
+            }).then((res)=>{
+                console.log(res.data.resp)
+                this.tableData = res.data.resp
+            })
+        },
+        gettime(time){
+            return time && dayjs(time).format("YYYY-MM-DD");
         }
-      ]
-    };
-  },
-  methods: {
-    goBack() {
-      this.$router.push("/");
     },
-    // 添加邀约情况
-    add() {
-      this.title = true;
-      this.aisDialogVisible = true;
+    mounted() {
+        this.getlist()
     },
-    // 编辑信息
-    edit() {
-      this.title = false;
-      this.aisDialogVisible = true;
-    },
-    // 上传入职资料
-    handleRemove(file, entryInformation) {
-      console.log(file, entryInformation);
-    },
-    handlePreview(file) {
-      console.log(file);
-    },
-    handleExceed(files, entryInformation) {
-      this.$message.warning(
-        `当前限制选择 3 个文件，本次选择了 ${
-          files.length
-        } 个文件，共选择了 ${files.length + entryInformation.length} 个文件`
-      );
-    },
-    beforeRemove(file) {
-      return this.$confirm(`确定移除 ${file.name}？`);
-    },
-    // 查看入职资料
-    viewEntryInformation() {
-      this.$router.push("/entryinformation");
-    }
-  }
 };
 </script>
 <style lang="less" scoped>
 .el-page-header__content {
-  font-size: 18px;
-  color: #f6f8fa;
+    font-size: 18px;
+    color: #f6f8fa;
 }
 .isituation {
-  height: 100%;
-  // background-image: url(../assets/wzx2.jpg);
-  // background-repeat: no-repeat; //不重复
-  // background-size: 100%; // 满屏
+    height: 100%;
+    // background-image: url(../assets/wzx2.jpg);
+    // background-repeat: no-repeat; //不重复
+    // background-size: 100%; // 满屏
 }
 .box-card {
-  margin-top: 20px;
+    margin-top: 20px;
 }
 .redz {
-  color: lightcoral;
-  font-style: normal;
+    color: lightcoral;
+    font-style: normal;
 }
 .clearfix {
-  margin-bottom: 20px;
+    margin-bottom: 20px;
 }
 .rightbutton {
-  float: right;
+    float: right;
 }
 </style>
diff --git a/src/components/ISituation.vue b/src/components/ISituation.vue
index 12ce517..6bb81c6 100644
--- a/src/components/ISituation.vue
+++ b/src/components/ISituation.vue
@@ -214,6 +214,7 @@ export default {
             console.log(res)
              if(res.data.code==200){
               this.aisDialogVisible=false
+              this.getlist()
             }
           })
         }else{
@@ -221,6 +222,8 @@ export default {
             console.log(res)
              if(res.data.code==200){
               this.aisDialogVisible=false
+              this.getlist()
+
             }
           })
         }
@@ -260,6 +263,7 @@ export default {
             console.log(res)
             if(res.data.code==200){
               this.aisDialogVisible2=false
+              this.getlist()
             }
           })
         }else{
@@ -267,7 +271,9 @@ export default {
             console.log(res)
             if(res.data.code==200){
               this.aisDialogVisible2=false
+              this.getlist()
             }
+            
           })
         }
       }else{
@@ -282,6 +288,7 @@ export default {
     },
     // 添加面试情况
     addInterviewSituation() {
+      this.form = {}
       this.title = true;
       this.aisDialogVisible = true;
     },
@@ -299,12 +306,12 @@ export default {
       this.aisDialogVisible2 = true;
     },
     addTrialPost() {
+      this.form2 = {}
       this.title2 = true;
       this.aisDialogVisible2 = true;
     },
-  },
-  mounted() {
-    this.$http
+    getlist(){
+      this.$http
       .get("/findTestResults", {
         params: { interviewerid: this.$route.query.uid },
       })
@@ -321,6 +328,10 @@ export default {
         console.log(res);
         this.tableData = res.data.resp;
       });
+    }
+  },
+  mounted() {
+    this.getlist()
   },
 };
 </script>
diff --git a/src/components/Invitation.vue b/src/components/Invitation.vue
index 258a3c6..9dee81a 100644
--- a/src/components/Invitation.vue
+++ b/src/components/Invitation.vue
@@ -141,9 +141,9 @@ export default {
         this.form.interviewerid = this.$route.query.uid;
         this.form.invitationtime =
           new Date(this.form.invitationtime).getFullYear() +
-          "/" +
+          "-" +
           parseInt(new Date(this.form.invitationtime).getMonth() + 1) +
-          "/" +
+          "-" +
           new Date(this.form.invitationtime).getDate();
         if (this.title) {
           this.$http
@@ -151,6 +151,7 @@ export default {
             .then((res) => {
               console.log(res);
               if (res.data.code == 200) {
+    this.getlist()
                 this.aisDialogVisible = false;
               }
             });
@@ -160,6 +161,7 @@ export default {
             .then((res) => {
               console.log(res);
               if (res.data.code == 200) {
+    this.getlist()
                 this.aisDialogVisible = false;
               }
             });
@@ -176,6 +178,7 @@ export default {
     },
     // 添加邀约情况
     add() {
+      this.form = {}
       this.title = true;
       this.aisDialogVisible = true;
     },
@@ -190,10 +193,8 @@ export default {
       //   console.log(res)
       // })
     },
-  },
-  mounted() {
-    console.log(this.$route.query);
-    this.$http
+    getlist(){
+      this.$http
       .get("/findInvitations", {
         params: { interviewerid: this.$route.query.uid },
       })
@@ -201,6 +202,11 @@ export default {
         console.log(res);
         this.tableData = res.data.resp;
       });
+    }
+  },
+  mounted() {
+    console.log(this.$route.query);
+    this.getlist()
   },
 };
 </script>
diff --git a/src/components/UserList.vue b/src/components/UserList.vue
index bf41e8d..4382ccd 100644
--- a/src/components/UserList.vue
+++ b/src/components/UserList.vue
@@ -97,6 +97,7 @@
           type="success"
           round
           icon="el-icon-takeaway-box"
+          @click="daochu"
           >导出</el-button
         >
       </div>
@@ -110,21 +111,23 @@
           style="float: right; padding: 3px 0"
           class="upload-demo"
           ref="upload"
-          action="https://jsonplaceholder.typicode.com/posts/"
+          action="http://192.168.1.2:8090/personnal/upload"
           :on-preview="handlePreview"
           :on-remove="handleRemove"
+          :on-change="selfile"
           :file-list="fileList"
           :auto-upload="false"
+          :limit="1"
+          :show-file-list="false"
         >
-          <el-button slot="trigger" size="small" type="primary"
+          <!-- <el-button slot="trigger" size="small" type="primary"
             >选取文件</el-button
-          >
+          > -->
           <el-button
             style="margin-left: 10px"
             size="small"
             type="success"
-            @click="submitUpload"
-            >上传到服务器</el-button
+            >导入表格</el-button
           >
         </el-upload>
       </div>
@@ -225,6 +228,7 @@
 </template>
 <script>
 import popUp from "../layout/components/popUp";
+import dayjs from "dayjs"
 export default {
   data() {
     return {
@@ -249,16 +253,16 @@ export default {
         // pageSize:7
       },
        addinfo: {
-        entryTime: "", //录入时间
+        entrytime: "", //录入时间
         name: "", //姓名
         age: "", //年龄
-        nativePlace: "", //籍贯
-        currentPosition: "", //当前职位
-        educationInformation: "", //学历信息
+        nativeplace: "", //籍贯
+        currentposition: "", //当前职位
+        educationinformation: "", //学历信息
         telephone: "", //电话
-        weChat: "", //微信
+        wechat: "", //微信
       },
-      currentPage4: 4,
+      currentPage4: 1,
       interviewTypeOptions: [
         {
           value: 1,
@@ -338,43 +342,63 @@ export default {
       },
       //   上传文件
       fileList: [
-        {
-          name: "food.jpeg",
-          url:
-            "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
-        },
-        {
-          name: "food2.jpeg",
-          url:
-            "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
-        },
+        // {
+        //   name: "food.jpeg",
+        //   url:
+        //     "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        // },
+        // {
+        //   name: "food2.jpeg",
+        //   url:
+        //     "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        // },
       ],
       // 表格
      
       //   弹出框
       //   // 添加面试者
       Interviewerform: false,
+      loading:""
     };
   },
   methods: {
     search(){
-      this.searchinfo.entrytime01=this.inputTimeQuery[0]
-      this.searchinfo.entrytime02=this.inputTimeQuery[1]
-      this.searchinfo.invitationtime01=this.invitationTimeInquiry[0]
-      this.searchinfo.invitationtime02=this.invitationTimeInquiry[1]
+      // Mon Jan 18 10:26:59 CST 2021
+      
       console.log(this.searchinfo,"shaixuan")
-       this.$http.get("/getInterviewers",{params:this.searchinfo}).then((res)=>{
+      this.searchinfo.pageNum = 1;
+      this.currentPage4 = 1;
+       this.$http.get("/getInterviewers",{params:this.delsearch()}).then((res)=>{
       this.tableData=res.data.resp.list
+      this.total=res.data.resp.total
+
     });
     },
+    delsearch(){
+      let info = {}
+      this.searchinfo.entrytime01= this.inputTimeQuery[0] && dayjs(this.inputTimeQuery[0]).format("YYYY-MM-DD") 
+      this.searchinfo.entrytime02=this.inputTimeQuery[1] && dayjs(this.inputTimeQuery[1]).format("YYYY-MM-DD")
+      this.searchinfo.invitationtime01= this.invitationTimeInquiry[0] && dayjs(this.invitationTimeInquiry[0]).format("YYYY-MM-DD")
+      this.searchinfo.invitationtime02=this.invitationTimeInquiry[1] && dayjs(this.invitationTimeInquiry[1]).format("YYYY-MM-DD")
+      console.log(this.searchinfo)
+      for(let i in this.searchinfo){
+        if(this.searchinfo[i] != ""){
+          info[i] = this.searchinfo[i]
+        }
+        console.log(this.searchinfo[i])
+      }
+      return info
+    },
     handleSizeChange(e) {
       console.log(e);
     },
     handleCurrentChange(e) {
       this.searchinfo.pageNum=e;
-        this.$http.get("/getInterviewers",{params:this.searchinfo}).then((res)=>{
-      this.tableData=res.data.resp.list
-    });
+        this.$http.get("/getInterviewers",{params:this.delsearch()}).then((res)=>{
+          this.tableData=res.data.resp.list
+          this.total=res.data.resp.total
+
+      });
       console.log(e);
     },
     //   上传文件
@@ -390,6 +414,7 @@ export default {
     //    弹框
     // 添加面试者
     addInterviewer() {
+      this.addinfo = {}
       this.Interviewerform = true; // 显示
       this.newvalue = true; // 传值
     },
@@ -401,9 +426,18 @@ export default {
       this.Interviewerform = true; // 显示
     },
     // 关闭弹框
-    colose() {
+    colose(res) {
       this.Interviewerform = false; // 关闭
       this.newvalue = false; // 传值
+      if(!res){
+        this.searchinfo.pageNum = 1;
+        this.currentPage4 = 1;
+        this.$http.get("/getInterviewers").then((res)=>{
+          this.tableData=res.data.resp.list
+          this.total=res.data.resp.total
+        });
+      }
+      
     },
     // 查看详情
     viewDetails() {
@@ -412,6 +446,7 @@ export default {
     // 面试情况
 
     interviewSituation(e) {
+      console.log(e)
       this.$router.push({path:"/isituation",query:{uid:e.interviewerid,uname:e.name}});
     },
     // 邀约
@@ -419,15 +454,62 @@ export default {
       this.$router.push({path:"/invitation",query: { uid: e.interviewerid ,uname:e.name}});
     },
     // 入职情况
-    entryStatus() {
-      this.$router.push("/entrystatus");
+    entryStatus(e) {
+      this.$router.push({path:"/entrystatus",query: { uid: e.interviewerid ,uname:e.name}});
     },
-  },
-  mounted() {
-    this.$http.get("/getInterviewers").then((res)=>{
+    selfile(file, fileList){
+      // todo 错误
+      console.log(file,fileList)
+      let houzhui = file.name.split(".")
+      console.log(houzhui)
+
+      houzhui = houzhui[houzhui.length - 1]
+      if(houzhui != "xlsx" && houzhui != "xls"){
+        this.$message.error('只能上传excel文件');
+        this.fileList = this.fileList.splice(this.fileList.length,1)
+            // @click="submitUpload"
+      }else{
+        this.submitUpload()
+        this.fileList = []
+        this.loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+      }
+      if(this.fileList.length == 0 && this.loading){
+        this.loading.close()
+        this.loading = ""
+      }
+    },
+    daochu(){
+      // console.log(this.delsearch())
+      this.$http.get("/download",{params:this.delsearch(),responseType: 'blob'}).then((res)=>{
+         let data = res.data
+      if (!data) {
+            return
+       }
+       let url = window.URL.createObjectURL(new Blob([data]))
+       let a = document.createElement('a')
+       a.style.display = 'none'
+       a.href = url
+       a.setAttribute('download','excel.xlsx')
+       document.body.appendChild(a)
+       a.click() //执行下载
+       window.URL.revokeObjectURL(a.href)
+       document.body.removeChild(a)
+      })
+    },
+    getlist(){
+      this.$http.get("/getInterviewers").then((res)=>{
       this.tableData=res.data.resp.list
       this.total=res.data.resp.total
     });
+    }
+  },
+  mounted() {
+    this.getlist()
   },
   //   组件
   components: {
diff --git a/src/layout/components/popUp.vue b/src/layout/components/popUp.vue
index ea6ff43..b5cdd91 100644
--- a/src/layout/components/popUp.vue
+++ b/src/layout/components/popUp.vue
@@ -69,6 +69,7 @@
   </div>
 </template>
 <script>
+import dayjs from "dayjs"
 export default {
   props: {
     title: {
@@ -131,7 +132,7 @@ export default {
   methods: {
     add() {
       console.log(this.Interviewerform, 9090);
-      this.Interviewerform.entrytime=new Date(this.Interviewerform.entrytime).getFullYear()+'/'+parseInt(new Date(this.Interviewerform.entrytime).getMonth()+1)+'/'+new Date(this.Interviewerform.entrytime).getDate()
+      this.Interviewerform.entrytime=this.Interviewerform.entrytime && dayjs(this.Interviewerform.entrytime).format("YYYY-MM-DD") 
        if (
           this.Interviewerform.name != "" &&
           this.Interviewerform.age != "" &&
@@ -150,6 +151,8 @@ export default {
               console.log(res);
               if(res.data.code==200){
                 this.addInterviewer=false
+              this.$emit("close");
+
               }
             });
           }else{
@@ -159,6 +162,7 @@ export default {
               console.log(res);
               if(res.data.code==200){
                 this.addInterviewer=false
+              this.$emit("close");
               }
 
             });
@@ -198,7 +202,8 @@ export default {
     handleColose() {
       // 向父组件传递事件
       // this.$emit()  是个方法 参数为事件名
-      this.$emit("close");
+              this.$emit("close",true);
+
     },
   },
   created() {},
diff --git a/src/main.js b/src/main.js
index 5b84d4b..f699b5f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,8 @@ import "./assets/css/base.css";
 import Axios from "axios";
 Vue.prototype.$http = Axios;
 //连接本地后台接口服务器
-Axios.defaults.baseURL = "http://192.168.3.117:8090/personnal";
-
+Axios.defaults.baseURL = "http://192.168.1.2:8090/personnal";
+Vue.prototype.galoData = {url:"http://192.168.1.2:9333/"}
 //格式化时间
 // Vue.filter('dateFormat', (original) => {
 //   let date = new Date(original*1000);
diff --git a/yarn.lock b/yarn.lock
index d91635c..4bd9e2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2970,6 +2970,11 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+dayjs@^1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.3.tgz#cf3357c8e7f508432826371672ebf376cb7d619b"
+  integrity sha512-/2fdLN987N8Ki7Id8BUN2nhuiRyxTLumQnSQf9CNncFCyqFsSKb9TNhzRYcC8K8eJSJOKvbvkImo/MKKhNi4iw==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"