Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/api/system/user.js

@@ -88,7 +88,7 @@ export const resetPassword = (userIds) => {
   })
 }
 
-export const updatePassword = (oldPassword, newPassword, newPassword1) => {
+export const updatePassword = (oldPassword, newPassword, newPassword1,plaintextPassword) => {
   return request({
     url: '/api/blade-user/update-password',
     method: 'post',
@@ -96,6 +96,7 @@ export const updatePassword = (oldPassword, newPassword, newPassword1) => {
       oldPassword,
       newPassword,
       newPassword1,
+      plaintextPassword,
     }
   })
 }

src/views/manager/wbsinfo/edit.vue

@@ -1536,7 +1536,7 @@ export default {
     },
     async wbsTreeSort () {//修改排序
       const { data: res } = await wbsTreeSort(this.sort)
-      console.log(res);
+      //console.log(res);
       if (res.code == 200) {
         this.sortTag = false
         this.sortTag2 = false
@@ -1545,14 +1545,14 @@ export default {
     },
     async findWbsTreeSameLevel (parentId) {//查询当前节点的同级节点
       const { data: res } = await findWbsTreeSameLevel({ parentId })
-      console.log(res);
+      //console.log(res);
       if (res.code === 200) {
         this.sort = res.data
       }
     },
     async getLazytree () {//冲洗获取wbs树
       const { data: res } = await getLazytree(this.id, 0, this.userInfo.tenant_id)
-      console.log(res);
+      //console.log(res);
       if (res.code == 200) {
         this.treeData = res.data
       }
@@ -1580,14 +1580,14 @@ export default {
     },
     async findWbsTreeTableSameLevel (id) {//查询表单
       const { data: res } = await findWbsTreeTableSameLevel({ id })
-      console.log(res);
+      //console.log(res);
       if (res.code == 200) {
         this.sort = res.data
       }
     },
     async wbsTreeTableSort () {//表单排序
       const { data: res } = await wbsTreeTableSort(this.sort)
-      console.log(res);
+      //console.log(res);
       if (res.code == 200) {
         this.excelSortTag = true
         this.excelSortTag2 = true
@@ -1641,7 +1641,7 @@ export default {
             this.updateNode();
           }
         } else {
-          console.log('error submit!!');
+          //console.log('error submit!!');
           return false;
         }
       });
@@ -1802,7 +1802,7 @@ export default {
             });
           })
         } else {
-          console.log('error submit!!');
+          //console.log('error submit!!');
           return false;
         }
       });
@@ -2324,18 +2324,18 @@ export default {
     },
     async parameters (wbsId) {//获取接待你参数列表
       const { data: res } = await parameters({ wbsId })
-      console.log(res);
+      //console.log(res);
       if (res.code == 200) {
         this.nodeInfoTable = res.data
       }
     },
     async saveOrUpdateBatch (da) {//保存
       const { data: res } = await saveOrUpdateBatch(da)
-      console.log(res);
+      //console.log(res);
     },
     async keymap () {//节点参数枚举
       const { data: res } = await keymap()
-      console.log(res);
+      //console.log(res);
       if (res.code = 200) {
         this.namelist = res.data
       }
@@ -2373,7 +2373,7 @@ export default {
       this.ImportElementFile = []
     },
     ElementChange (file, fileList) {//文件上传时的钩子
-      console.log(fileList);
+      //console.log(fileList);
       if (this.ImportElementFile.length == 0) {
         this.ImportElementFile = fileList
       }
@@ -2383,18 +2383,18 @@ export default {
     },
     async importwbsTreeFormBatch (da) {
       const { data: res } = await importwbsTreeFormBatch(da)
-      console.log();
+      //console.log();
       if (res.code == 200) {
         this.$message({
           type: "success",
-          message: "新增元素成功!"
+          message: "导入成功!"
         })
       }
 
     },
     async exportBatchTemplate () {
       const res = await exportBatchTemplate()
-      console.log(res);
+      //console.log(res);
       if (res.status == 200) {
         this.downloadExcel(res.data, '导入元素模板')
       }
@@ -2449,7 +2449,7 @@ export default {
     },
     async updateBatchNodeTableInfo (da) {//共有编辑元素
       const { data: res } = await updateBatchNodeTableInfo(da)
-      console.log(res);
+      //console.log(res);
       if (res.code == 200) {
         this.editElementFormTag = false
         this.updateNodeTable()

src/views/system/user.vue

@@ -1048,7 +1048,7 @@ export default {
       }
     },
     async getProjectList () {//项目类型
-      const { data: res } = await getProjectList()
+      const { data: res } = await getProjectList(1,999)
       console.log(res);
       if (res.code === 200) {
         this.projectData = res.data.records

src/views/system/userinfo.vue

@@ -48,7 +48,7 @@
             done();
           })
         } else {
-          updatePassword(md5(form.oldPassword), md5(form.newPassword), md5(form.newPassword1)).then(res => {
+          updatePassword(md5(form.oldPassword), md5(form.newPassword), md5(form.newPassword1),form.newPassword).then(res => {
             if (res.data.success) {
               this.$message({
                 type: "success",