diff --git a/babel.config.js b/babel.config.js
index c1c0d4d..a9f1eac 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,4 +1,3 @@
 module.exports = {
   plugins: ["@babel/plugin-proposal-optional-chaining"],
-  presets: ["@vue/app", "@vue/cli-plugin-babel/preset"],
 };
diff --git a/src/api/base.js b/src/api/base.js
new file mode 100644
index 0000000..3029f6f
--- /dev/null
+++ b/src/api/base.js
@@ -0,0 +1,60 @@
+import request from "@/router/axios";
+
+export const getBaseList = (query) => {
+  return request({
+    url: "/api/blade-system/dict/common/getServerWindowList",
+    method: "get",
+    params: query,
+  });
+};
+export const getTypeList = (query) => {
+  return request({
+    url: "/api/blade-system/dict/common/getDisputeList",
+    method: "get",
+    params: query,
+  });
+};
+
+export const getRequestList = (query) => {
+  return request({
+    url: "/api/blade-business/serverDisputeConf/getPage",
+    method: "get",
+    params: query,
+  });
+};
+
+export const getRequestDetail = (query) => {
+  return request({
+    url: "/api/blade-business/serverDisputeConf/detail",
+    method: "get",
+    params: query,
+  });
+};
+
+export const saveRequest = (data) => {
+  return request({
+    url: "/api/blade-business/serverDisputeConf/save",
+    method: "post",
+    data,
+  });
+};
+
+export const isOpen = (swId) => {
+  return request({
+    url: "/api/blade-business/serverDisputeConf/enable",
+    method: "post",
+    params: {
+      swId,
+    },
+  });
+};
+
+export const deleteRequest = (swId) => {
+  return request({
+    url: "/api/blade-business/serverDisputeConf/delete",
+    method: "post",
+    params: {
+      swId,
+    },
+  });
+};
diff --git a/src/api/common.js b/src/api/common.js
index 1328c34..d30d32b 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -9,7 +9,7 @@ export const exportBlob = (url, params) => {
   return request({
     url: url,
     params: params,
-    method: 'get',
-    responseType: 'blob'
-  })
-}
+    method: "get",
+    responseType: "blob",
+  });
+};
diff --git a/src/api/register/register.js b/src/api/register/register.js
new file mode 100644
index 0000000..6a500ea
--- /dev/null
+++ b/src/api/register/register.js
@@ -0,0 +1,79 @@
+import request from "@/router/axios";
+
+export const getRegList = (query) => {
+  return request({
+    url: "/api/blade-business/appealReg/getPage",
+    method: "get",
+    params: query,
+  });
+};
+
+export const getResolveList = (query) => {
+  return request({
+    url: "/api/blade-business/appealMediate/getMediateList",
+    method: "get",
+    params: query,
+  });
+};
+
+export const addRegister = (data) => {
+  return request({
+    url: "/api/blade-business/appealReg/save",
+    method: "post",
+    data,
+  });
+};
+
+export const getStreetList = (query) => {
+  return request({
+    url: "/api/blade-system/dict/common/getStreetList",
+    method: "get",
+    params: query,
+  });
+};
+
+// 点击诉求调解
+export const regResolve = (query) => {
+  return request({
+    url: "/api/blade-business/appealMediate/getNewestReg",
+    method: "get",
+    params: query,
+  });
+};
+
+// 点击再次调解
+export const againResolve = (query) => {
+  return request({
+    url: "/api/blade-business/appealReg/getById",
+    method: "get",
+    params: query,
+  });
+};
+
+// 导出记录
+export const exportList = (query) => {
+  return request({
+    url: "/api/blade-business/appealReg/export",
+    method: "get",
+    params: query,
+    responseType: "blob",
+  });
+};
+
+//查看调解记录详情
+export const resolveDetail = (query) => {
+  return request({
+    url: "/api/blade-business/appealMediate/detail",
+    method: "get",
+    params: query,
+  });
+};
+
+// 保存调解记录
+export const saveResolve = (data) => {
+  return request({
+    url: "/api/blade-business/appealMediate/save",
+    method: "post",
+    data,
+  });
+};
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 7e1ad9e..c15fd47 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -83,8 +83,8 @@
             this.$store.commit("SET_SCREEN", admin.getScreen());
           }, 0);
         };
