diff --git a/public/favicon.png b/public/favicon.png
index ecd70ca..13c89e6 100644
Binary files a/public/favicon.png and b/public/favicon.png differ
diff --git a/public/favicon1.png b/public/favicon1.png
new file mode 100644
index 0000000..ecd70ca
Binary files /dev/null and b/public/favicon1.png differ
diff --git a/src/assets/img/login_bag.jpg b/src/assets/img/login_bag.jpg
new file mode 100644
index 0000000..a7cc490
Binary files /dev/null and b/src/assets/img/login_bag.jpg differ
diff --git a/src/assets/img/video_bag.jpg b/src/assets/img/video_bag.jpg
new file mode 100644
index 0000000..0f6741a
Binary files /dev/null and b/src/assets/img/video_bag.jpg differ
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 306ed2c..0deb2aa 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -1,121 +1,122 @@
 export default {
-  title: 'Saber企业管理平台',
-  logoutTip: '退出系统, 是否继续?',
-  submitText: '确定',
-  cancelText: '取消',
-  search: '请输入搜索内容',
-  menuTip: '没有发现菜单',
+  // title: 'Saber企业管理平台',
+  title: "矛盾纠纷化解平台",
+  logoutTip: "退出系统, 是否继续?",
+  submitText: "确定",
+  cancelText: "取消",
+  search: "请输入搜索内容",
+  menuTip: "没有发现菜单",
   common: {
-    condition: '条件',
-    display: '显示',
-    hide: '隐藏'
+    condition: "条件",
+    display: "显示",
+    hide: "隐藏",
   },
   tip: {
-    select: '请选择',
-    input: '请输入'
+    select: "请选择",
+    input: "请输入",
   },
   upload: {
-    upload: '点击上传',
-    tip: '将文件拖到此处，或'
+    upload: "点击上传",
+    tip: "将文件拖到此处，或",
   },
   date: {
-    start: '开始日期',
-    end: '结束日期',
-    t: '今日',
-    y: '昨日',
-    n: '近7天',
-    a: '全部'
+    start: "开始日期",
+    end: "结束日期",
+    t: "今日",
+    y: "昨日",
+    n: "近7天",
+    a: "全部",
   },
   form: {
-    printBtn: '打 印',
-    mockBtn: '模 拟',
-    submitBtn: '提 交',
-    emptyBtn: '清 空'
+    printBtn: "打 印",
+    mockBtn: "模 拟",
+    submitBtn: "提 交",
+    emptyBtn: "清 空",
   },
   crud: {
     filter: {
-      addBtn: '新增条件',
-      clearBtn: '清空数据',
-      resetBtn: '清空条件',
-      cancelBtn: '取 消',
-      submitBtn: '确 定'
+      addBtn: "新增条件",
+      clearBtn: "清空数据",
+      resetBtn: "清空条件",
+      cancelBtn: "取 消",
+      submitBtn: "确 定",
     },
     column: {
-      name: '列名',
-      hide: '隐藏',
-      fixed: '冻结',
-      filters: '过滤',
-      sortable: '排序',
-      index: '顺序',
-      width: '宽度'
+      name: "列名",
+      hide: "隐藏",
+      fixed: "冻结",
+      filters: "过滤",
+      sortable: "排序",
+      index: "顺序",
+      width: "宽度",
     },
-    tipStartTitle: '当前表格已选择',
-    tipEndTitle: '项',
-    editTitle: '编 辑',
-    copyTitle: '复 制',
-    addTitle: '新 增',
-    viewTitle: '查 看',
-    filterTitle: '过滤条件',
-    showTitle: '列显隐',
-    menu: '操作',
-    addBtn: '新 增',
-    show: '显 示',
-    hide: '隐 藏',
-    open: '展 开',
-    shrink: '收 缩',
-    printBtn: '打 印',
-    excelBtn: '导 出',
-    updateBtn: '修 改',
-    cancelBtn: '取 消',
-    searchBtn: '搜 索',
-    emptyBtn: '清 空',
-    menuBtn: '功 能',
-    saveBtn: '保 存',
-    viewBtn: '查 看',
-    editBtn: '编 辑',
-    copyBtn: '复 制',
-    delBtn: '删 除'
+    tipStartTitle: "当前表格已选择",
+    tipEndTitle: "项",
+    editTitle: "编 辑",
+    copyTitle: "复 制",
+    addTitle: "新 增",
+    viewTitle: "查 看",
+    filterTitle: "过滤条件",
+    showTitle: "列显隐",
+    menu: "操作",
+    addBtn: "新 增",
+    show: "显 示",
+    hide: "隐 藏",
+    open: "展 开",
+    shrink: "收 缩",
+    printBtn: "打 印",
+    excelBtn: "导 出",
+    updateBtn: "修 改",
+    cancelBtn: "取 消",
+    searchBtn: "搜 索",
+    emptyBtn: "清 空",
+    menuBtn: "功 能",
+    saveBtn: "保 存",
+    viewBtn: "查 看",
+    editBtn: "编 辑",
+    copyBtn: "复 制",
+    delBtn: "删 除",
   },
   login: {
-    title: '登录 ',
-    info: 'BladeX 企业级开发平台',
-    tenantId: '请输入租户ID',
-    username: '请输入账号',
-    password: '请输入密码',
-    wechat: '微信',
-    qq: 'QQ',
-    github: 'github',
-    gitee: '码云',
-    phone: '请输入手机号',
-    code: '请输入验证码',
-    submit: '登录',
-    userLogin: '账号密码登录',
-    phoneLogin: '手机号登录',
-    thirdLogin: '第三方系统登录',
-    ssoLogin: '单点系统登录',
-    msgText: '发送验证码',
-    msgSuccess: '秒后重发',
+    title: "登录 ",
+    info: "BladeX 企业级开发平台",
+    tenantId: "请输入租户ID",
+    username: "请输入账号",
+    password: "请输入密码",
+    wechat: "微信",
+    qq: "QQ",
+    github: "github",
+    gitee: "码云",
+    phone: "请输入手机号",
+    code: "请输入验证码",
+    submit: "登录",
+    userLogin: "账号密码登录",
+    phoneLogin: "手机号登录",
+    thirdLogin: "第三方系统登录",
+    ssoLogin: "单点系统登录",
+    msgText: "发送验证码",
+    msgSuccess: "秒后重发",
   },
   navbar: {
-    logOut: '退出登录',
-    userinfo: '个人信息',
-    switchDept : '部门切换',
-    dashboard: '首页',
-    lock: '锁屏',
-    bug: '没有错误日志',
-    bugs: '条错误日志',
-    screenfullF: '退出全屏',
-    screenfull: '全屏',
-    language: '中英文',
-    notice: '消息通知',
-    theme: '主题',
-    color: '换色'
+    logOut: "退出登录",
+    userinfo: "个人信息",
+    switchDept: "部门切换",
+    dashboard: "首页",
+    lock: "锁屏",
+    bug: "没有错误日志",
+    bugs: "条错误日志",
+    screenfullF: "退出全屏",
+    screenfull: "全屏",
+    language: "中英文",
+    notice: "消息通知",
+    theme: "主题",
+    color: "换色",
   },
   tagsView: {
-    search: '搜索',
-    menu: '更多',
-    clearCache: '清除缓存',
-    closeOthers: '关闭其它',
-    closeAll: '关闭所有'
-  }
+    search: "搜索",
+    menu: "更多",
+    clearCache: "清除缓存",
+    closeOthers: "关闭其它",
+    closeAll: "关闭所有",
+  },
 };
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 6d3bb4d..62d379b 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -4,13 +4,13 @@
        @keyup.enter.native="handleLogin">
     <top-color v-show="false"></top-color>
     <div class="login-weaper animated bounceInDown">
