diff --git a/package.json b/package.json
index 049d793..dd516ad 100644
--- a/package.json
+++ b/package.json
@@ -32,17 +32,18 @@
     "js-md5": "^0.8.3",
     "jsbarcode": "^3.11.0",
     "jsonlint": "^1.6.3",
+    "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "monaco-editor": "^0.20.0",
     "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",
     "qrcodejs2": "^0.0.2",
     "reconnecting-websocket": "^4.4.0",
+    "sass": "^1.77.8",
     "sass-loader": "^14.2.1",
     "screenfull": "^4.2.0",
     "script-loader": "^0.7.2",
     "serve-static": "^1.13.2",
-    "sass": "^1.77.8",
     "style-loader": "^4.0.0",
     "vue": "^2.6.14",
     "vue-drag-resize": "^1.4.2",
diff --git a/src/components/PasswordForm/index.vue b/src/components/PasswordForm/index.vue
index 4a34e3f..a35c9df 100644
--- a/src/components/PasswordForm/index.vue
+++ b/src/components/PasswordForm/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="passForm">
+  <div class="password">
     <div class="btn" @click="openDialog">
       <slot></slot>
     </div>
@@ -9,128 +9,174 @@
       :visible.sync="visible"
       lock-scroll
       append-to-body
-      width="600px"
+      width="40%"
       :modal-append-to-body="false"
       class="NCC-dialog NCC-dialog_center dialog-box"
       destroy-on-close
     >