-        this.$store.dispatch("FlowRoutes").then(() => {
-        });
+        // this.$store.dispatch("FlowRoutes").then(() => {
+        // });
       },
       //打开菜单
       openMenu(item = {}) {
diff --git a/src/views/register/add.vue b/src/views/register/add.vue
index c017283..175fcd7 100644
--- a/src/views/register/add.vue
+++ b/src/views/register/add.vue
@@ -139,7 +139,7 @@
                  来访人数
                 <figcaption>
                   <el-input
-                    v-model="form.number"
+                    v-model="form.personNum"
                     size="medium"
                     placeholder="请输入来访人数"
                     clearable
@@ -152,26 +152,26 @@
           </div>
         </el-col>
         <el-col :span="6" style="width: 31%; margin-left: -2.1%">
-          <el-form-item style="width: 100%" prop="streetName">
+          <el-form-item style="width: 100%" prop="streetId">
             <figure>
               <i></i>所属镇街
               <figcaption>
                 <el-select
-                  v-model="form.streetName"
+                  v-model="form.streetId"
                   :disabled="isappend"
                   :filter-method="dataFilter"
                   clearable
                   filterable
                   ref="searchSelect"
-                  placeholder="请选择诉求类型"
+                  placeholder="请选择所属镇街"
                   size="medium"
                   style="width: 90%"
                 >
                   <el-option
-                    v-for="item in optionss"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                    v-for="item in streetData"
+                    :key="item.id"
+                    :label="item.dictValue"
+                    :value="item.id"
                   />
                 </el-select>
               </figcaption>
@@ -179,12 +179,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" style="width: 31%; margin-left: -1.58%">
-          <el-form-item prop="disputeName" style="width: 100%">
+          <el-form-item prop="disputeId" style="width: 100%">
             <figure>
               <i></i>诉求类型
               <figcaption>
                 <el-select
-                  v-model="form.disputeName"
+                  v-model="form.disputeId"
                   :disabled="isappend"
                   :filter-method="dataFilter"
                   clearable
@@ -196,10 +196,10 @@
                   style="width: 90%"
                 >
                   <el-option
-                    v-for="item in optionss"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                    v-for="item in typeData"
+                    :key="item.id"
+                    :label="item.dictValue"
+                    :value="item.id"
                   />
                 </el-select>
               </figcaption>
@@ -227,10 +227,10 @@
                     style="width: 90%"
                   >
                     <el-option
-                      v-for="item in optionss"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                      v-for="item in winData"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
                     />
                   </el-select>
                 </figcaption>
@@ -244,7 +244,7 @@
               &emsp;基层有无协议书
               <figcaption>
                 <el-input
-                  v-model="form.hasProtocol"
+                  v-model="form.protocol"
                   size="medium"
                   placeholder="请输入基层有无协议书"
                   clearable
@@ -260,7 +260,7 @@
               &emsp;基层有无处理意见
               <figcaption>
                 <el-input
-                  v-model="form.hasOpinion"
+                  v-model="form.opinion"
                   size="medium"
                   placeholder="请输入基层有无处理意见"
                   clearable
@@ -279,7 +279,7 @@
                 &emsp;部门有无复查意见
                 <figcaption>
                   <el-input
-                    v-model="form.hasReviewOpinion"
+                    v-model="form.reviewOpinion"
                     size="medium"
                     placeholder="请输入部门有无复查意见"
                     clearable
@@ -316,7 +316,7 @@
               &emsp;诉求初登时间
               <figcaption>
                 <el-input
-                  v-model="form.legalPaper"
+                  v-model="form.firstRegTime"
                   size="medium"
                   placeholder="请输入诉求初登时间"
                   clearable
@@ -362,20 +362,21 @@
 
 <script>
 import { mapGetters } from "vuex";
-
+import {addRegister,getStreetList,againResolve} from "@/api/register/register"
+import {getBaseList,getTypeList} from "@/api/base"
 export default {
   data() {
     return {
       form: {
-        number: "",
+        personNum: "",
       },
       pageType: "",
       title: "",
       rules: {
-        streetName: [
+        streetId: [
           { required: true, message: "请选择所属镇街", trigger: "change" },
         ],
-        disputeName: [
+        disputeId: [
           { required: true, message: "请选择诉求类型", trigger: "change" },
         ],
         
@@ -391,75 +392,104 @@ export default {
           phone: "",
         },
       ],
+      streetData:[],
+      winData:[],
+      typeData:[]
     };
   },
   watch: {},
   created() {
-    console.log(this.$route);
+    this.getStreet();
+    this.getTypeData();
+    this.getWinData()
     if (this.$route.query.type == "add") {
       this.pageType = "add";
       this.title = "诉求登记";
     } else if (this.$route.query.type == "edit") {
       this.title = "再次调解登记";
       this.pageType = "edit";
-      this.formData = [
-        {
-          username: "张三",
-          gender: "1",
-          age: 20,
-          cardno: "3708821548488178",
-          address: "洋河镇",
-          addressNow: "洋河镇",
-          phone: "13564854126",
-        },
-        {
-          username: "李四",
-          gender: "1",
-          age: 20,
-          cardno: "3708821548488178",
-          address: "洋河镇",
-          addressNow: "洋河镇",
-          phone: "13564854126",
-        },
-        {
-          username: "王二狗",
-          gender: "1",
-          age: 20,
-          cardno: "3708821548488178",
-          address: "洋河镇",
-          addressNow: "洋河镇",
-          phone: "13564854126",
-        },
-        {
-          username: "王五",
-          gender: "1",
-          age: 20,
-          cardno: "3708821548488178",
-          address: "洋河镇",
-          addressNow: "洋河镇",
-          phone: "13564854126",
-        },
-      ];
-      // this.form.number = this.formData.length
-      this.form = {
-        number: this.formData.length,
-        id: "122555646684684",
-        streetName: "胶州市",
-        disputeName: "土地纠纷",
-        disposeDept: "市住建局",
-        hasProtocol: "无协议书",
-        hasOpinion: "无处理意见",
-        hasReviewOpinion: "无复查意见",
-        legalPaper: "无法律文书",
-        regTime: "2012-05-15 12:30",
-        problemDesc: "矛盾描述...........",
-      };
+      this.getAgainDetail()
+      // this.formData = [
+      //   {
+      //     username: "张三",
+      //     gender: "1",
+      //     age: 20,
+      //     cardno: "3708821548488178",
+      //     address: "洋河镇",
+      //     addressNow: "洋河镇",
+      //     phone: "13564854126",
+      //   },
+      //   {
+      //     username: "李四",
+      //     gender: "1",
+      //     age: 20,
+      //     cardno: "3708821548488178",
+      //     address: "洋河镇",
+      //     addressNow: "洋河镇",
+      //     phone: "13564854126",
+      //   },
+      //   {
+      //     username: "王二狗",
+      //     gender: "1",
+      //     age: 20,
+      //     cardno: "3708821548488178",
+      //     address: "洋河镇",
+      //     addressNow: "洋河镇",
+      //     phone: "13564854126",
+      //   },
+      //   {
+      //     username: "王五",
+      //     gender: "1",
+      //     age: 20,
+      //     cardno: "3708821548488178",
+      //     address: "洋河镇",
+      //     addressNow: "洋河镇",
+      //     phone: "13564854126",
+      //   },
+      // ];
+      // // this.form.number = this.formData.length
+      // this.form = {
+      //   number: this.formData.length,
+      //   id: "122555646684684",
+      //   streetId: "胶州市",
+      //   disputeId: "土地纠纷",
+      //   disposeDept: "市住建局",
+      //   hasProtocol: "无协议书",
+      //   hasOpinion: "无处理意见",
+      //   hasReviewOpinion: "无复查意见",
+      //   legalPaper: "无法律文书",
+      //   regTime: "2012-05-15 12:30",
+      //   problemDesc: "矛盾描述...........",
+      // };
     }
   },
   computed: {
     ...mapGetters(["tagWel", "tagList", "tag", "website"]),
   },
   methods: {
+    getStreet(){
+      getStreetList().then(res =>{
+        this.streetData = res.data.data
+      })
+    },
+    getAgainDetail(){
+      againResolve({appealId:this.$route.query.appealId}).then(res =>{
+        console.log('再次调解',res);
+        this.formData = res.data.data.visitors;
+        this.form = res.data.data;
+        this.form.personNum = this.formData.length
+      })
+    },
+    getWinData(){
+      getBaseList().then(res =>{
+        this.winData = res.data.data
+      })
+    },
+    getTypeData(){
+      getTypeList().then(res =>{
+        this.typeData = res.data.data
+      })
+    },
     findTag(value) {
       let tag, key;
       this.tagList.map((item, index) => {
@@ -472,7 +502,7 @@ export default {
     },
     changeNumber() {
       let tmp = this.formData.filter((item) => item.name !== "");
-      this.form.number = tmp.length;
+      this.form.personNum = tmp.length;
     },
     handleCancel() {
       let { tag, key } = this.findTag(this.$route.fullPath);
@@ -480,7 +510,7 @@ export default {
       if (tag.value === this.tag.value) {
         tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
         this.$router.push({
-          path: "/request/index",
+          path: "/register/index",
         });
       }
     },
@@ -512,16 +542,52 @@ export default {
     removeSpecimen(index, row) {
       this.formData.splice(index, 1);
       let tmp = this.formData.filter((item) => item.name !== "");
-      this.form.number = tmp.length;
+      this.form.personNum = tmp.length;
     },
     submitForm() {
       this.$refs["registerForm"].validate((valid) => {
         if(valid){
-            console.log(this.form)
-            console.log(this.formData)
+          let params = {}
             if(this.formData.length !== 0){
                 let tmp = this.formData.filter(item => item.username !== '')
-                
+                if(this.pageType == 'add'){
+                  params={
+                    visitors:tmp,
+                    ...this.form
+                  }
+                  console.log(params)
+                  addRegister(params).then(res =>{
+                    if(res.data.code == 200){
+                      this.$message.success('登记成功！')
+                      let { tag, key } = this.findTag(this.$route.fullPath);
+                      this.$store.commit("DEL_TAG", tag);
+                      if (tag.value === this.tag.value) {
+                        tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
+                        this.$router.push({
+                          path: "/register/index",
+                        });
+                      }
+                    }
+                  })
+                }else if(this.pageType == 'edit'){
+                  params={
+                    ...this.form,
+                    visitors:tmp,
+                  }
+                  addRegister(params).then(res =>{
+                    if(res.data.code == 200){
+                      this.$message.success('登记成功！')
+                      let { tag, key } = this.findTag(this.$route.fullPath);
+                      this.$store.commit("DEL_TAG", tag);
+                      if (tag.value === this.tag.value) {
+                        tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
+                        this.$router.push({
+                          path: "/register/index",
+                        });
+                      }
+                    }
+                  })
+                }
             }else{
                 this.$message.error('登记人员列表不可为空')
             }
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index 3bf0447..d6e068b 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -18,7 +18,7 @@
       @on-load="onLoad"
     >
       <template slot-scope="scope" slot="reStatusSearch">
-        <el-select v-model="form.reStatus" placeholder="请选择诉求状态">
+        <el-select v-model="form.getRegList" placeholder="请选择诉求状态">
           <el-option
             v-for="item in statusData"
             :key="item.value"
@@ -41,9 +41,9 @@
         <el-select v-model="form.reType" placeholder="请选择诉求类型">
           <el-option
             v-for="item in typeData"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            :key="item.id"
+            :label="item.dictValue"
+            :value="item.id"
           ></el-option>
         </el-select>
       </template>
@@ -51,9 +51,9 @@
         <el-select v-model="form.windows" placeholder="请选择处理窗口">
           <el-option
             v-for="item in winData"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
           ></el-option>
         </el-select>
       </template>
@@ -61,18 +61,21 @@
         <el-input v-model="form.name" placeholder="请输入代表姓名"></el-input>
       </template>
       <template slot-scope="{ row }" slot="menu">
-        <!-- <el-button
+        <el-button
           size="small"
           @click="handleRegis(row)"
+          v-show="permission.register_add && row.status == 1"
           >再次调解</el-button
-        > -->
+        >
          <el-button
           size="small"
           @click="handleRecon(row)"
+          v-show="permission.appeal_resolve"
           >诉求调解</el-button
         >
         <el-button
           size="small"
+          v-show="permission.register_list && row.status !== 0"
           @click="handleList(row)"
           >调解记录</el-button
         >
@@ -80,20 +83,37 @@
       <template slot-scope="scope" slot="status">
         <div v-show="scope.row.status == 0" style="color: #529ce5">待处理</div>
         <div v-show="scope.row.status == 1" style="color: #91b337">正在处理</div>
-        <div v-show="scope.row.status == 2" style="color: #e99f42">达成协议</div>
+        <div v-show="scope.row.status == 2" style="color: #101010">达成协议</div>
         <div v-show="scope.row.status == 3" style="color: #101010">调解成功</div>
       </template>
-      <template slot-scope="scope" slot="endTime">
-        <div>{{scope.row.endTime !== '' ? scope.row.endTime : '---/-/---'}}</div>
+      <template slot-scope="scope" slot="finishTime">
+        <div>{{scope.row.finishTime !== '' ? scope.row.finishTime : '---/-/---'}}</div>
       </template>
       <template slot-scope="scope" slot="menuLeft">
         <el-button
           type="primary"
-          icon="el-icon-plus"
           size="small"
           @click="addRegister"
+          v-show="permission.appeal_register"
           >诉求登记</el-button
         >
+        <el-button
+          type="success"
+          size="small"
+          @click="exportRegister"
+          >导出</el-button
+        >
+        <!-- <div> -->
+          <el-upload
+          class="upload-demo"
+          action="/api/blade-business/appealReg/importData"
+          :on-success="handleSuccess"
+          :show-file-list="false"
+          multiple>
+          <el-button size="small" type="primary">导入</el-button>
+      </el-upload>
+        <!-- </div> -->
+       
       </template>
     </avue-crud>
     <el-dialog
@@ -106,7 +126,7 @@
     >
     <div class="list">
         <div class="list_box" v-for="item in listData" :key="item.time" @click="listView(item)">
-            <div  class="time_txt">{{item.mediateTime}}<span style="margin-left:20px">调解记录</span></div>
+            <div  class="time_txt">{{item.talkingTime}}<span style="margin-left:20px">调解记录</span></div>
         </div>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -119,6 +139,8 @@
 
 <script>
 import { mapGetters } from "vuex";
+import {getBaseList,getTypeList} from "@/api/base"
+import {getRegList,getResolveList,regResolve,againResolve,exportList} from "@/api/register/register"
 export default {
   data() {
     return {
@@ -131,18 +153,7 @@ export default {
         { label: "达成协议", value: "2" },
         { label: "调解成功", value: "3" },
       ],
-      listData:[
-        {
-          id: "122555646684684",
-          mediateTime: "2012-05-15 12:30",
-          talkingAdvice: "接谈意见..........."
-        },
-        {
-          id: "122555646684684",
-          mediateTime: "2022-05-15 12:30",
-          talkingAdvice: "接谈意见..........."
-        }  
-      ],
+      listData:[],
       typeData:[
         {label:'邻里纠纷',value:0},
         {label:'婚姻纠纷',value:1},
@@ -220,7 +231,7 @@ export default {
           },
           {
             label: "代表姓名",
-            prop: "peoName",
+            prop: "username",
             align: "center",
             overHidden:true,
             width:70,
@@ -229,31 +240,31 @@ export default {
             label: "身份证号码",
             overHidden:true,
             width:150,
-            prop: "ic_card",
+            prop: "cardno",
             align: "center",
           },
           {
             label: "诉求类型",
             overHidden:true,
-            prop: "type",
+            prop: "disputeName",
             align: "center",
           },
           {
             label: "登记时间",
             overHidden:true,
-            prop: "time",
+            prop: "firstRegTime",
             align: "center",
           },
           {
             label: "办结时间",
             slot:true,
-            prop: "endTime",
+            prop: "finishTime",
             align: "center",
           },
           {
             label: "反应主要问题",
             overHidden:true,
-            prop: "question",
+            prop: "problemDesc",
             align: "center",
           },
           {
@@ -273,21 +284,39 @@ export default {
     ...mapGetters(["permission"]),
   },
   created() {
-    this.getTime()
+    this.getTime();
+    this.getWinData();
+    this.getTypeData()
     console.log(this.permission)
   },
   methods: {
-    handleList(){
-        this.dialogVisible = true
+    getWinData(){
+      getBaseList().then(res =>{
+        this.winData = res.data.data
+      })
+    },
+    getTypeData(){
+      getTypeList().then(res =>{
+        this.typeData = res.data.data
+      })
     },
-    handleRegis(){
-      this.$router.push({ path: "/register/add",query:{type:'edit'} });
+    handleList(row){
+      console.log(row)
+        this.dialogVisible = true;
+        getResolveList({appealId:row.id}).then(res =>{
+          console.log('res',res)
+          this.listData = res.data.data
+        })
     },
-    handleRecon(){
-      this.$router.push({ path: "/register/recon",query:{type:'recon',time:this.date + ' ' + this.time} });
+    handleRegis(row){
+      this.$router.push({ path: "/register/add",query:{type:'edit',appealId:row.id} });
+    },
+    handleRecon(row){
+      console.log(row)
+      this.$router.push({ path: "/register/recon",query:{type:'recon',time:this.date + ' ' + this.time,id:row.id} });
     },
     listView(row){
-      this.$router.push({ path: "/register/recon",query:{type:'view',time:row.mediateTime,id:row.id} });
+      this.$router.push({ path: "/register/recon",query:{type:'view',time:row.mediateTime,id:row.mediateId} });
     },
     searchReset() {
       this.query = {};
@@ -301,6 +330,12 @@ export default {
       this.onLoad(this.page, this.form);
       done();
     },
+    handleSuccess(res){
+      console.log(res)
+      if(res.code == 200){
+        this.$message.success('上传成功')
+      }
+    },
     fn(str) {
       let num = null;
       str >= 10 ? (num = str) : (num = "0" + str);
@@ -318,32 +353,91 @@ export default {
         this.day = date.getDay(); //获取当前星期几
         // this.getWeek(this.day);
         this.time = this.fn(hours) + ":" + this.fn(minute);
-        this.date = year + "/" + (month + 1) + "/" + data;
+        this.date = year + "-" + (month + 1) + "-" + data;
     },
     onLoad() {
-      this.loading = false;
-      this.data = [
-        {   peoName: "王二狗", ic_card: "370212188501******", type:'合同纠纷',
-            time:'2020-12-01 09:23',endTime:"2023-05-22 09:12",
-            question:'此处反应问题问合同纠纷类问题，此处反应问题问合同纠纷类问题',status: 0 
-        },
-        {   peoName: "张三，李四", ic_card: "371212199501******", type:'合同纠纷',
-            time:'2020-12-01 09:23',endTime:"",
-            question:'此处反应问题问合同纠纷类问题',status: 1 
-        },
-        {   peoName: "王五", ic_card: "371212199501******,371212199501******", type:'合同纠纷',
-            time:'2020-12-01 09:23',endTime:"2023-05-22 09:12",
-            question:'此处反应问题问合同纠纷类问题',status: 2 
-        },
-        {   peoName: "王五", ic_card: "371212199501******,371212199501******", type:'合同纠纷',
-            time:'2020-12-01 09:23',endTime:"2023-05-22 09:12",
-            question:'此处反应问题问合同纠纷类问题',status: 3 
-        },
-      ];
-      this.page.total = this.data.length;
+      let params = {}
+      if(this.form.timeRange){
+        params = {
+          appealStatus:this.form.getRegList,
+          startTime:this.form.timeRange[0],
+          endTime:this.form.timeRange[1],
+          appealType:this.form.reType,
+          windowId:this.form.windows,
+          username:this.form.name,
+          current:this.page.currentPage,
+          size:this.page.pageSize
+        }
+      }else{
+        params = {
+          appealStatus:this.form.getRegList,
+          appealType:this.form.reType,
+          windowId:this.form.windows,
+          username:this.form.name,
+          current:this.page.currentPage,
+          size:this.page.pageSize
+        }
+      }
+      getRegList(params).then(res =>{
+        console.log('res==>',res)
+        this.loading = false;
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total
+      })
     },
     addRegister() {
       this.$router.push({ path: "/register/add",query:{type:'add'} });
+    },
+    exportRegister(){
+      let params = {}
+      if(this.form.timeRange){
+        params = {
+          appealStatus:this.form.getRegList,
+          startTime:this.form.timeRange[0],
+          endTime:this.form.timeRange[1],
+          appealType:this.form.reType,
+          windowId:this.form.windows,
+          username:this.form.name,
+        }
+      }else{
+        params = {
+          appealStatus:this.form.getRegList,
+          appealType:this.form.reType,
+          windowId:this.form.windows,
+          username:this.form.name,
+        }
+      };
+      exportList(params).then(res =>{
+        console.log(res)
+        if (!res || !res.data) {
+          this.$message({
+            type: 'error',
+            message: "导出失败！"
+          });
+          return;
+        }
+        let blob = new Blob([res.data]);//response.data为后端传的流文件
+        let downloadFilename = '诉求登记' + '.xlsx';//设置导出的文件名
+        if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+          //兼容ie浏览器
+          window.navigator.msSaveOrOpenBlob(blob, downloadFilename)
+        }else {
+          //谷歌,火狐等浏览器
+            let url = window.URL.createObjectURL(blob);
+            let downloadElement = document.createElement("a");
+            downloadElement.style.display = "none";
+            downloadElement.href = url;
+            downloadElement.download = downloadFilename;
+            document.body.appendChild(downloadElement);
+            downloadElement.click();
+            document.body.removeChild(downloadElement);
+            window.URL.revokeObjectURL(url);
+        }
+       this.$message({type: "success", message: '导出成功！'}); 
+      })
+    },
+    importRegister(){
+
     },
     handleEdit() {
       this.$router.push({ path: "/request/add" });
@@ -390,6 +484,10 @@ export default {
         }
     }
 }
+
+.upload-demo{
+  float: right;
+}
 </style>
 <style scoped>
 
diff --git a/src/views/register/recon.vue b/src/views/register/recon.vue
index 4bcde10..f1402b4 100644
--- a/src/views/register/recon.vue
+++ b/src/views/register/recon.vue
@@ -140,7 +140,7 @@
                 &emsp;来访人数
                 <figcaption>
                   <el-input
-                    v-model="form.number"
+                    v-model="form.personNum"
                     size="medium"
                     placeholder="请输入来访人数"
                     clearable
@@ -158,7 +158,7 @@
               &emsp;所属镇街
               <figcaption>
                 <el-select
-                  v-model="form.streetName"
+                  v-model="form.streetId"
                   :disabled="isappend"
                   :filter-method="dataFilter"
                   clearable
@@ -169,10 +169,10 @@
                   style="width: 90%"
                 >
                   <el-option
-                    v-for="item in optionss"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                    v-for="item in streetData"
+                    :key="item.id"
+                    :label="item.dictValue"
+                    :value="item.id"
                   />
                 </el-select>
               </figcaption>
@@ -185,7 +185,7 @@
               &emsp;诉求类型
               <figcaption>
                 <el-select
-                  v-model="form.disputeName"
+                  v-model="form.disputeId"
                   :disabled="isappend"
                   :filter-method="dataFilter"
                   clearable
@@ -197,10 +197,10 @@
                   style="width: 90%"
                 >
                   <el-option
-                    v-for="item in optionss"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                    v-for="item in typeData"
+                    :key="item.id"
+                    :label="item.dictValue"
+                    :value="item.id"
                   />
                 </el-select>
               </figcaption>
@@ -228,10 +228,10 @@
                     style="width: 90%"
                   >
                     <el-option
-                      v-for="item in optionss"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                      v-for="item in winData"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
                     />
                   </el-select>
                 </figcaption>
@@ -245,7 +245,7 @@
               &emsp;基层有无协议书
               <figcaption>
                 <el-input
-                  v-model="form.hasProtocol"
+                  v-model="form.protocol"
                   size="medium"
                   placeholder="请输入基层有无协议书"
                   clearable
@@ -261,7 +261,7 @@
               &emsp;基层有无处理意见
               <figcaption>
                 <el-input
-                  v-model="form.hasOpinion"
+                  v-model="form.opinion"
                   size="medium"
                   placeholder="请输入基层有无处理意见"
                   clearable
@@ -280,7 +280,7 @@
                 &emsp;部门有无复查意见
                 <figcaption>
                   <el-input
-                    v-model="form.hasReviewOpinion"
+                    v-model="form.reviewOpinion"
                     size="medium"
                     placeholder="请输入部门有无复查意见"
                     clearable
@@ -351,56 +351,57 @@
           </div>
         </el-col>
       </el-row>
-      <div class="title" style=" width: 98%;
-        margin: 0 auto;
-        margin-bottom: 25px;">信访事项接谈记录</div>
-      <el-table 
+      <div
+        class="title"
+        style="width: 98%; margin: 0 auto; margin-bottom: 25px"
+      >
+        信访事项接谈记录
+      </div>
+      <el-table
         :data="recordData"
         :key="index"
         border
         class="record_tab"
         style="
-            margin-bottom: 30px;
-            width: 100%;
-            margin: 0 auto;
-            border-radius: 4px;
+          margin-bottom: 30px;
+          width: 100%;
+          margin: 0 auto;
+          border-radius: 4px;
         "
         :cell-class-name="addClass"
-        header-cell-style="background-color:#fafafa;font-size:12px;color:black">
-         <el-table-column
-            align="center"
-            prop="talkingTime"
-            label="接谈时间"
-            width="200"
+        header-cell-style="background-color:#fafafa;font-size:12px;color:black"
+      >
+        <el-table-column
+          align="center"
+          prop="talkingTime"
+          label="接谈时间"
+          width="200"
         >
-            <template slot-scope="scope">
+          <template slot-scope="scope">
             <el-input
-                v-model="scope.row.talkingTime"
-                controls-position="right"
-                style="width: 90%; margin-left: 5%"
-                size="medium"
-                :readonly="true"
-                placeholder="接谈时间"
+              v-model="scope.row.talkingTime"
+              controls-position="right"
+              style="width: 90%; margin-left: 5%"
+              size="medium"
+              :readonly="true"
+              placeholder="接谈时间"
             >
             </el-input>
-            </template>
+          </template>
         </el-table-column>
-        <el-table-column
-            align="center"
-            prop="talkingHis"
-            label="接谈记录详情"
-        >
-            <template slot-scope="scope">
+        <el-table-column align="center" prop="talkingHis" label="接谈记录详情">
+          <template slot-scope="scope">
             <el-input
-                    type="textarea"
-                    :autosize="{ minRows: 2 }"
-                    v-model="scope.row.talkingHis"
-                    size="medium"
-                    placeholder="请输入部门有无复查意见"
-                    clearable
-                    style="width: 90%">
+              type="textarea"
+              :autosize="{ minRows: 2 }"
+              v-model="scope.row.talkingHis"
+              size="medium"
+              placeholder="请输入接谈记录详情"
+              clearable
+              style="width: 90%"
+            >
             </el-input>
-            </template>
+          </template>
         </el-table-column>
       </el-table>
       <el-row :model="form" :rules="rules" :gutter="20">
@@ -468,10 +469,10 @@
                     multiple
                   >
                     <el-option
-                      v-for="item in optionss"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                      v-for="item in winData"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
                     />
                   </el-select>
                 </figcaption>
@@ -485,25 +486,25 @@
               &emsp;抄送单位
               <figcaption>
                 <el-select
-                    v-model="form.copyDeptIds"
-                    :disabled="isappend"
-                    :filter-method="dataFilter"
-                    clearable
-                    filterable
-                    allow-create
-                    ref="searchSelect"
-                    placeholder="请选择单位"
-                    size="medium"
-                    style="width: 90%"
-                    multiple
-                  >
-                    <el-option
-                      v-for="item in optionss"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
+                  v-model="form.copyDeptIds"
+                  :disabled="isappend"
+                  :filter-method="dataFilter"
+                  clearable
+                  filterable
+                  allow-create
+                  ref="searchSelect"
+                  placeholder="请选择单位"
+                  size="medium"
+                  style="width: 90%"
+                  multiple
+                >
+                  <el-option
+                    v-for="item in winData"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
               </figcaption>
             </figure>
           </el-form-item>
@@ -526,7 +527,7 @@
                   style="width: 90%"
                 >
                   <el-option
-                    v-for="item in optionss"
+                    v-for="item in enentLevel"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -545,24 +546,24 @@
                 <i></i> 办理状态
                 <figcaption>
                   <el-select
-                  v-model="form.status"
-                  :disabled="isappend"
-                  :filter-method="dataFilter"
-                  clearable
-                  filterable
-                  allow-create
-                  ref="searchSelect"
-                  placeholder="请选择办理状态"
-                  size="medium"
-                  style="width: 90%"
-                >
-                  <el-option
-                    v-for="item in optionss"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
+                    v-model="form.status"
+                    :disabled="isappend"
+                    :filter-method="dataFilter"
+                    clearable
+                    filterable
+                    allow-create
+                    ref="searchSelect"
+                    placeholder="请选择办理状态"
+                    size="medium"
+                    style="width: 90%"
+                  >
+                    <el-option
+                      v-for="item in statusData"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
                 </figcaption>
               </figure>
             </el-form-item>
@@ -574,10 +575,13 @@
               &emsp;反馈时限
               <figcaption>
                 <el-date-picker
-                v-model="form.feedbackDeadline"
-                type="datetime"
-                style="width: 90%"
-                placeholder="选择日期时间">
+                  v-model="form.feedbackDeadline"
+                  type="datetime"
+                  style="width: 90%"
+                  placeholder="选择日期时间"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
                 </el-date-picker>
               </figcaption>
             </figure>
@@ -589,10 +593,13 @@
               <i></i> 办结时限
               <figcaption>
                 <el-date-picker
-                v-model="form.finishDeadline"
-                type="datetime"
-                style="width: 90%"
-                placeholder="选择日期时间">
+                  v-model="form.finishDeadline"
+                  type="datetime"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  style="width: 90%"
+                  placeholder="选择日期时间"
+                >
                 </el-date-picker>
               </figcaption>
             </figure>
@@ -602,9 +609,9 @@
       <el-row :model="form" :rules="rules" :gutter="20">
         <el-col style="width: 100%; margin-left: 1%">
           <div class="grid-content bg-purple">
-            <el-form-item  style="width: 100%">
+            <el-form-item style="width: 100%">
               <figure>
-               &emsp; 备注
+                &emsp; 备注
                 <figcaption>
                   <el-input
                     type="textarea"
@@ -628,10 +635,13 @@
               &emsp;来访时间
               <figcaption>
                 <el-date-picker
-                v-model="form.visitTime"
-                type="datetime"
-                style="width: 90%"
-                placeholder="选择来访时间">
+                  v-model="form.visitTime"
+                  type="datetime"
+                  style="width: 90%"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择来访时间"
+                >
                 </el-date-picker>
               </figcaption>
             </figure>
@@ -643,10 +653,13 @@
               &emsp; 提交时间
               <figcaption>
                 <el-date-picker
-                v-model="form.finishDeadline"
-                type="datetime"
-                style="width: 90%"
-                placeholder="选择提交时间">
+                  v-model="form.submitTime"
+                  type="datetime"
+                  style="width: 90%"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择提交时间"
+                >
                 </el-date-picker>
               </figcaption>
             </figure>
@@ -655,42 +668,44 @@
       </el-row>
       <el-row :model="form" :rules="rules" :gutter="20">
         <el-col style="width: 100%; margin-left: 1%">
-            <el-form-item prop="imgs">
+          <el-form-item >
             <figure>
               &emsp; 上传附件
               <figcaption>
-                    <el-upload
-                    v-model="form.imgs"
-                    class="upload_box"
-                    :class="imgList.length >= 5 ? 'hide' : ''"
-                    :headers="headers"
-                    action="https://jsonplaceholder.typicode.com/posts/"
-                    :data={imgType:1}
-                    list-type="picture-card"
-                    :on-preview="handlePictureCardPreview"
-                    :on-success="handleAvatarSuccess"
-                    :on-remove="handleRemove1"
-                    :before-upload="beforeAvatarUpload"
-                    :file-list="fileList"
-                    limit="5"
-                    accept=".jpg,.png"
-                    >
-                        <div class="up_box" v-show="imgList.length < 5">
-                            <div class="upload_item">
-                                <div class="img">
-                                    <img src="~@/assets/image/upload.png" alt="">
-                                </div>
-                                <div>上传图片</div>
-                            </div>
-                            <div class="upload_tip">
-                                <span class="txt">上传文件：jpg、png  图片尺寸：682*310px</span>
-                                <span class="txt">文件大小：≤1M</span>
-                            </div>
-                        </div>
-                    </el-upload>
+                <el-upload
+                  v-model="form.fileList"
+                  class="upload_box"
+                  :class="imgList.length >= 5 ? 'hide' : ''"
+                  :headers="headers"
+                  action="/api/blade-resource/oss/endpoint/put-file"
+                  :data="{ imgType: 1 }"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-success="handleAvatarSuccess"
+                  :on-remove="handleRemove1"
+                  :before-upload="beforeAvatarUpload"
+                  :file-list="fileList"
+                  limit="5"
+                  accept=".jpg,.png"
+                >
+                  <div class="up_box" v-show="imgList.length < 5">
+                    <div class="upload_item">
+                      <div class="img">
+                        <img src="~@/assets/image/upload.png" alt="" />
+                      </div>
+                      <div>上传图片</div>
+                    </div>
+                    <div class="upload_tip">
+                      <span class="txt"
+                        >上传文件：jpg、png 图片尺寸：682*310px</span
+                      >
+                      <span class="txt">文件大小：≤1M</span>
+                    </div>
+                  </div>
+                </el-upload>
               </figcaption>
             </figure>
-             </el-form-item>
+          </el-form-item>
         </el-col>
       </el-row>
       <el-form-item class="btn_box" v-show="pageType == 'recon'">
@@ -700,29 +715,51 @@
         >
       </el-form-item>
     </el-form>
-    
   </basic-container>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
-
+import { regResolve,resolveDetail,getStreetList,saveResolve } from "@/api/register/register";
+import {getBaseList,getTypeList} from "@/api/base"
+import { getToken } from "@/util/auth";
 export default {
   data() {
     return {
       form: {
         number: "",
       },
-      imgList:[],
+      imgList: [],
+      enentLevel:[
+        {value:0,label:'简单'},
+        {value:1,label:'一般'},
+        {value:2,label:'重大'},
+        {value:3,label:'疑难'},
+      ],
+      statusData:[
+        {value:1,label:'正在处理'},
+        {value:2,label:'达成协议'},
+        {value:3,label:'调解成功'},
+      ],
+      headers: {
+        "Blade-Auth": "",
+      }, //认证
+      streetData:[],
+      winData:[],
+      typeData:[],
       pageType: "",
       title: "",
-      activated:'',
+      activated: "",
       rules: {
         problemDesc: [
           { required: true, message: "请填写反应主要问题", trigger: "change" },
         ],
         attitude: [
-          { required: true, message: "请输入上访人意见和态度", trigger: "change" },
+          {
+            required: true,
+            message: "请输入上访人意见和态度",
+            trigger: "change",
+          },
         ],
         talkingAdvice: [
           { required: true, message: "请输入接谈意见", trigger: "change" },
@@ -745,120 +782,133 @@ export default {
           phone: "",
         },
       ],
-      recordData:[],
-      
+      recordData: [],
     };
   },
   watch: {},
   created() {
-    console.log(this.$route);
+     this.headers["Blade-Auth"] = "bearer " + getToken();
+    this.getStreet();
+    this.getTypeData();
+    this.getWinData()
     if (this.$route.query.type == "recon") {
       this.pageType = "recon";
       this.title = "诉求调解";
-      this.formData = [
-        {
-          username: "张三",
-          gender: "1",
-          age: 20,
-          cardno: "3708821548488178",
-          address: "洋河镇",
-          addressNow: "洋河镇",
-          phone: "13564854126",
-        },
-         {
-          username: "李四",
-          gender: "1",
-          age: 20,
-          cardno: "3708821548488178",
-          address: "洋河镇",
-          addressNow: "洋河镇",
-          phone: "13564854126",
-        },
-      ]
-      this.form = {
-        number: this.formData.length,
-        id: "122555646684684",
-        streetName: "胶州市",
-        disputeName: "土地纠纷",
-        disposeDept: "市住建局",
-        hasProtocol: "无协议书",
-        hasOpinion: "无处理意见",
-        hasReviewOpinion: "无复查意见",
-        legalPaper: "无法律文书",
-        regTime: "2012-05-15 12:30",
-        problemDesc: "矛盾描述...........",
-      };
-      this.recordData.push({talkingTime:this.$route.query.time,talkingHis:''})
+      this.getDetail();
+      // this.recordData.push({talkingTime:this.$route.query.time,talkingHis:''})
     } else if (this.$route.query.type == "view") {
-      this.title = this.$route.query.time + ' ' + "调解记录";
+      this.title = this.$route.query.time + " " + "调解记录";
       this.pageType = "edit";
-      this.activated = this.$route.query.id
-      this.formData = [
-        {
-          username: "王二狗",
-          gender: "1",
-          age: 20,
-          cardno: "3708821548488178",
-          address: "洋河镇",
-          addressNow: "洋河镇",
-          phone: "13564854126",
-        },
-        {
-          username: "王五",
-          gender: "1",
-          age: 20,
-          cardno: "3708821548488178",
-          address: "洋河镇",
-          addressNow: "洋河镇",
-          phone: "13564854126",
-        },
-      ];
-      this.recordData = [
-        {
-            id: "122555646684684",
-            talkingTime: "2022-06-03 12:05",
-            talkingHis: "第一次接谈意见..........."
-        },
-        {
-            id: "调解记录id",
-            talkingTime: "2022-06-02 10:05",
-            talkingHis: "第二次接谈意见..........."
-        } 
-      ]
-      this.form = {
-        number: this.formData.length,
-        id: "调解记录id",
-        appealId: "诉求ID",
-        appealRegId: "诉求登记ID",
-        streetName: "胶州市",
-        disputeLevel: "事件等级",
-        status: "诉求状态",
-        disputeName: "土地纠纷",
-        disposeDept: "市住建局",
-        hasProtocol: "无协议书",
-        hasOpinion: "无处理意见",
-        hasReviewOpinion: "无复查意见",
-        legalPaper: "无法律文书",
-        regTime: "2012-05-15 12:30",
-        problemDesc: "矛盾描述...........",
-        attitude: "上访人意见",
-        dutyDeptNames: "负责部门名称, 以逗号分割",
-        copyDeptNames: "抄送部门名称, 以逗号分割",
-        feedbackDeadline: "2022-12-02",
-        finishDeadline: "2022-12-02",
-        remark: "备注",
-        submitTime: "2022-08-19",
-      };
+      this.activated = this.$route.query.id;
+      // this.formData = [
+      //   {
+      //     username: "王二狗",
+      //     gender: "1",
+      //     age: 20,
+      //     cardno: "3708821548488178",
+      //     address: "洋河镇",
+      //     addressNow: "洋河镇",
+      //     phone: "13564854126",
+      //   },
+      //   {
+      //     username: "王五",
+      //     gender: "1",
+      //     age: 20,
+      //     cardno: "3708821548488178",
+      //     address: "洋河镇",
+      //     addressNow: "洋河镇",
+      //     phone: "13564854126",
+      //   },
+      // ];
+      // this.recordData = [
+      //   {
+      //     id: "122555646684684",
+      //     talkingTime: "2022-06-03 12:05",
+      //     talkingHis: "第一次接谈意见...........",
+      //   },
+      //   {
+      //     id: "调解记录id",
+      //     talkingTime: "2022-06-02 10:05",
+      //     talkingHis: "第二次接谈意见...........",
+      //   },
+      // ];
+      // this.form = {
+      //   number: this.formData.length,
+      //   id: "调解记录id",
+      //   appealId: "诉求ID",
+      //   appealRegId: "诉求登记ID",
+      //   streetName: "胶州市",
+      //   disputeLevel: "事件等级",
+      //   status: "诉求状态",
+      //   disputeName: "土地纠纷",
+      //   disposeDept: "市住建局",
+      //   hasProtocol: "无协议书",
+      //   hasOpinion: "无处理意见",
+      //   hasReviewOpinion: "无复查意见",
+      //   legalPaper: "无法律文书",
+      //   regTime: "2012-05-15 12:30",
+      //   problemDesc: "矛盾描述...........",
+      //   attitude: "上访人意见",
+      //   dutyDeptNames: "负责部门名称, 以逗号分割",
+      //   copyDeptNames: "抄送部门名称, 以逗号分割",
+      //   feedbackDeadline: "2022-12-02",
+      //   finishDeadline: "2022-12-02",
+      //   remark: "备注",
+      //   submitTime: "2022-08-19",
+      // };
+      this.getResolveDetail()
     }
   },
   computed: {
     ...mapGetters(["tagWel", "tagList", "tag", "website"]),
   },
   methods: {
-    addClass({row,column,rowIndex,columnIndex}){ 
-        console.log(row)
-      if(row.id == this.activated){
-        return 'cell_item'
+    getStreet(){
+      getStreetList().then(res =>{
+        this.streetData = res.data.data
+      })
+    },
+    getWinData(){
+      getBaseList().then(res =>{
+        this.winData = res.data.data
+      })
+    },
+    getTypeData(){
+      getTypeList().then(res =>{
+        this.typeData = res.data.data
+      })
+    },
+    getResolveDetail(){
+      resolveDetail({mediateId:this.$route.query.id}).then(res =>{
+        console.log(res.data.data.visitors)
+        this.formData = res.data.data.visitors
+      })
+    },
+    getDetail() {
+      regResolve({ appealId: this.$route.query.id }).then((res) => {
+        console.log("res===>", res);
+        this.form = {
+          appealId:res.data.data.appealId,
+          appealRegId:res.data.data.appealRegId,
+          personNum:this.formData.length,
+          streetId:res.data.data.streetId,
+          disputeId:res.data.data.disputeId,
+          disposeDept:res.data.data.disposeDept,
+          protocol:res.data.data.protocol,
+          opinion:res.data.data.opinion,
+          reviewOpinion:res.data.data.reviewOpinion,
+          legalPaper:res.data.data.legalPaper,
+          problemDesc:res.data.data.problemDesc,
+        }
+        this.formData = res.data.data.visitors
+        this.recordData = res.data.data.talkingHisList
+        this.recordData.push({talkingTime:this.$route.query.time,talkingHis:''})
+      });
+    },
+    addClass({ row, column, rowIndex, columnIndex }) {
+      console.log(row);
+      if (row.id == this.activated) {
+        return "cell_item";
       }
     },
     findTag(value) {
@@ -881,7 +931,7 @@ export default {
       if (tag.value === this.tag.value) {
         tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
         this.$router.push({
-          path: "/request/index",
+          path: "/register/index",
         });
       }
     },
@@ -917,15 +967,26 @@ export default {
     },
     submitForm() {
       this.$refs["registerForm"].validate((valid) => {
-        if(valid){
-            console.log(this.form)
-            console.log(this.formData)
-            if(this.formData.length !== 0){
-                let tmp = this.formData.filter(item => item.username !== '')
-                
-            }else{
-                this.$message.error('登记人员列表不可为空')
+        if (valid) {
+          let params = {}
+          this.recordData.map(item => item.talkingTime = item.talkingTime + ':00')
+          params={
+            ...this.form,
+            talkingHisList:this.recordData
+          }
+          saveResolve(params).then(res =>{
+            if(res.data.code == 200){
+              this.$message.success('发布成功！');
+              let { tag, key } = this.findTag(this.$route.fullPath);
+              this.$store.commit("DEL_TAG", tag);
+              if (tag.value === this.tag.value) {
+                tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
+                this.$router.push({
+                  path: "/register/index",
+                });
+              }
             }
+          })
         }
       });
     },
@@ -1009,72 +1070,70 @@ export default {
     margin-right: 6px;
   }
 }
-.upload_box{
-        /deep/.el-upload{
-            width: 394px;
-            height: 174px;
-            border: none;
-
-            
-           
-            .up_box{
-                width: 100%;
-                height: 100%;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                flex-direction: column;
-                border: 1px dashed #c0ccda;
-            
-
-                .upload_item{
-                    width: 133px;
-                    height: 43px;
-                    background: #FFFFFF;
-                    border-radius: 2px;
-                    border: 1px solid #1B83E6;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    color: #1B83E6;
+/deep/ .upload_box {
+  .el-upload {
+    width: 394px;
+    height: 174px;
+    border: none;
 
-                    .img{
-                        width: 30px;
-                        height: 30px;
-                        display: flex;
-                    }
-                }
+    .up_box {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      border: 1px dashed #c0ccda;
 
-                .upload_tip{
-                    display: flex;
-                    width: 100%;
-                    flex-direction: column;
-                    margin-top: 16px;
+      .upload_item {
+        width: 133px;
+        height: 43px;
+        background: #ffffff;
+        border-radius: 2px;
+        border: 1px solid #1b83e6;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #1b83e6;
 
-                    .txt{
-                        width: 100%;
-                        height: 30px;
-                        display: flex;
-                        align-items: center;
-                        line-height: 10px !important;
-                        justify-content: center;
-                        color: #CBCBCB;
-                        &:hover{
-                            color: #CBCBCB;
-                        }
-                    }
-                }
-            }
+        .img {
+          width: 30px;
+          height: 30px;
+          display: flex;
         }
+      }
 
-        /deep/ .el-upload-list{
-            .el-upload-list__item{
-                width: 394px;
-                height: 174px;
-            }
+      .upload_tip {
+        display: flex;
+        width: 100%;
+        flex-direction: column;
+        margin-top: 16px;
+
+        .txt {
+          width: 100%;
+          height: 30px;
+          display: flex;
+          align-items: center;
+          line-height: 10px !important;
+          justify-content: center;
+          color: #cbcbcb;
+          &:hover {
+            color: #cbcbcb;
+          }
         }
+      }
     }
-    /deep/ .cell_item{
-        background: #F5F7FA;
+  }
+
+  
+}
+/deep/ .el-upload-list {
+    .el-upload-list__item {
+      width: 394px;
+      height: 174px;
     }
+  }
+/deep/ .cell_item {
+  background: #f5f7fa;
+}
 </style>
diff --git a/src/views/request/add.vue b/src/views/request/add.vue
index 7f54a42..5c8c095 100644
--- a/src/views/request/add.vue
+++ b/src/views/request/add.vue
@@ -14,34 +14,37 @@
       :model="form"
       label-width="80px"
       label-position="top"
+      :rules="rules"
     >
-      <el-form-item label="处理窗口">
-        <el-select v-model="form.winName">
+      <el-form-item label="处理窗口" prop="winName">
+        <el-select v-model="form.winName" :disabled='this.$route.query.type == "edit"'>
           <el-option
             v-for="item in winData"
-            :key="item.label"
-            :label="item.label"
-            :value="item.value"
+            :key="item.name"
+            :label="item.name"
+            :value="item.id"
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="关联纠纷类型">
+      <el-form-item label="关联纠纷类型" prop="type">
         <el-select v-model="form.type" multiple>
           <el-option
             v-for="item in typeData"
-            :key="item.label"
-            :label="item.label"
-            :value="item.value"
+            :key="item.dictValue"
+            :label="item.dictValue"
+            :value="item.id"
+            :disabled="item.isSealed"
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="是否启用">
+      <el-form-item label="是否启用" prop="status">
         <el-select v-model="form.status">
           <el-option
             v-for="item in statusData"
             :key="item.label"
             :label="item.label"
             :value="item.value"
+            
           ></el-option>
         </el-select>
       </el-form-item>
@@ -57,36 +60,60 @@
 
 <script>
 import { mapGetters } from "vuex";
-
+import {getBaseList,getTypeList,saveRequest} from "@/api/base"
 export default {
   data() {
     return {
-      form: {},
-      winData: [
-        {
-          label: "窗口一",
-          value: 1,
-        },
-        {
-          label: "窗口二",
-          value: 2,
-        },
-      ],
-      typeData: [
-        { label: "邻里纠纷", value: 1 },
-        { label: "合同纠纷", value: 2 },
-        { label: "婚姻纠纷", value: 3 },
-      ],
+      form: {
+        winName:'',
+        type:[],
+        status:''
+      },
+      rules:{
+        winName:[
+          { required: true, message: "请选择处理窗口", trigger: "change" },
+        ],
+        type:[
+          { required: true, message: "请选择关联纠纷类型", trigger: "change" },
+        ],
+        status:[
+          { required: true, message: "请选择是否启用", trigger: "change" },
+        ]
+      },
+      winData: [],
+      typeData: [],
       statusData: [
         { label: "是", value: 1 },
         { label: "否", value: 0 },
       ],
+      formData:{},
     };
   },
   computed: {
     ...mapGetters(["tagWel", "tagList", "tag", "website"]),
   },
+  created() {
+    this.getWinData();
+    this.getTypeData()
+    if(this.$route.query.type == 'edit'){
+      this.formData = JSON.parse(this.$route.query.form)
+      console.log(this.formData.disputeIds.split(','))
+      this.form.winName = this.formData.swId;
+      this.form.type = this.formData.disputeIds.split(',');
+      this.form.status = this.formData.status
+    };
+  },
   methods: {
+    getWinData(){
+      getBaseList().then(res =>{
+        this.winData = res.data.data;
+      })
+    },
+    getTypeData(){
+      getTypeList().then(res =>{
+        this.typeData = res.data.data
+      })
+    },
     findTag(value) {
       let tag, key;
       this.tagList.map((item, index) => {
@@ -109,6 +136,31 @@ export default {
     },
     submitForm(){
       console.log(this.form)
+      this.$refs["form"].validate((valid) => {
+        if(valid){
+          console.log('tongg')
+          let params = {
+            swId:this.form.winName,
+            disputeIds:this.form.type.join(','),
+            status:this.form.status
+          }
+          console.log(params)
+          saveRequest(params).then(res =>{
+            console.log(res)
+            if(res.data.code == 200){
+              this.$message.success("发布成功");
+              let { tag, key } = this.findTag(this.$route.fullPath);
+              this.$store.commit("DEL_TAG", tag);
+              if (tag.value === this.tag.value) {
+                tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
+                this.$router.push({
+                  path: "/request/index",
+                });
+              }
+            }
+          })
+        }
+      })
     },
   },
 };
diff --git a/src/views/request/index.vue b/src/views/request/index.vue
index a3a2d70..5ce4d01 100644
--- a/src/views/request/index.vue
+++ b/src/views/request/index.vue
@@ -8,16 +8,16 @@
 		<el-select v-model="form.winName">
                     <el-option
                         v-for="item in winData"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
                     ></el-option>
         </el-select>
 	  </template>
       <template slot-scope="{row}" slot="menu">
-        <el-button type="text" icon="el-icon-edit" size="small" @click="handleEdit(row)">编辑</el-button>
-        <el-button type="text" icon="el-icon-warning-outline" size="small" @click="handleDis(row)">禁用</el-button>
-        <el-button type="text" icon="el-icon-delete" size="small" @click="handleDelete(row)">删除</el-button>
+        <el-button size="small" @click="handleEdit(row)">编辑</el-button>
+        <el-button size="small" @click="handleDis(row)">{{row.status ? '禁用' : '启用'}}</el-button>
+        <el-button  size="small" @click="handleDelete(row)">删除</el-button>
       </template>
       <template slot-scope="scope" slot="status">
           <div v-show="scope.row.status" style="color:#81b337">启用</div>
@@ -31,14 +31,12 @@
 </template>
 
 <script>
+import {getBaseList,getRequestList,getRequestDetail,isOpen,deleteRequest} from "@/api/base"
 export default {
   data() {
     return {
       form: {},
-	    winData:[
-        {label:'窗口一',value:'1'},
-        {label:'窗口二',value:'2'},
-      ],
+	    winData:[],
       typeData: [
         { label: "邻里纠纷", value: 1 },
         { label: "合同纠纷", value: 2 },
@@ -52,6 +50,7 @@ export default {
         total: 0
       },
       selectionList: [],
+      openTitle:'禁用',
       option: {
         searchShowBtn:false,
         refreshBtn:false,
@@ -78,13 +77,14 @@ export default {
           },
           {
             label: "处理窗口",
-            prop: "windows",
+            prop: "swName",
             align:"center",
           },
           {
             label: "类型",
-            prop: "type",
+            prop: "disputeNames",
             align:"center",
+            overhidden:true,
           },
           {
             label: "状态",
@@ -97,7 +97,15 @@ export default {
       data: []
     };
   },
+  created() {
+    this.getList()
+  },
   methods: {
+    getList(){
+      getBaseList().then(res =>{
+        this.winData = res.data.data
+      })
+    },
     searchReset() {
       this.query = {};
 	  this.form = {}
@@ -111,27 +119,35 @@ export default {
       done();
     },
     onLoad(){
-      this.loading = false
-      this.data = [
-        {windows:"窗口一",type:"合同纠纷",status:0},
-        {windows:"窗口一",type:"合同纠纷",status:1},
-        {windows:"窗口二",type:"合同纠纷,邻里纠纷",status:1},
-      ];
-      this.page.total = this.data.length;
+      getRequestList({swId:this.form.winName,current:this.page.currentPage,size:this.page.size}).then(res =>{
+        this.loading = false
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total
+      })
     },
 	addWins(){
 		this.$router.push({ path: "/request/add" })
 	},
-	handleEdit(){
-		this.$router.push({ path: "/request/add" })
+	handleEdit(row){
+    console.log(row)
+    getRequestDetail({swId:row.swId}).then(res =>{
+      console.log(res)
+      this.$router.push({ path: "/request/add",query:{type:'edit',form:JSON.stringify(res.data.data)}})
+    })
+		
 	},
 	handleDis(row){
-		this.$confirm(`确认禁用当前处理窗口吗？`, {
+		this.$confirm(`确认${row.status ? '禁用' : '启用'}当前处理窗口吗？`, {
 			confirmButtonText: "确定",
 			cancelButtonText: "取消",
 			type: "warning"
 		}).then(res =>{
-
+      isOpen(row.swId).then(res =>{
+        if(res.data.code == 200){
+          this.$message.success(row.status ? '禁用成功！' : '启用成功！' );
+          this.onLoad()
+        }
+      })
 		})
 	},
 	handleDelete(row){
@@ -140,7 +156,12 @@ export default {
 			cancelButtonText: "取消",
 			type: "warning"
 		}).then(res =>{
-
+      deleteRequest(row.swId).then(res =>{
+        if(res.data.code == 200){
+          this.$message.success('删除成功');
+          this.onLoad()
+        }
+      })
 		})
 	},
   },
diff --git a/vue.config.js b/vue.config.js
index bf6a7fb..c986d13 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -30,7 +30,7 @@ module.exports = {
         // target: 'http://localhost',
         // target: "http://192.168.1.106:80",
         // target: "http://192.168.1.3:8083",
-        target: "http://192.168.3.32:80",
+        target: "http://192.168.1.106:80",
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',
         ws: true,