-      <div class="login-left">
-        <div class="login-time">
+      <!-- <div class="login-left"> -->
+        <!-- <div class="login-time">
           {{time}}
-        </div>
-        <p class="title">{{ $t('login.info') }}</p>
-        <div style="font-size: 15px">
-          <span>----------------------------------------------</span>
+        </div> -->
+        <!-- <p class="title"> 矛盾纠纷化解平台</p> -->
+        <!-- <div style="font-size: 15px"> -->
+          <!-- <span>----------------------------------------------</span>
           <br>
           <span>管理租户编号：000000</span>
           <br>
@@ -28,15 +28,16 @@
           <br>
           <span>租户管理员账号: admin / admin</span>
           <br>
-          <span>----------------------------------------------</span>
-        </div>
+          <span>----------------------------------------------</span> -->
+        <!-- </div> -->
       <!--<img class="img" src="/img/logo.png" alt="">-->
-      </div>
+      <!-- </div> -->
       <div class="login-border">
         <div class="login-main">
           <h4 class="login-title">
-            {{ $t('login.title') }}{{website.title}}
-            <top-lang></top-lang>
+            <!-- {{ $t('login.title') }}{{website.title}} -->
+           欢迎登录
+            <!-- <top-lang></top-lang> -->
           </h4>
           <userLogin v-if="activeName==='user'"></userLogin>
           <!-- <codeLogin v-else-if="activeName==='code'"></codeLogin>