-      <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-        <el-form-item label="旧密码" prop="oldPassword">
-          <el-input
-            v-model="user.oldPassword"
-            placeholder="请输入旧密码"
-            type="password"
-            show-password
-          />
-        </el-form-item>
-        <el-form-item label="新密码" prop="newPassword">
-          <el-input
-            v-model="user.newPassword"
-            placeholder="请输入新密码"
-            type="password"
-            show-password
-          />
-        </el-form-item>
-        <el-form-item label="确认密码" prop="confirmPassword">
-          <el-input
-            v-model="user.confirmPassword"
-            placeholder="请确认新密码"
-            type="password"
-            show-password
-          />
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submit">保存</el-button>
-        <el-button type="danger" @click="visible = false">关闭</el-button>
-      </span>
+      <div class="NCC-common-title mb-20">
+        <h4 class="bold">修改密码</h4>
+      </div>
+      <el-row>
+        <el-col :span="16">
+          <el-form
+            ref="dataForm"
+            :model="dataForm"
+            :rules="dataRule"
+            label-width="100px"
+          >
+            <el-form-item label="旧密码" prop="oldPassword">
+              <el-input
+                v-model="dataForm.oldPassword"
+                placeholder="旧密码"
+                show-password
+              />
+            </el-form-item>
+            <el-form-item label="新密码" prop="password">
+              <el-input
+                v-model="dataForm.password"
+                placeholder="新密码"
+                show-password
+              />
+            </el-form-item>
+            <el-form-item label="重复密码" prop="password2">
+              <el-input
+                v-model="dataForm.password2"
+                placeholder="重复密码"
+                show-password
+              />
+            </el-form-item>
+            <el-form-item label="验证码" prop="code">
+              <el-col :span="17">
+                <el-input v-model="dataForm.code" placeholder="验证码">
+                </el-input>
+              </el-col>
+              <el-col :span="6" :offset="1" style="height: 32px">
+                <img
+                  id="imgcode"
+                  alt="点击切换验证码"
+                  title="点击切换验证码"
+                  :src="define.comUrl + imgUrl"
+                  @click="changeImg"
+                />
+              </el-col>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="dataFormSubmit()">保 存</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { updateUserPwd } from "@/api/index";
+import md5 from "js-md5";
+import { UpdatePassword } from "@/api/permission/userSetting";
 export default {
-  name: "PassForm",
-  props: {},
   data() {
-    const equalToPassword = (rule, value, callback) => {
-      if (this.user.newPassword !== value) {
-        callback(new Error("两次输入的密码不一致"));
+    var validatePass = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("新密码不能为空"));
+      } else {
+        if (this.dataForm.password2 !== "") {
+          this.$refs.dataForm.validateField("password2");
+        }
+        callback();
+      }
+    };
+    var validatePass2 = (rule, value, callback) => {
+      if (value !== this.dataForm.password) {
+        callback(new Error("两次密码输入不一致"));
       } else {
         callback();
       }
     };
     return {
       visible: false,
-      user: {
-        oldPassword: undefined,
-        newPassword: undefined,
-        confirmPassword: undefined,
+      dataForm: {
+        oldPassword: "",
+        password: "",
+        password2: "",
+        code: "",
       },
-      // 表单校验
-      rules: {
+      imgUrl: "",
+      timestamp: "",
+      dataRule: {
         oldPassword: [
           { required: true, message: "旧密码不能为空", trigger: "blur" },
         ],
-        newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          {
-            min: 6,
-            max: 20,
-            message: "长度在 6 到 20 个字符",
-            trigger: "blur",
-          },
-          {
-            pattern: /^[^<>"'|\\]+$/,
-            message: "不能包含非法字符：< > \" ' \\\ |",
-            trigger: "blur",
-          },
+        password: [
+          { required: true, validator: validatePass, trigger: "blur" },
         ],
-        confirmPassword: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" },
+        password2: [
+          { required: true, message: "重复密码不能为空", trigger: "blur" },
+          { validator: validatePass2, trigger: "blur" },
         ],
+        code: [{ required: true, message: "验证码不能为空", trigger: "blur" }],
       },
     };
   },
-  watch: {},
-  mounted() {},
   created() {},
   methods: {
     openDialog() {
       this.visible = true;
       this.$nextTick(() => {
-        this.$refs["form"].resetFields();
+        this.changeImg();
+        this.$refs["dataForm"].resetFields();
       });
     },
-    
-    submit() {
-      this.$refs["form"].validate((valid) => {
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
         if (valid) {
-          updateUserPwd(
-            this.$store.state.id,
-            this.user.oldPassword,
-            this.user.newPassword
-          ).then((res) => {
-            this.$message({
-              message: "修改密码成功，请重新登录！",
-              type: "success",
-              duration: 1000,
-              onClose: () => {
-                // 修改成功之后重新登陆
-                this.visible = false;
-                this.$store.dispatch("LogOut").then(() => {
-                  this.$router.push({ path: "/login" });
-                });
-              },
+          let query = {
+            oldPassword: md5(this.dataForm.oldPassword),
+            password: md5(this.dataForm.password),
+            code: this.dataForm.code,
+            timestamp: this.timestamp,
+          };
+          UpdatePassword(query)
+            .then((res) => {
+              this.$message({
+                message: res.msg,
+                type: "success",
+                duration: 1500,
+                onClose: () => {
+                  this.$store.dispatch("user/resetToken").then(() => {
+                    this.$router.push(`/login`);
+                  });
+                },
+              });
+            })
+            .catch(() => {
+              this.changeImg();
             });
-          });
         }
       });
     },
+    changeImg() {
+      let timestamp = Math.random();
+      this.timestamp = timestamp;
+      this.imgUrl = `/api/file/ImageCode/${timestamp}`;
+    },
   },
 };
 </script>
 <style lang="scss" scoped>
+.password {
+  >>> .el-input-group__append {
+    padding: 0;
+    height: 30px;
+  }
+  #imgcode {
+    width: 100px;
+    height: 32px;
+    overflow: hidden;
+    object-fit: cover;
+    cursor: pointer;
+    margin: 0;
+    padding: 0;
+  }
+}
 </style>
diff --git a/src/main.js b/src/main.js
index 630e9e5..586ab58 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,7 @@ import './permission'
 import moment from "moment";
 import i18n from './lang' // internationalization
 import selectLoadMore from '@/utils/loadmore.js';
-
+import _ from 'lodash'
 
 Vue.config.productionTip = false
 Vue.prototype.$m = moment
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index dcadd8c..6c3b7c7 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -53,7 +53,7 @@
           </el-row>
           <div class="btns-box">
             <el-button type="success" icon="el-icon-plus" @click="addForm()" size="mini" >新增</el-button>
-            <el-button type="primary" icon="el-icon-download" size="mini" @click="exportDemo()">导出模板</el-button>
+            <el-button type="primary" icon="el-icon-download" size="mini" @click="exportDemo()">{{ isSHILevel ? '模板' : '线索上报模板' }}</el-button>
             <el-upload
                 class="uploadXlax"
                 :action="define.APIURl + '/api/Extend/BaseInspectionReport/Actions/ImportByExcel'"
@@ -64,11 +64,11 @@
                 name="excelfile"
               >
                 <div class="avatar-box">
-                  <el-button type="info" icon="el-icon-upload" size="mini">导入</el-button>
+                  <el-button type="info" icon="el-icon-upload" size="mini">线索上报导入</el-button>
                 </div>
               </el-upload>
             <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()" >导出</el-button>
-            <el-button v-if="!isSHILevel" type="primary" icon="el-icon-download" size="mini" @click="exportMakeDemo()">导出处理模板</el-button>
+            <el-button v-if="!isSHILevel" type="primary" icon="el-icon-download" size="mini" @click="exportMakeDemo()">处置结果模板</el-button>
             <el-upload
                 v-if="!isSHILevel"
                 class="uploadXlax"
@@ -80,7 +80,7 @@
                 name="excelfile"
               >
                 <div class="avatar-box">
-                  <el-button type="info" icon="el-icon-upload" size="mini">批量上报</el-button>
+                  <el-button type="info" icon="el-icon-upload" size="mini">处置结果导入</el-button>
                 </div>
               </el-upload>
           </div>
@@ -111,7 +111,7 @@
               <el-table-column label="操作" fixed="right" width="200">
                 <template slot-scope="scope">
                   <template v-if="userId == scope.row.creatorUserId">
-                    <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">编辑</el-button>
+                    <el-button type="text" @click="addForm(scope.row.id)" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">编辑</el-button>
                     <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">删除</el-button>
                   </template>
                   <el-button type="text" @click="addOrUpdateHandle(scope.row.id, false, 'edit')" v-if="isSHILevel && scope.row.stage == '577006666214540549'" >建议修改</el-button>
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index fdace34..ee64dd7 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -112,21 +112,21 @@
         <el-col :span="24">
           <el-form-item label="问题类型" prop="questionType">
             <el-radio-group v-model="dataForm.questionType">
-              <el-radio v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" >{{ item.fullName }}</el-radio>
+              <el-radio v-for="(item, index) in questionTypeOptions" :key="index" :label="item.id" >{{ item.fullName }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-show="dataForm.questionType == '其他'">
+        <el-col :span="24" v-show="dataForm.questionType == '0'">
           <el-form-item label="其他问题类型" prop="otherQuestionType">
             <el-input v-model="dataForm.otherQuestionType" placeholder="请输入其他问题类型" clearable :style="{ width: '100%' }" />
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-show="dataForm.questionType == '错误表述'">
+        <el-col :span="24" v-show="dataForm.questionType == '584886326260663557'">
           <el-form-item label="正确描述" prop="accurateDescription">
             <el-input v-model="dataForm.accurateDescription" placeholder="请输入正确描述" clearable :style="{ width: '100%' }"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-show="dataForm.questionType == '错误表述'">
+        <el-col :span="24" v-show="dataForm.questionType == '584886326260663557'">
           <el-form-item label="错误描述" prop="incorrectDescription">
             <el-input v-model="dataForm.incorrectDescription" placeholder="请输入错误描述" clearable :style="{ width: '100%' }"></el-input>
           </el-form-item>
@@ -218,11 +218,11 @@
         <div class="label w-120">问题类型：</div>
         <div class="text">{{ dataForm.questionType || '--' }}</div>
       </el-col>
-      <el-col class="form-item" v-show="dataForm.questionType == '错误表述'">
+      <el-col class="form-item" v-show="dataForm.questionType == '584886326260663557'">
         <div class="label w-120">正确描述：</div>
         <div class="text">{{ dataForm.accurateDescription || '--' }}</div>
       </el-col>
-      <el-col class="form-item" v-show="dataForm.questionType == '错误表述'">
+      <el-col class="form-item" v-show="dataForm.questionType == '584886326260663557'">
         <div class="label w-120">错误描述：</div>
         <div class="text">{{ dataForm.incorrectDescription || '--' }}</div>
       </el-col>
@@ -317,14 +317,14 @@ export default {
         platformName: '',
         selfMediaPlatformType: '',
         platformType: undefined,
-        questionType: undefined,
+        questionType: undefined, // 问题类型id
         questionClass: undefined,
         questionContent: undefined,
         link: undefined,
         accurateDescription: undefined,
         incorrectDescription: undefined,
         annex: [],
-        otherQuestionType: undefined,
+        otherQuestionType: undefined, // 其他问题类型名称
         selfMediaPlatformTypeOther: undefined,
         company: undefined,
         reportSourceName: undefined,
@@ -364,7 +364,13 @@ export default {
       },
       sourceOptions: [],
       platformTypeOptions: [],
-      questionTypeOptions: [],
+      questionTypeOptions: [
+        { fullName: "存在有害信息", id: "577006944540165381" },
+        { fullName: "内容审核不到位", id: "577006978564359429" },
+        { fullName: "错误表述", id: "584886326260663557" },
+        { fullName: "删除链接", id: "591435954770674949" },
+        { fullName: "样本查删", id: "591436151911351557" },
+      ],
       nameOptions: [], // 应用名称
       mediaPlatList: MediaPlatList,
       companyOptions: [],
@@ -392,7 +398,7 @@ export default {
   mounted() {},
   methods: {
     async initAllList() {
-      let companyRes = await request({
+       let companyRes = await request({
         url: `/Extend/basecomapnyinfo/GetNoPagingList`,
         method: "GET",
       });
@@ -406,7 +412,7 @@ export default {
       !list && (list = await this.$store.dispatch("getTypeListByCode", "system"));
       this.platformTypeOptions = list;
       await getDictionaryDataSelector("577006814432855301").then((res) => {
-        this.questionTypeOptions = [...res.data.list, {Id: '0', fullName: '其他'}];
+        this.questionTypeOptions = [...res.data.list, {id: '0', fullName: '其他'}];
       });
       // this.name_loading = true
       // this.name_loading = false;
@@ -539,9 +545,9 @@ export default {
           }
           res.data.areaId && (this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions));
           this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName);
-          if(this.questionTypeOptions.findIndex(v => v.fullName == this.dataForm.questionType) == -1) {
+          if(this.questionTypeOptions.findIndex(v => v.id == this.dataForm.questionType) == -1) {
             this.dataForm.otherQuestionType = res.data.questionType;
-            this.dataForm.questionType = '其他';
+            this.dataForm.questionType = '0';
           }
           this.dataForm.selfMediaPlatformType = res.data.selfMediaPlatformType || '--';
           this.form_loading = false;
@@ -555,8 +561,8 @@ export default {
         if (valid) {
           let obj = {
             ...this.dataForm,
-            questionType: this.dataForm.questionType == '其他' ? this.dataForm.otherQuestionType : this.dataForm.questionType,
-            selfMediaPlatformType: this.dataForm.selfMediaPlatformType == '其他' ? this.dataForm.selfMediaPlatformTypeOther : this.dataForm.selfMediaPlatformType,
+            questionType: this.dataForm.questionType == '0' ? this.dataForm.otherQuestionType : this.dataForm.questionType,
+            selfMediaPlatformType: this.dataForm.selfMediaPlatformType == '0' ? this.dataForm.selfMediaPlatformTypeOther : this.dataForm.selfMediaPlatformType,
             disposalSuggestions: [
               {
                 disposalSuggestion: this.dataForm.disposalSuggestions,