diff --git a/.env.base b/.env.base index 7506db7..978fb4c 100644 --- a/.env.base +++ b/.env.base @@ -8,6 +8,7 @@ VITE_DEV=true VITE_BASE_URL='http://47.98.161.246:48080' # VITE_BASE_URL='http://114.55.169.15:48080' +# VITE_BASE_URL='http://114.215.207.150:48080' # 上传路径 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue index 5a2e3c4..9783c9a 100644 --- a/src/views/OKR/Management/Components/DialogOkrInfo.vue +++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue @@ -192,7 +192,7 @@ </div> <div class="mt-5px flex items-center"> <el-tree-select - v-model="kr.sourceId" + v-model="kr.source" :data="sourceOptions" :props="defaultProps" check-strictly diff --git a/src/views/OKR/Management/Components/OkrTable.vue b/src/views/OKR/Management/Components/OkrTable.vue index 202ed1a..e404372 100644 --- a/src/views/OKR/Management/Components/OkrTable.vue +++ b/src/views/OKR/Management/Components/OkrTable.vue @@ -23,7 +23,7 @@ <template v-else> <span class="line2"></span> <span> - 【关键成果】{{ row.channelName }} {{ row.name }} + 【关键成果】{{ row.sourceName }} {{ row.name }} <span v-if="row.resultType == 1">达 {{ row.targetValue }}</span> </span> <div class="flex items-center mt-10px ml-50px">