diff --git a/src/styles/login.scss b/src/styles/login.scss
index e6a7b13..528b00e 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -5,14 +5,15 @@
   width: 100%;
   height: 100%;
   margin: 0 auto;
-  background-image: url("/img/bg/bg.jpg");
+  background-image: url("~@/assets/img/login_bag.jpg");
   background-size: 100% 100%;
 }
 
 .login-weaper {
   margin: 0 auto;
-  width: 1000px;
-  box-shadow: -4px 5px 10px rgba(0, 0, 0, 0.4);
+  width: 400px;
+  margin-left: 60%;
+  // box-shadow: -4px 5px 10px rgba(0, 0, 0, 0.4);
 
   .el-input-group__append {
     border: none;
@@ -28,14 +29,15 @@
 }
 
 .login-left {
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
+  // border-top-left-radius: 5px;
+  // border-bottom-left-radius: 5px;
+  border-radius: 5px;
   justify-content: center;
   flex-direction: column;
   background-color: #8b9aac;
   color: #fff;
   float: left;
-  width: 50%;
+  width: 100%;
   position: relative;
 }
 
@@ -69,11 +71,15 @@
   border-bottom-right-radius: 5px;
   color: #fff;
   background-color: #fff;
-  width: 50%;
+  width: 100%;
   float: left;
   box-sizing: border-box;
 }
 
