merge fix

src/api/project/index.js

@@ -2,172 +2,172 @@ import fetch from '../fetch.js'
 import request from '@/api/axios'
 
 export default {
-    /**
+  /**
      * 项目相关借口
      * @returns {Promise<unknown>}
      */
-    projectList(current, size, params) { // 项目列表
-        return fetch('/blade-project-manage-v2/project/v2/page', {
-            ...params,
-            current,
-            size
-        })
-    },
-    projectAdd(params) { // 新增项目
-        return fetch('/blade-project-manage-v2/project/v2/save', params, 'post', 'json')
-    },
-    projectRemove(params) { // 删除项目
-        return fetch('/blade-project-manage-v2/project/v2/remove', params, 'post')
-    },
-    proContact(params) { // 关联子项目
-        return fetch('/blade-project-manage-v2/project/v2/connect', params, 'post', 'json')
-    },
-    removeContact(params) {
-        return fetch('/blade-project-manage-v2/project/v2/removeConnect', params, 'post')
-    },
-    childrenList(params) { // 已关联子项目列表
-        return fetch('/blade-project-manage-v2/project/v2/childrenList', params)
-    },
-    typeList(params) { // 项目分类列表
-        return fetch('/blade-project-manage-v2/typeAndStage/v2/page', params)
-    },
-    projectInfo(id) { // 项目详细信息
-        return fetch('/blade-project-manage-v2/project/v2/detail/?id=' + id)
-    },
-    projectMapInfo(id) { // 项目详细信息
-        return fetch('/blade-project-manage-v2/project/v2/newDetail/?id=' + id)
-    },
-    proUpdate(params) { // 项目信息更新
-        return fetch('/blade-project-manage-v2/project/v2/newUpdate', params, 'post', 'json')
-    },
-    issuanceDetail(params) { // 项目发行明细
-        return fetch('/blade-project-manage-v2/projectdetail/v2/list', params)
-    },
-    issueAdd(params) { // 新增发行明细
-        return fetch('/blade-project-manage-v2/projectdetail/v2/save', params, 'post', 'json')
-    },
-    userStageList() { // 统计用户阶段项目数
-        return fetch('/blade-project-manage-v2/stage/v2/projectCount')
-    },
-    userNunList(params) { // 统计用户各类型项目数
-        return fetch('/blade-project-manage-v2/project/v2/projectStageNumber', params)
-    },
-    updateStage(params) { // 修改项目情况
-        return fetch('/blade-project-manage-v2/project/v2/updateProjectStage', params, 'post')
-    },
-    includeStage(params) { // 单个项目包含阶段
-        return fetch('/blade-project-manage-v2/stage/v2/projectStages', params)
-    },
-    folderList(params) { // 阶段包含文件夹列表
-        return fetch('/blade-project-manage-v2/folder/v2/listByStageId', params)
-    },
-    sqRecord(params) { // 文件夹授权记录
-        return fetch('/blade-project-manage-v2/qrcode/v2/grantLog', params)
-    },
-    findFiles(params) { // 文件搜索
-        return fetch('/blade-project-manage-v2/folder/v2/findFile', params)
-    },
-    folderListAll(params) { // 历史数据文件夹列表
-        return fetch('/blade-project-manage-v2/folder/v2/history', params)
-    },
-    folderRemove(params) { // 删除文件夹
-        return fetch('/blade-project-manage-v2/folder/v2/remove', params, 'post')
-    },
-    folderAdd(params) { // 添加文件夹
-        return fetch('/blade-project-manage-v2/folder/v2/submit', params, 'post', 'json')
-    },
-    folderUpdate(params) { // 文件夹更新
-        return fetch('/blade-project-manage-v2/folder/v2/submit', params, 'post', 'json')
-    },
-    fileList(params) { // 文件夹里包含文件列表
-        return fetch('/blade-project-manage-v2/folder/v2/getListByFolderId', params)
-    },
-    fileDetail(id) {
-        return fetch('/wutong-library/library/detail/' + id)
-    },
-    articleDetailByFile(id) {
-        return fetch('/wutong-library/library/detail/file/' + id)
-    },
-    fileAdd(params) { // 上传（新增）文件
-        return fetch('/blade-project-manage-v2/folder/v2/saveFile', params, 'post', 'json')
-    },
-    fileRemove(params) { // 删除文件
-        return fetch('/blade-project-manage-v2/folder/v2/remove', params, 'post')
-    },
-    /**
+  projectList (current, size, params) { // 项目列表
+    return fetch('/blade-project-manage-v2/project/v2/page', {
+      ...params,
+      current,
+      size
+    })
+  },
+  projectAdd (params) { // 新增项目
+    return fetch('/blade-project-manage-v2/project/v2/save', params, 'post', 'json')
+  },
+  projectRemove (params) { // 删除项目
+    return fetch('/blade-project-manage-v2/project/v2/remove', params, 'post')
+  },
+  proContact (params) { // 关联子项目
+    return fetch('/blade-project-manage-v2/project/v2/connect', params, 'post', 'json')
+  },
+  removeContact (params) {
+    return fetch('/blade-project-manage-v2/project/v2/removeConnect', params, 'post')
+  },
+  childrenList (params) { // 已关联子项目列表
+    return fetch('/blade-project-manage-v2/project/v2/childrenList', params)
+  },
+  typeList (params) { // 项目分类列表
+    return fetch('/blade-project-manage-v2/typeAndStage/v2/page', params)
+  },
+  projectInfo (id) { // 项目详细信息
+    return fetch('/blade-project-manage-v2/project/v2/detail/?id=' + id)
+  },
+  projectMapInfo (id) { // 项目详细信息
+    return fetch('/blade-project-manage-v2/project/v2/newDetail/?id=' + id)
+  },
+  proUpdate (params) { // 项目信息更新
+    return fetch('/blade-project-manage-v2/project/v2/newUpdate', params, 'post', 'json')
+  },
+  issuanceDetail (params) { // 项目发行明细
+    return fetch('/blade-project-manage-v2/projectdetail/v2/list', params)
+  },
+  issueAdd (params) { // 新增发行明细
+    return fetch('/blade-project-manage-v2/projectdetail/v2/save', params, 'post', 'json')
+  },
+  userStageList () { // 统计用户阶段项目数
+    return fetch('/blade-project-manage-v2/stage/v2/projectCount')
+  },
+  userNunList (params) { // 统计用户各类型项目数
+    return fetch('/blade-project-manage-v2/project/v2/projectStageNumber', params)
+  },
+  updateStage (params) { // 修改项目情况
+    return fetch('/blade-project-manage-v2/project/v2/updateProjectStage', params, 'post')
+  },
+  includeStage (params) { // 单个项目包含阶段
+    return fetch('/blade-project-manage-v2/stage/v2/projectStages', params)
+  },
+  folderList (params) { // 阶段包含文件夹列表
+    return fetch('/blade-project-manage-v2/folder/v2/listByStageId', params)
+  },
+  sqRecord (params) { // 文件夹授权记录
+    return fetch('/blade-project-manage-v2/qrcode/v2/grantLog', params)
+  },
+  findFiles (params) { // 文件搜索
+    return fetch('/blade-project-manage-v2/folder/v2/findFile', params)
+  },
+  folderListAll (params) { // 历史数据文件夹列表
+    return fetch('/blade-project-manage-v2/folder/v2/history', params)
+  },
+  folderRemove (params) { // 删除文件夹
+    return fetch('/blade-project-manage-v2/folder/v2/remove', params, 'post')
+  },
+  folderAdd (params) { // 添加文件夹
+    return fetch('/blade-project-manage-v2/folder/v2/submit', params, 'post', 'json')
+  },
+  folderUpdate (params) { // 文件夹更新
+    return fetch('/blade-project-manage-v2/folder/v2/submit', params, 'post', 'json')
+  },
+  fileList (params) { // 文件夹里包含文件列表
+    return fetch('/blade-project-manage-v2/folder/v2/getListByFolderId', params)
+  },
+  fileDetail (id) {
+    return fetch('/wutong-library/library/detail/' + id)
+  },
+  articleDetailByFile (id) {
+    return fetch('/wutong-library/library/detail/file/' + id)
+  },
+  fileAdd (params) { // 上传（新增）文件
+    return fetch('/blade-project-manage-v2/folder/v2/saveFile', params, 'post', 'json')
+  },
+  fileRemove (params) { // 删除文件
+    return fetch('/blade-project-manage-v2/folder/v2/remove', params, 'post')
+  },
+  /**
      * 业主主动授权
      * @param params
      * @returns {Promise | Promise<unknown>}
      */
-    initCode(params) {
-        return fetch('/blade-project-manage-v2/qrcode/v2/getGrantQrcode', params, 'post', 'json')
-    },
-    /**
+  initCode (params) {
+    return fetch('/blade-project-manage-v2/qrcode/v2/getGrantQrcode', params, 'post', 'json')
+  },
+  /**
      * 服务商触发消息发送
      * @param params
      * @returns {Promise | Promise<unknown>}
      */
-    send(params) {
-        return fetch('/blade-project-manage-v2/frontMessage/v2/sendMessage', params)
-    },
-    /**
+  send (params) {
+    return fetch('/blade-project-manage-v2/frontMessage/v2/sendMessage', params)
+  },
+  /**
      * 服务商主动申请文件授权
      * @param params
      * @returns {Promise<unknown>}
      */
-    apply(params) {
-        return fetch('/blade-project-manage-v2/grant/v2/applyGrant', params, 'post', 'json')
-    },
-    folderType(params) {
-        return fetch('/blade-project-manage-v2/dict/v2/getDictList', params)
-    },
-    /**
+  apply (params) {
+    return fetch('/blade-project-manage-v2/grant/v2/applyGrant', params, 'post', 'json')
+  },
+  folderType (params) {
+    return fetch('/blade-project-manage-v2/dict/v2/getDictList', params)
+  },
+  /**
      * 全站搜索
      * @param params
      * @returns {Promise<unknown>}
      */
-    totalSearch(params) {
-        return fetch('/blade-project-manage-v2/searcher/v2/getListByKeyword', params, 'post', 'json')
-    },
-    /**
+  totalSearch (params) {
+    return fetch('/blade-project-manage-v2/searcher/v2/getListByKeyword', params, 'post', 'json')
+  },
+  /**
      * 搜索详情
      */
-    searchDetail(params) {
-        return fetch('/blade-project-manage-v2/searcher/v2/searchFileDetails', params, 'post', 'json')
-    },
-    total(params) {
-        return fetch('/blade-project-manage-v2/searcher/v2/getTotalByKeyword', params, 'post')
-    },
-    totalAmount(params) {
-        return fetch('/blade-project-manage-v2/project/v2/getTotalAmount', params)
-    },
-    /**
+  searchDetail (params) {
+    return fetch('/blade-project-manage-v2/searcher/v2/searchFileDetails', params, 'post', 'json')
+  },
+  total (params) {
+    return fetch('/blade-project-manage-v2/searcher/v2/getTotalByKeyword', params, 'post')
+  },
+  totalAmount (params) {
+    return fetch('/blade-project-manage-v2/project/v2/getTotalAmount', params)
+  },
+  /**
      * 是否需要归档
      */
-    isHistory(params) {
-        return fetch('/blade-project-manage-v2/folder/v2/isHistory', params)
-    },
-    /**
+  isHistory (params) {
+    return fetch('/blade-project-manage-v2/folder/v2/isHistory', params)
+  },
+  /**
      * 归档
      */
-    doneHistory(params) {
-        return fetch('/blade-project-manage-v2/folder/v2/history', params)
-    },
-    /**
+  doneHistory (params) {
+    return fetch('/blade-project-manage-v2/folder/v2/history', params)
+  },
+  /**
      * 是否有权限创建文件夹
      */
-    queryCreateFolder(params) {
-        return fetch('/blade-project-manage-v2/folder/v2/queryFolderGrant', params)
-    }
+  queryCreateFolder (params) {
+    return fetch('/blade-project-manage-v2/folder/v2/queryFolderGrant', params)
+  }
 }
 
 export const getLazyList = (parentId, params) => {
-    return request({
-        url: '/api/blade-project-manage-v2/project/v2/childrenList',
-        method: 'get',
-        params: {
-            ...params,
-            parentId
-        }
-    })
+  return request({
+    url: '/api/blade-project-manage-v2/project/v2/childrenList',
+    method: 'get',
+    params: {
+      ...params,
+      parentId
+    }
+  })
 }

src/views/home/component/params/params1.vue

@@ -255,10 +255,10 @@ export default {
       }
     },
     updata () {
-      this.detail.projectId = this.detail.id
-      this.detail.total_amount = Number.parseFloat(this.detail.total_amount)
+      this.form.projectId = this.detail.id
+      this.form.total_amount = Number.parseFloat(this.detail.total_amount)
       delete this.detail._id
-      this.$api.project.proUpdate(this.detail).then(res => {
+      this.$api.project.proUpdate(this.form).then(res => {
         if (res.code === 200) {
           this.$message.success(res.msg)
         } else {