Merge remote-tracking branch 'origin/master'

src/api/project-demand/summary/index.js

@@ -18,9 +18,10 @@ export const requirementReported = (data) => {
     data: data
   });
 };
-export const getProcessInfo = () => {
+//获取需求上报 流程信息
+export const getProcessInfo = (specialFund) => {
   return request({
-    url: '/workflow/mosr/requirement/collect/process',
+    url: `/workflow/mosr/requirement/collect/process/${specialFund}`,
     method: "get"
   });
 };

src/components/DetailComponent/ExpenseDetail.vue

@@ -10,6 +10,8 @@
 </template>
 
 <script setup lang="jsx">
+import {getResearchUser} from "@/api/expense-manage";
+
 const route = useRoute()
 const searchConfig = reactive([
   {
@@ -47,6 +49,13 @@ const searchConfig = reactive([
 ])
 const tableConfig = reactive({
   columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
     {
       prop: 'projectName',
       label: '项目名称',
@@ -55,7 +64,10 @@ const tableConfig = reactive({
     {
       prop: 'researchPersonnel',
       label: '研发人员',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{getResearchName(row.researchPersonnel)}</span>
+      }
     },
     {
       prop: 'wagesPayable',
@@ -99,6 +111,21 @@ const tableConfig = reactive({
   }
 })
 const tableIns = ref()
+const researchOptions = ref([])
+const getResearchOptions = async () => {
+  const res = await getResearchUser()
+  researchOptions.value = res.data
+}
+const getResearchName=(id)=>{
+  if(!id)return;
+  let label=''
+  researchOptions.value.forEach(item=>{
+    if(item.value==id){
+      label=item.label
+    }
+  })
+  return label
+}
 const search = (val) => {
   tableConfig.params = {
     allocationId:route.query.id,
@@ -106,6 +133,7 @@ const search = (val) => {
   }
   tableIns.value.refresh()
 }
+getResearchOptions()
 </script>
 
 <style scoped>

src/components/DetailComponent/SpecialFundDetail.vue

@@ -10,12 +10,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="金额(元)">
-            <span>{{ formData.fundAmount }}</span>
+            <span>{{ toThousands(formData.fundAmount) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="剩余金额(元)">
-            <span>{{ formData.residualAmount }}</span>
+            <span>{{ toThousands(formData.residualAmount) }}</span>
           </el-form-item>
         </el-col>
         <baseTitle title="介绍"></baseTitle>
@@ -72,16 +72,18 @@
         </div>
       </div>
     </el-form>
-    <opinion v-if="data.taskId" :formData="data.formData" :taskId="data.taskId" v-model:value="formData.auditOpinion"></opinion>
+    <opinion v-if="data.taskId" :formData="data.formData" :taskId="data.taskId"
+             v-model:value="formData.auditOpinion"></opinion>
   </div>
 </template>
 
 <script setup lang="jsx">
+import {toThousands} from '@/utils/changePrice.js'
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {downloadFile} from "@/api/project-demand";
 
-const emit = defineEmits(['getInfo',"update:formData"])
+const emit = defineEmits(['getInfo', "update:formData"])
 const form = ref()
 
 const props = defineProps({
@@ -122,7 +124,10 @@ const projectTable = reactive({
     {
       prop: 'specialFundAmount',
       label: '项目金额',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.specialFundAmount)}</span>
+      }
     },
     {
       prop: 'startTime',
@@ -201,7 +206,7 @@ watch(() => props.showTable, (newVal) => {
 </script>
 
 <style scoped lang="scss">
-:deep(.el-table--fit ){
-  height: 300px!important;
+:deep(.el-table--fit ) {
+  height: 300px !important;
 }
 </style>

src/components/DetailComponent/SummaryDetail.vue

@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.specialFund">
+          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
             <span>{{localFormData.specialFund }}</span>
           </el-form-item>
         </el-col>
@@ -105,13 +105,13 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="经济概算(元)" prop="economicEstimate">
-            <span>{{ localFormData.economicEstimate }}</span>
+            <span>{{toThousands( localFormData.economicEstimate )}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
-                        v-if="localFormData.specialFundAmount">
-            <span>{{ localFormData.specialFundAmount }}</span>
+                        v-if="localFormData.isSpecialFund">
+            <span>{{ toThousands(localFormData.specialFundAmount) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -163,6 +163,7 @@
 </template>
 
 <script setup lang="jsx">
+import {toThousands} from '@/utils/changePrice.js'
 import {downloadFile, deleteFile} from "@/api/project-demand";
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'

src/utils/changePrice.js

@@ -0,0 +1,8 @@
+export const toThousands = (num) => {
+    if(num==undefined||num==null)return '--';
+    const options = {
+      style: 'currency',
+      currency: 'CNY',
+    };
+    return (num).toLocaleString('zh-CN', options)
+}

src/views/expense-management/ledger/index.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-
+import {toThousands} from '@/utils/changePrice.js'
 const router = useRouter()
 const route = useRoute()
 const searchConfig = reactive([
@@ -134,7 +134,19 @@ const tableConfig = reactive({
       currentRender:({row})=>{
         return <span>{toThousands(row.afterTax)}</span>
       }
-    }
+    },
+    {
+      prop: 'source',
+      label: '来源',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        if (row.source&&row.source !== null&&row.source!==undefined) {
+          return (<Tag dictType={'ledger_source'} value={row.source}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
   ],
   api: '/workflow/mosr/expense/ledger',
   params: {}
@@ -143,14 +155,6 @@ const search = (val) => {
   tableConfig.params = {...val}
   tableIns.value.refresh()
 }
-const toThousands=(num)=> {
-  if(num==undefined||num==null)return '--';
-  const options = {
-    style: 'currency',
-    currency: 'CNY',
-  };
-  return (num).toLocaleString('zh-CN', options)
-}
 </script>
 
 <style scoped>

src/views/expense-management/share/detail.vue

@@ -48,6 +48,7 @@
 </template>
 
 <script setup lang="jsx">
+import {toThousands} from '@/utils/changePrice.js'
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {ElNotification} from "element-plus";
@@ -104,12 +105,10 @@ const tableConfig = reactive({
     {
       prop: 'afterTax',
       label: '分摊金额',
-      align: 'center'
-    },
-    {
-      prop: 'digest',
-      label: '摘要',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.specialFundAmount)}</span>
+      }
     }
   ],
   api:'/workflow/mosr/cost/allocation/collect',
@@ -117,6 +116,7 @@ const tableConfig = reactive({
     allocationId:route.query.id
   }
 })
+
 const getDetail = async () => {
   const id = route.query.id
   shareProcessViewer.value = false

src/views/project-demand/summary/add.vue

@@ -16,12 +16,12 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="route.query.id&&formData.specialFund">
+        <el-col :span="6" v-if="route.query.id&&formData.isSpecialFund">
           <el-form-item label="专项资金" prop="specialFundId">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="!route.query.id&&formData.isSpecialFund">
+        <el-col :span="6" v-if="!route.query.id">
           <el-form-item label="专项资金" prop="specialFundId">
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
               <el-option
@@ -213,13 +213,8 @@
             <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济概算" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
-                        v-if="!route.query.id&&formData.isSpecialFund">
-            <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
-          </el-form-item>
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
-                        v-if="route.query.id">
+        <el-col :span="12" v-if="formData.isSpecialFund!==false">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
@@ -486,7 +481,7 @@ const init = async () => {
   specialFundOption.value = resFund.data
   const res = await getSubCompOpt()
   companyOption.value = res.data
-  getProcessInfo().then(res => {
+  getProcessInfo(formData.value.isSpecialFund).then(res => {
     if (res.code === 1000) {
       let data = res.data
       deploymentId.value = data.deploymentId

src/views/project-management/filing/index.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import {reactive, shallowRef} from "vue";
+import {toThousands} from '@/utils/changePrice.js'
 
 const router = useRouter()
 const shortcuts = [
@@ -265,14 +265,7 @@ const tableConfig = reactive({
   api: '/workflow/mosr/project/filing',
   params: {},
 })
-const toThousands=(num)=> {
-  if(num==undefined||num==null)return '--';
-  const options = {
-    style: 'currency',
-    currency: 'CNY',
-  };
-  return (num).toLocaleString('zh-CN', options)
-}
+
 const search = (val) => {
   let obj = {...val}
   if (obj.dateValue) {

src/views/project-management/implementation/components/ToolToShowUserPicker.vue

@@ -0,0 +1,25 @@
+<template>
+  <el-button type="primary" link >
+    {{ modelValue || '请选择抄送人员' }}
+  </el-button>
+</template>
+
+<script setup>
+import { ref, watch, watchEffect } from 'vue';
+
+const props = defineProps({
+  modelValue: {
+    type: String,
+    default: ''
+  }
+})
+
+// const emit = defineEmits('update: modelValue')
+
+const localText = ref('')
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/project-management/implementation/index.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import {reactive, shallowRef} from "vue";
+import {toThousands} from '@/utils/changePrice.js'
 
 const router = useRouter()
 const shortcuts = [
@@ -301,14 +301,7 @@ const tableConfig = reactive({
     {name: '生成分摊报表', key: '_export', color: '#DED0B2', auth: ''}
   ]
 })
-const toThousands=(num)=> {
-  if(num==undefined||num==null)return '--';
-  const options = {
-    style: 'currency',
-    currency: 'CNY',
-  };
-  return (num).toLocaleString('zh-CN', options)
-}
+
 const search = (val) => {
   let obj = {...val}
   if(obj.dateValue) {

src/views/project-management/implementation/phase.vue

@@ -1,8 +1,14 @@
 <template>
   <div class="apply-block">
+    <div>
+      抄送人员:
+      <Ttsup :modelValue="chooseUserInfo()" @click="chooseUser"/>
+    </div>
+    <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
     <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Phase/edit'"/>
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
+                      :preview="name === 'Phase/edit'"/>
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
@@ -16,7 +22,9 @@
 
 <script setup lang="jsx">
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getPhaseProcess,submitPhaseChange,getPhaseForm,resubmitPhaseForm} from "@/api/project-manage";
+import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
+import Ttsup from './components/ToolToShowUserPicker.vue'
+import {getPhaseProcess, submitPhaseChange, getPhaseForm, resubmitPhaseForm} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
@@ -25,6 +33,7 @@ const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
 const attachment = ref()
+const userPicker = ref()
 const name = ref(router.currentRoute.value.name)
 const loading = ref(false)
 const formData = ref({})
@@ -34,6 +43,7 @@ const showTable = ref(true)
 const otherFileList = ref([])
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
+const userList = ref([])
 const processStore = useProcessStore()
 const compositeParam = (item) => {
   let tag = ''
@@ -70,39 +80,131 @@ const getFileParam = (item) => {
     tag: item.tag
   }
 }
-const handleSubmit =async () => {
-    let files = []
-    let singleFile = {}
-    let fileArray
+
+const chooseUser = () => {
+  userPicker.value.showUserPicker()
+}
+const chooseUserInfo = () => {
+  if (userList.value.length > 0){
+    return userList.value.map(item => {
+      return item.name
+    }).join(',')
+  }else {
+    return "请选择抄送人员"
+  }
+}
+const selected = (select) => {
+  let userInfoList = []
+  for (let val of select) {
+    let userInfo = {
+      id: val.id,
+      name: val.name,
+      avatar: val.avatar,
+    }
+    userInfoList.push(userInfo)
+  }
+  userList.value = userInfoList
+}
+const handleSubmit = async () => {
+  let files = []
+  let singleFile = {}
+  let fileArray
+  if (file.value.fileId !== undefined) {
+    singleFile = {
+      fileId: file.value.fileId
+    }
+  }
+  fileArray = otherFileList.value
+  fileArray.forEach(item => {
+    files.push(getFileParam(item))
+  })
+  let userIds = []
+  if (userList.value.length > 0){
+    userIds = userList.value.map(item => {
+      return item.id
+    })
+  }
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: files,
+    singleFile: singleFile,
+    projectId: route.query.projectId,
+    userIds: userIds
+  }
+  if (JSON.stringify(singleFile) === "{}") {
+    attachment.value.validate()
+    ElNotification({
+      title: '提示',
+      message: '请上传附件',
+      type: 'error'
+    })
+    return;
+  } else {
+    attachment.value.clearValidate()
+  }
+  console.log('params-提交', params,userList.value)
+  // let res = await submitPhaseChange(params)
+  // ElNotification({
+  //   title: '提示',
+  //   message: res.msg,
+  //   type: res.code === 1000 ? 'success' : 'error'
+  // })
+  // if (res.code === 1000) {
+  //   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  //   await router.push({
+  //     name: 'Implementation'
+  //   })
+  // }
+}
+const handleResubmit = (instance) => {
+  let singleFile = {}
+  let otherFiles = []
+  let fileArray
+  if (attachment.value.singleFile !== null && name.value === 'Phase/edit') {
+    singleFile = {
+      fileId: attachment.value.singleFile.fileId
+    }
+    fileArray = attachment.value.allFileList
+  } else {
     if (file.value.fileId !== undefined) {
       singleFile = {
         fileId: file.value.fileId
       }
     }
     fileArray = otherFileList.value
-    fileArray.forEach(item => {
-      files.push(getFileParam(item))
+  }
+  fileArray.forEach(item => {
+    otherFiles.push(getFileParam(item))
+  })
+  let userIds = []
+  if (userList.value.length > 0){
+    userIds = userList.value.map(item => {
+      return item.id
     })
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: singleFile,
-      projectId: route.query.projectId,
-    }
-    if (JSON.stringify(singleFile) === "{}") {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    }else {
-      attachment.value.clearValidate()
-    }
-    console.log('params-提交', params)
-    let res = await submitPhaseChange(params)
+  }
+  //todo requirementId
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: otherFiles,
+    singleFile: singleFile,
+    projectId: route.query.projectId,
+    userIds: userIds
+  }
+  if (JSON.stringify(singleFile) === "{}") {
+    attachment.value.validate()
+    ElNotification({
+      title: '提示',
+      message: '请上传附件',
+      type: 'error'
+    })
+    return;
+  } else {
+    attachment.value.clearValidate()
+  }
+  console.log('重新提交params', params)
+  resubmitPhaseForm(params).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -110,67 +212,14 @@ const handleSubmit =async () => {
     })
     if (res.code === 1000) {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
+      router.push({
         name: 'Implementation'
       })
     }
-}
-const handleResubmit = (instance) => {
-    let singleFile = {}
-    let otherFiles = []
-    let fileArray
-    if (attachment.value.singleFile!==null&&name.value === 'Phase/edit') {
-      singleFile = {
-        fileId: attachment.value.singleFile.fileId
-      }
-      fileArray = attachment.value.allFileList
-    } else {
-      if (file.value.fileId !== undefined) {
-        singleFile = {
-          fileId: file.value.fileId
-        }
-      }
-      fileArray = otherFileList.value
-    }
-    fileArray.forEach(item => {
-      otherFiles.push(getFileParam(item))
-    })
-    //todo requirementId
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: otherFiles,
-      singleFile: singleFile,
-      projectId: route.query.projectId,
-    }
-    if (JSON.stringify(singleFile) === "{}") {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    }else {
-      attachment.value.clearValidate()
-    }
-    console.log('重新提交params', params)
-    resubmitPhaseForm(params).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Implementation'
-        })
-      }
-    })
+  })
 }
 const init = async () => {
-  const {msg, code,data} = await getPhaseProcess()
+  const {msg, code, data} = await getPhaseProcess()
   processDiagramViewer.value = false
   if (code === 1000) {
     deploymentId.value = data.deploymentId
@@ -184,11 +233,11 @@ const init = async () => {
     nextTick(() => {
       processDiagramViewer.value = true
     })
-  }else {
+  } else {
     ElNotification({
       title: '提示',
       message: msg,
-      type:'error'
+      type: 'error'
     })
   }
 }
@@ -201,21 +250,21 @@ const getDetailInfo = async () => {
     })
     if (res.code === 1000) {
       formData.value = res.data
-      loading.value=false
+      loading.value = false
     }
   })
 }
 onMounted(async () => {
   await init()
-  if (name.value === 'Phase/edit'){
-    loading.value=true
+  if (name.value === 'Phase/edit') {
+    loading.value = true
     await getDetailInfo()
   }
 })
 </script>
 
 <style scoped>
-.apply-block{
+.apply-block {
   margin: 15px 0;
 }
 </style>

src/views/project-management/initiation/index.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-
+import {toThousands} from '@/utils/changePrice.js'
 const router = useRouter()
 const shortcuts = [
   {
@@ -264,14 +264,7 @@ const tableConfig = reactive({
   api: '/workflow/mosr/project/approval',
   params: {},
 })
-const toThousands=(num)=> {
-  if(num==undefined||num==null)return '--';
-  const options = {
-    style: 'currency',
-    currency: 'CNY',
-  };
-  return (num).toLocaleString('zh-CN', options)
-}
+
 const search = (val) => {
   let obj = {...val}
   if(obj.dateValue) {

src/views/special-fund/index.vue

@@ -12,7 +12,7 @@
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import { ElNotification} from "element-plus";
 import {deleteFund} from "@/api/special-fund";
-
+import {toThousands} from '@/utils/changePrice.js'
 const router = useRouter()
 const searchConfig = reactive([
   {
@@ -159,14 +159,6 @@ const tableConfig = reactive({
   ]
 })
 const tableIns = ref()
-const toThousands=(num)=> {
-  if(num==undefined||num==null)return '--';
-  const options = {
-    style: 'currency',
-    currency: 'CNY',
-  };
-  return (num).toLocaleString('zh-CN', options)
-}
 
 const search = (val) => {
   tableConfig.params = {...val}

vite.config.js

@@ -1,8 +1,8 @@
-import {fileURLToPath, URL} from 'node:url'
-import {defineConfig} from 'vite'
+import { fileURLToPath, URL } from 'node:url'
+import { defineConfig } from 'vite'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
-import {ElementPlusResolver} from 'unplugin-vue-components/resolvers'
+import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 import Icons from 'unplugin-icons/vite'
 import IconsResolver from 'unplugin-icons/resolver'
 import vue from '@vitejs/plugin-vue'
@@ -17,7 +17,7 @@ export default defineConfig({
     vueJsx(),
     AutoImport({
       //自动导入vue相关函数
-      imports: ['vue', 'vue-router'],
+      imports: ['vue','vue-router'],
       resolvers: [
         ElementPlusResolver(),
         //自动导入图标组件
@@ -69,8 +69,8 @@ export default defineConfig({
     open: true,
     proxy: {
       // '/api/workflow': {
-      //   target: 'http://frp.feashow.cn:31800/',
-      //   // target: 'http://clay.frp.feashow.cn/',
+      //   // target: 'http://frp.feashow.cn:31800/',
+      //   target: 'http://clay.frp.feashow.cn/',
       //   // target: 'http://192.168.31.175:8000',
       //   changeOrigin: true,
       //   rewrite: (path) => path.replace(/^\/api/, '')
@@ -80,19 +80,19 @@ export default defineConfig({
       //   target: 'http://clay.frp.feashow.cn/',
       //   // target: 'http://192.168.31.175:8000',
       //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/summary/, '')
+      //   rewrite: (path) => path.replace(/^\/api/, '')
       // },
       '/api': {
-        target: 'http://mosr.feashow.cn',
-        // target: 'http://clay.frp.feashow.cn/',
+        // target: 'http://mosr.feashow.cn/',
+        target: 'http://10.7.127.57:8000',
         changeOrigin: true,
-        // rewrite: (path) => path.replace(/^\/api/, '')
+        rewrite: (path) => path.replace(/^\/api/, '')
       },
-      // '/summary/notice-ws': {
-      //   target: 'ws://mosr.feashow.cn/summary/notice-ws',
-      //   ws: true,
-      //   changeOrigin: true,
-      // }
+      '/api/notice-ws': {
+        target: 'ws://mosr.feashow.cn/api/notice-ws',
+        ws: true,
+        changeOrigin: true,
+      }
     }
   }
 })