+.el-button--primary{
+
+}
+
 .login-main {
   margin: 0 auto;
   width: 65%;
@@ -117,7 +123,8 @@
   font-size: 18px;
   letter-spacing: 2px;
   font-weight: 300;
-  color: #409EFF;
+  color: #fff;
+  background: #409EFF;
   cursor: pointer;
   margin-top: 30px;
   font-family: "neo";
diff --git a/src/views/register/add.vue b/src/views/register/add.vue
index 175fcd7..7dd21ad 100644
--- a/src/views/register/add.vue
+++ b/src/views/register/add.vue
@@ -85,6 +85,8 @@
           <el-input
             v-model="scope.row.cardno"
             clearable
+            onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
+            maxlength="18"
             placeholder="身份证号码"
             size="medium"
             style="width: 90%; margin-left: 5%"
@@ -116,6 +118,8 @@
           <el-input
             v-model="scope.row.phone"
             clearable
+            onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
+            maxlength="11"
             placeholder="联系人电话"
             size="medium"
             style="width: 90%; margin-left: 5%"
@@ -331,9 +335,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%" prop="problemDesc">
               <figure>
-                &emsp;反应主要问题
+                <i></i>反应主要问题
                 <figcaption>
                   <el-input
                     type="textarea"
@@ -353,7 +357,7 @@
       <el-form-item class="btn_box">
         <el-button class="can_btn" @click="handleCancel">取消</el-button>
         <el-button class="sub_btn" type="primary" @click="submitForm"
-          >发布</el-button
+          >提交</el-button
         >
       </el-form-item>
     </el-form>
@@ -379,7 +383,9 @@ export default {
         disputeId: [
           { required: true, message: "请选择诉求类型", trigger: "change" },
         ],
-        
+        problemDesc:[
+          { required: true, message: "请填写反应主要问题", trigger: "change" },
+        ]
       },
       formData: [
         {
@@ -555,10 +561,10 @@ export default {
                     visitors:tmp,
                     ...this.form
                   }
-                  console.log(params)
+                  // console.log(params)
                   addRegister(params).then(res =>{
                     if(res.data.code == 200){
-                      this.$message.success('登记成功！')
+                      this.$message.success('提交成功！')
                       let { tag, key } = this.findTag(this.$route.fullPath);
                       this.$store.commit("DEL_TAG", tag);
                       if (tag.value === this.tag.value) {
@@ -576,7 +582,7 @@ export default {
                   }
                   addRegister(params).then(res =>{
                     if(res.data.code == 200){
-                      this.$message.success('登记成功！')
+                      this.$message.success('提交成功！')
                       let { tag, key } = this.findTag(this.$route.fullPath);
                       this.$store.commit("DEL_TAG", tag);
                       if (tag.value === this.tag.value) {
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index d6e068b..44ba16c 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -70,7 +70,7 @@
          <el-button
           size="small"
           @click="handleRecon(row)"
-          v-show="permission.appeal_resolve"
+          v-show="permission.appeal_resolve && (row.status == 0)"
           >诉求调解</el-button
         >
         <el-button
@@ -101,13 +101,16 @@
           type="success"
           size="small"
           @click="exportRegister"
+          v-show="permission.export_data"
           >导出</el-button
         >
         <!-- <div> -->
           <el-upload
           class="upload-demo"
+          :headers="headers"
           action="/api/blade-business/appealReg/importData"
           :on-success="handleSuccess"
+          v-show="permission.import_data"
           :show-file-list="false"
           multiple>
           <el-button size="small" type="primary">导入</el-button>
@@ -141,6 +144,7 @@
 import { mapGetters } from "vuex";
 import {getBaseList,getTypeList} from "@/api/base"
 import {getRegList,getResolveList,regResolve,againResolve,exportList} from "@/api/register/register"
+import { getToken } from "@/util/auth";
 export default {
   data() {
     return {
@@ -153,6 +157,9 @@ export default {
         { label: "达成协议", value: "2" },
         { label: "调解成功", value: "3" },
       ],
+      headers: {
+        "Blade-Auth": "",
+      }, //认证
       listData:[],
       typeData:[
         {label:'邻里纠纷',value:0},
@@ -284,6 +291,7 @@ export default {
     ...mapGetters(["permission"]),
   },
   created() {
+    this.headers["Blade-Auth"] = "bearer " + getToken();
     this.getTime();
     this.getWinData();
     this.getTypeData()
@@ -316,7 +324,8 @@ export default {
       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.mediateId} });
+      console.log(row)
+      this.$router.push({ path: "/register/recon",query:{type:'view',time:row.talkingTime,id:row.mediationId} });
     },
     searchReset() {
       this.query = {};
diff --git a/src/views/register/recon.vue b/src/views/register/recon.vue
index f1402b4..930efe1 100644
--- a/src/views/register/recon.vue
+++ b/src/views/register/recon.vue
@@ -20,26 +20,6 @@
       "
       header-cell-style="background-color:#fafafa;font-size:12px;color:black"
     >
-      <!-- <el-table-column width="57px">
-        <template slot="header">
-          <el-button
-            circle
-            size="small"
-            type="primary"
-            icon="el-icon-plus"
-            @click="addDomain()"
-          />
-        </template>
-        <template slot-scope="scope">
-          <el-button
-            circle
-            size="small"
-            type="danger"
-            icon="el-icon-delete"
-            @click="removeSpecimen(scope.$index, scope.row, scope)"
-          />
-        </template>
-      </el-table-column> -->
       <el-table-column
         align="center"
         prop="username"
@@ -54,6 +34,7 @@
             style="width: 90%; margin-left: 5%"
             size="medium"
             placeholder="来访人姓名"
+            :disabled="pageType == 'edit' || pageType == 'recon'"
           >
           </el-input>
         </template>
@@ -65,6 +46,7 @@
             placeholder="性别"
             size="medium"
             style="width: 90%; margin-left: 5%"
+             :disabled="pageType == 'edit' || pageType == 'recon'"
           >
             <el-option label="男" value="1"></el-option>
             <el-option label="女" value="2"></el-option>
@@ -79,6 +61,7 @@
             placeholder="年龄"
             size="medium"
             style="width: 90%; margin-left: 5%"
+            :disabled="pageType == 'edit' || pageType == 'recon'"
           />
         </template> </el-table-column
       ><el-table-column align="center" prop="cardno" label="身份证号码">
@@ -89,6 +72,7 @@
             placeholder="身份证号码"
             size="medium"
             style="width: 90%; margin-left: 5%"
+            :disabled="pageType == 'edit' || pageType == 'recon'"
           />
         </template>
       </el-table-column>
@@ -100,6 +84,7 @@
             placeholder="住址"
             size="medium"
             style="width: 90%; margin-left: 5%"
+            :disabled="pageType == 'edit' || pageType == 'recon'"
           />
         </template> </el-table-column
       ><el-table-column align="center" prop="addressNow" label="现住址">
@@ -110,6 +95,7 @@
             placeholder="现住址"
             size="medium"
             style="width: 90%; margin-left: 5%"
+            :disabled="pageType == 'edit' || pageType == 'recon'"
           />
         </template> </el-table-column
       ><el-table-column align="center" prop="phone" label="联系人电话">
@@ -120,6 +106,7 @@
             placeholder="联系人电话"
             size="medium"
             style="width: 90%; margin-left: 5%"
+            :disabled="pageType == 'edit' || pageType == 'recon'"
           />
         </template>
       </el-table-column>
@@ -146,6 +133,7 @@
                     clearable
                     style="width: 90%"
                     :readonly="true"
+                    :disabled="pageType == 'edit' || pageType == 'recon'"
                   />
                 </figcaption>
               </figure>
@@ -159,7 +147,7 @@
               <figcaption>
                 <el-select
                   v-model="form.streetId"
-                  :disabled="isappend"
+                  :disabled="isappend || pageType == 'edit' || pageType == 'recon'"
                   :filter-method="dataFilter"
                   clearable
                   filterable
@@ -186,7 +174,7 @@
               <figcaption>
                 <el-select
                   v-model="form.disputeId"
-                  :disabled="isappend"
+                  :disabled="isappend || pageType == 'edit' || pageType == 'recon'"
                   :filter-method="dataFilter"
                   clearable
                   filterable
@@ -217,7 +205,7 @@
                 <figcaption>
                   <el-select
                     v-model="form.disposeDept"
-                    :disabled="isappend"
+                    :disabled="pageType == 'edit' || pageType == 'recon'"
                     :filter-method="dataFilter"
                     clearable
                     filterable
@@ -246,6 +234,7 @@
               <figcaption>
                 <el-input
                   v-model="form.protocol"
+                  :disabled="pageType == 'edit' || pageType == 'recon'"
                   size="medium"
                   placeholder="请输入基层有无协议书"
                   clearable
@@ -262,6 +251,7 @@
               <figcaption>
                 <el-input
                   v-model="form.opinion"
+                  :disabled="pageType == 'edit' || pageType == 'recon'"
                   size="medium"
                   placeholder="请输入基层有无处理意见"
                   clearable
@@ -280,6 +270,7 @@
                 &emsp;部门有无复查意见
                 <figcaption>
                   <el-input
+                  :disabled="pageType == 'edit' || pageType == 'recon'"
                     v-model="form.reviewOpinion"
                     size="medium"
                     placeholder="请输入部门有无复查意见"
@@ -297,6 +288,7 @@
               &emsp;有何法律文书
               <figcaption>
                 <el-input
+                :disabled="pageType == 'edit' || pageType == 'recon'"
                   v-model="form.legalPaper"
                   size="medium"
                   placeholder="请输入法律文书"
@@ -323,12 +315,45 @@
                   clearable
                   style="width: 90%"
                   :readonly="true"
+                  :disabled="pageType == 'edit' || pageType == 'recon'"
                 />
               </figcaption>
             </figure>
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :model="form" :rules="rules" :gutter="20" v-show="permission.isPass">
+        <el-col style="width: 31%; margin-left: 1%">
+          <div class="grid-content bg-purple">
+            <el-form-item  style="width: 100%">
+              <figure>
+                &emsp;是否越级上报
+                <figcaption>
+                  <el-select
+                    v-model="form.skipGrant"
+                    :disabled="pageType == 'edit' || pageType == 'recon'"
+                    :filter-method="dataFilter"
+                    clearable
+                    filterable
+                    allow-create
+                    ref="searchSelect"
+                    placeholder="请选择单位"
+                    size="medium"
+                    style="width: 90%"
+                  >
+                    <el-option
+                      v-for="item in yuejiData"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </figcaption>
+              </figure>
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
       <el-row :model="form" :rules="rules" :gutter="20">
         <el-col style="width: 100%; margin-left: 1%">
           <div class="grid-content bg-purple">
@@ -339,6 +364,7 @@
                   <el-input
                     type="textarea"
                     :autosize="{ minRows: 2 }"
+                    :disabled="pageType == 'edit'"
                     v-model="form.problemDesc"
                     size="medium"
                     placeholder="请输入反应主要问题"
@@ -370,6 +396,7 @@
         "
         :cell-class-name="addClass"
         header-cell-style="background-color:#fafafa;font-size:12px;color:black"
+        @row-click="rowClick"
       >
         <el-table-column
           align="center"
@@ -385,6 +412,7 @@
               size="medium"
               :readonly="true"
               placeholder="接谈时间"
+              :disabled="pageType == 'edit'"
             >
             </el-input>
           </template>
@@ -396,6 +424,7 @@
               :autosize="{ minRows: 2 }"
               v-model="scope.row.talkingHis"
               size="medium"
+              :disabled="pageType == 'edit'"
               placeholder="请输入接谈记录详情"
               clearable
               style="width: 90%"
@@ -415,6 +444,7 @@
                     type="textarea"
                     :autosize="{ minRows: 2 }"
                     v-model="form.attitude"
+                    :disabled="pageType == 'edit'"
                     size="medium"
                     placeholder="请输入上访人意见和态度"
                     clearable
@@ -435,6 +465,7 @@
                 <figcaption>
                   <el-input
                     type="textarea"
+                    :disabled="pageType == 'edit'"
                     :autosize="{ minRows: 2 }"
                     v-model="form.talkingAdvice"
                     size="medium"
@@ -457,7 +488,7 @@
                 <figcaption>
                   <el-select
                     v-model="form.dutyDeptIds"
-                    :disabled="isappend"
+                    :disabled="pageType == 'edit'"
                     :filter-method="dataFilter"
                     clearable
                     filterable
@@ -487,7 +518,7 @@
               <figcaption>
                 <el-select
                   v-model="form.copyDeptIds"
-                  :disabled="isappend"
+                  :disabled="pageType == 'edit'"
                   :filter-method="dataFilter"
                   clearable
                   filterable
@@ -496,7 +527,6 @@
                   placeholder="请选择单位"
                   size="medium"
                   style="width: 90%"
-                  multiple
                 >
                   <el-option
                     v-for="item in winData"
@@ -516,7 +546,7 @@
               <figcaption>
                 <el-select
                   v-model="form.disputeLevel"
-                  :disabled="isappend"
+                  :disabled="pageType == 'edit'"
                   :filter-method="dataFilter"
                   clearable
                   filterable
@@ -541,13 +571,13 @@
       <el-row :model="form" :rules="rules" :gutter="20">
         <el-col style="width: 31%; margin-left: 1%">
           <div class="grid-content bg-purple">
-            <el-form-item style="width: 100%" prop="status">
+            <el-form-item style="width: 100%" prop="appealStatus">
               <figure>
                 <i></i> 办理状态
                 <figcaption>
                   <el-select
-                    v-model="form.status"
-                    :disabled="isappend"
+                    v-model="form.appealStatus"
+                    :disabled="pageType == 'edit'"
                     :filter-method="dataFilter"
                     clearable
                     filterable
@@ -575,6 +605,7 @@
               &emsp;反馈时限
               <figcaption>
                 <el-date-picker
+                  :disabled="pageType == 'edit'"
                   v-model="form.feedbackDeadline"
                   type="datetime"
                   style="width: 90%"
@@ -593,6 +624,7 @@
               <i></i> 办结时限
               <figcaption>
                 <el-date-picker
+                  :disabled="pageType == 'edit'"
                   v-model="form.finishDeadline"
                   type="datetime"
                   format="yyyy-MM-dd HH:mm:ss"
@@ -615,6 +647,7 @@
                 <figcaption>
                   <el-input
                     type="textarea"
+                    :disabled="pageType == 'edit'"
                     :autosize="{ minRows: 2 }"
                     v-model="form.remark"
                     size="medium"
@@ -635,6 +668,7 @@
               &emsp;来访时间
               <figcaption>
                 <el-date-picker
+                  :disabled="pageType == 'edit' || pageType == 'recon'"
                   v-model="form.visitTime"
                   type="datetime"
                   style="width: 90%"
@@ -654,6 +688,7 @@
               <figcaption>
                 <el-date-picker
                   v-model="form.submitTime"
+                  :disabled="pageType == 'edit'"
                   type="datetime"
                   style="width: 90%"
                   format="yyyy-MM-dd HH:mm:ss"
@@ -667,28 +702,26 @@
         </el-col>
       </el-row>
       <el-row :model="form" :rules="rules" :gutter="20">
-        <el-col style="width: 100%; margin-left: 1%">
-          <el-form-item >
+        <el-col style="width: 100%; margin-left: 1%" v-show="imgList.length == 0 && pageType !== 'edit'">
+          <el-form-item>
             <figure>
               &emsp; 上传附件
               <figcaption>
                 <el-upload
-                  v-model="form.fileList"
+                  v-model="imgList"
                   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"
+                  :on-success="handleSuccess"
+                  :on-remove="handleRemove"
+                  :before-upload="beforeUpload"
                   :file-list="fileList"
                   limit="5"
                   accept=".jpg,.png"
                 >
-                  <div class="up_box" v-show="imgList.length < 5">
+                  <div class="up_box" v-show="imgList.length < 5 && pageType !== 'edit'">
                     <div class="upload_item">
                       <div class="img">
                         <img src="~@/assets/image/upload.png" alt="" />
@@ -696,10 +729,7 @@
                       <div>上传图片</div>
                     </div>
                     <div class="upload_tip">
-                      <span class="txt"
-                        >上传文件：jpg、png 图片尺寸：682*310px</span
-                      >
-                      <span class="txt">文件大小：≤1M</span>
+                      <span class="txt">上传文件: jpg、png 文件大小:≤ 5M</span>
                     </div>
                   </div>
                 </el-upload>
@@ -720,33 +750,44 @@
 
 <script>
 import { mapGetters } from "vuex";
-import { regResolve,resolveDetail,getStreetList,saveResolve } from "@/api/register/register";
-import {getBaseList,getTypeList} from "@/api/base"
+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: "",
+        fileList: [],
       },
       imgList: [],
-      enentLevel:[
-        {value:0,label:'简单'},
-        {value:1,label:'一般'},
-        {value:2,label:'重大'},
-        {value:3,label:'疑难'},
+      fileList: [],
+      enentLevel: [
+        { value: 0, label: "简单" },
+        { value: 1, label: "一般" },
+        { value: 2, label: "重大" },
+        { value: 3, label: "疑难" },
       ],
-      statusData:[
-        {value:1,label:'正在处理'},
-        {value:2,label:'达成协议'},
-        {value:3,label:'调解成功'},
+      statusData: [
+        { value: 1, label: "正在处理" },
+        { value: 2, label: "达成协议" },
+        { value: 3, label: "调解成功" },
+      ],
+      yuejiData:[
+        {value:1,label:'是'},
+        {value:0,label:'否'},
       ],
       headers: {
         "Blade-Auth": "",
       }, //认证
-      streetData:[],
-      winData:[],
-      typeData:[],
+      streetData: [],
+      winData: [],
+      typeData: [],
       pageType: "",
       title: "",
       activated: "",
@@ -767,7 +808,7 @@ export default {
         disputeLevel: [
           { required: true, message: "请选择事件等级", trigger: "change" },
         ],
-        status: [
+        appealStatus: [
           { required: true, message: "请选择办理状态", trigger: "change" },
         ],
       },
@@ -787,10 +828,11 @@ export default {
   },
   watch: {},
   created() {
-     this.headers["Blade-Auth"] = "bearer " + getToken();
+    this.headers["Blade-Auth"] = "bearer " + getToken();
     this.getStreet();
     this.getTypeData();
-    this.getWinData()
+    this.getWinData();
+    console.log("type", this.$route.query.type);
     if (this.$route.query.type == "recon") {
       this.pageType = "recon";
       this.title = "诉求调解";
@@ -800,114 +842,75 @@ export default {
       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.getResolveDetail()
+      this.getResolveDetail();
     }
   },
   computed: {
-    ...mapGetters(["tagWel", "tagList", "tag", "website"]),
+    ...mapGetters(["tagWel", "tagList", "tag", "website","permission"]),
   },
   methods: {
-    getStreet(){
-      getStreetList().then(res =>{
-        this.streetData = res.data.data
-      })
+    getStreet() {
+      getStreetList().then((res) => {
+        this.streetData = res.data.data;
+      });
     },
-    getWinData(){
-      getBaseList().then(res =>{
-        this.winData = res.data.data
-      })
+    getWinData() {
+      getBaseList().then((res) => {
+        this.winData = res.data.data;
+      });
     },
-    getTypeData(){
-      getTypeList().then(res =>{
-        this.typeData = 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
-      })
+    getResolveDetail() {
+      resolveDetail({ mediateId: this.$route.query.id }).then((res) => {
+        this.formData = res.data.data.visitors;
+        this.form = res.data.data;
+        this.form.dutyDeptIds = this.form.dutyDeptIds !== '' ? this.form.dutyDeptIds.split(',') : ''
+        this.recordData = this.form.talkingHisList;
+        this.form.personNum = this.formData.length;
+        if(this.form.fileList.length !== 0){
+          this.form.fileList.map((item) => {
+            this.imgList.push({ fileAddr: item.fileAddr });
+            this.fileList.push({ url: item.fileAddr });
+          });
+        }else{
+          this.fileList = []
+        }
+        
+      });
     },
     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:''})
+          appealId: res.data.data.appealId,
+          appealRegId: res.data.data.appealRegId,
+          personNum:res.data.data.visitors.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,
+          visitTime:res.data.data.regTime,
+          skipGrant:res.data.data.skipGrant
+        };
+        this.formData = res.data.data.visitors;
+        this.recordData = res.data.data.talkingHisList;
+        // this.form.personNum = this.form
+        this.recordData.push({
+          talkingTime: this.$route.query.time,
+          talkingHis: "",
+        });
       });
     },
     addClass({ row, column, rowIndex, columnIndex }) {
-      console.log(row);
-      if (row.id == this.activated) {
+      if (row.mediationId == this.activated) {
         return "cell_item";
       }
     },
@@ -935,58 +938,101 @@ export default {
         });
       }
     },
-    addDomain() {
-      let obj = {
-        username: "",
-        gender: "",
-        age: "",
-        cardno: "",
-        address: "",
-        addressNow: "",
-        phone: "",
-      };
-      let isName = this.formData.find((item) => item.username == "");
-      let isSex = this.formData.find((item) => item.gender == "");
-      let isAge = this.formData.find((item) => item.age == "");
-      let isNumber = this.formData.find((item) => item.cardno == "");
-      let isAddress = this.formData.find((item) => item.address == "");
-      let isPhone = this.formData.find((item) => item.phone == "");
-      if (
-        this.formData.length == 0 ||
-        (!isName && !isSex && !isAge && !isNumber && !isAddress && !isPhone)
-      ) {
-        this.formData.push(obj);
-      } else {
-        this.$message.error("请填写登记人员相关信息后新增人员");
+    rowClick(row) {
+      console.log(row);
+      console.log(this.pageType)
+      if (!row.mediationId || this.pageType == 'recon') {
+        return;
       }
+      this.activated = row.mediationId;
+      resolveDetail({ mediateId: this.activated }).then((res) => {
+        this.formData = res.data.data.visitors;
+        this.form = res.data.data;
+        this.form.dutyDeptIds = this.form.dutyDeptIds !== '' ? this.form.dutyDeptIds.split(',') : ''
+        this.recordData = this.form.talkingHisList;
+        this.form.personNum = this.formData.length;
+        this.title = row.talkingTime + '调解记录'
+        if(this.form.fileList.length !== 0){
+          this.form.fileList.map((item) => {
+            this.imgList.push({ fileAddr: item.fileAddr });
+            this.fileList.push({ url: item.fileAddr });
+          });
+        }else{
+          this.fileList = []
+        }
+      });
     },
     removeSpecimen(index, row) {
       this.formData.splice(index, 1);
       let tmp = this.formData.filter((item) => item.name !== "");
       this.form.number = tmp.length;
     },
+    handleSuccess(res) {
+      if (res.code == 200) {
+        this.imgList.push({ fileAddr: res.data.link });
+      }
+    },
+    handleRemove(file, fileList) {
+      console.log(file)
+      console.log(this.imgList)
+      if (file.response) {
+        this.imgList = this.imgList.filter(
+          (item) => item.fileAddr !== file.response.data.link
+        );
+      } else {
+        this.imgList = this.imgList.filter(
+          (item) =>
+            item.fileAddr !== file.url.slice(file.url.lastIndexOf("/") + 1)
+        );
+      }
+    },
+    beforeUpload(file) {
+      const isJPG = file.type === "image/jpeg";
+      const isPNG = file.type === "image/png";
+      const isLt2M = file.size / 1024 / 1024 < 5;
+      if (!isJPG && !isPNG) {
+        this.$message.error("上传头像图片只能是 JPG 格式或者 PNG 格式!");
+        return false;
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 5MB!");
+        return false;
+      }
+      return true;
+    },
     submitForm() {
       this.$refs["registerForm"].validate((valid) => {
         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",
-                });
+          let params = {};
+          this.recordData.map(
+            (item) => (item.talkingTime = item.talkingTime + ":00")
+          );
+          let tmp = this.recordData.find((item) => item.talkingHis == "");
+          if (tmp) {
+            this.$message.error("请填写接谈记录详情");
+          } else {
+            params = {
+              ...this.form,
+              dutyDeptIds: this.form.dutyDeptIds
+                ? this.form.dutyDeptIds.join(",")
+                : "",
+              fileList: this.imgList,
+              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",
+                  });
+                }
               }
-            }
-          })
+            });
+          }
         }
       });
     },
@@ -1124,15 +1170,13 @@ export default {
       }
     }
   }
-
-  
 }
 /deep/ .el-upload-list {
-    .el-upload-list__item {
-      width: 394px;
-      height: 174px;
-    }
+  .el-upload-list__item {
+    width: 394px;
+    height: 174px;
   }
+}
 /deep/ .cell_item {
   background: #f5f7fa;
 }