完成文档案例分类顺序，修改密码，重置

src/components/pages/disAdmin/score.vue

@@ -41,7 +41,7 @@
               </el-select>
             </div>
           </div>
-          <div @click="clear" class="clear">重置</div>
+          
         </div>
         <div class="aName">
           <div class="search" @click="search">
@@ -52,6 +52,7 @@
             auto-complete="off"
             placeholder="请输入案例名称"
           ></el-input>
+					<div @click="clear" class="clear">重置</div>
           <!-- @input="search" -->
         </div>
       </div>
@@ -829,6 +830,29 @@ export default {
 					const start = (this.page - 1) * 10;
           const end = start + 10;
           let result = p.slice(start, end);
+
+					console.log("==============================")
+					console.log(result)
+					console.log("++++++++++++++++++++++++++++++")
+
+					result.forEach(i=>{
+						let typeName = i.typename;
+						if(typeName=="活动类" || typeName =="学科类")return;
+						let replaceValue = "";
+						// console.log(typeName.indexOf("活动类"))
+						// console.log(typeName.indexOf("理科类"))
+						if(typeName.indexOf("活动类")!=-1){
+							replaceValue = typeName.replace("活动类","")
+							console.log(replaceValue.split('/'))
+							typeName = `活动类：${replaceValue.split('/').filter(f=>f!=='').join('/')}`
+						}else if(typeName.indexOf("学科类")!=-1){
+							replaceValue = typeName.replace("学科类","")
+							console.log(replaceValue.split('/'))
+							typeName = `学科类：${replaceValue.split('/').filter(f=>f!=='').join('/')}`
+						}
+						i.typename = typeName;
+					})
+
           this.tableData = result;
           this.$forceUpdate();
         })
@@ -1712,13 +1736,15 @@ export default {
 
 .aName {
   position: relative;
+	display: flex;
+	align-items: center;
 }
 
 .search {
   width: 25px;
   position: absolute;
   top: 7px;
-  right: 10px;
+  right: 80px;
   z-index: 9;
   cursor: pointer;
 }

src/components/pages/munAdmin/data.vue

@@ -26,7 +26,7 @@
           "
         >
           <span @click="type = 1" :class="{ active: type == 1 }">我的资料</span>
-          <!-- <span @click="type = 2" :class="{ active: type == 2 }">修改密码</span> -->
+          <span @click="type = 2" :class="{ active: type == 2 }">修改密码</span>
         </div>
         <el-form
           v-if="type == 1"
@@ -309,6 +309,7 @@ export default {
             this.$message.success("修改成功");
             this.opassword = "";
             this.password = "";
+						this.password1 = "";
           } else {
             this.$message.error("修改失败,原密码不正确");
           }
@@ -408,7 +409,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: flex-start;
-  margin: 0 0 10px 150px;
+  margin: 0 0 10px 40px;
 }
 
 .isDataNav {