From 203626165b02ccbc09c8a4ea70b4edd4d9f35a93 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 30 Aug 2023 18:00:14 +0800
Subject: [PATCH] 修改vite代理配置
---
vite.config.ts | 3
env/.env.stag | 13 ++++
src/pages/page-web/projects/project_list/list_page/list.vue | 5 +
env/.env.production | 3
env/.env | 1
src/pages/page-web/projects/project_list/add_page/add.vue | 129 ++++++++++++++++++++++++++++++++++++++++---
src/styles/common.scss | 4 +
7 files changed, 143 insertions(+), 15 deletions(-)
diff --git a/env/.env b/env/.env
index 13e15e0..47efef8 100644
--- a/env/.env
+++ b/env/.env
@@ -1,2 +1,3 @@
VITE_APP_ENVIRONMENT=DEV
VITE_APP_APIGATEWAY_BACKEND_HOST=''
+VITE_HTTP = 'http://172.16.13.129:8100'
\ No newline at end of file
diff --git a/env/.env.production b/env/.env.production
index 0e80f8f..a76530f 100644
--- a/env/.env.production
+++ b/env/.env.production
@@ -1,2 +1,3 @@
VITE_APP_ENVIRONMENT=production
-VITE_APP_APIGATEWAY_BACKEND_HOST=''
\ No newline at end of file
+VITE_APP_APIGATEWAY_BACKEND_HOST=''
+VITE_HTTP = 'http://172.16.13.129:8100'
\ No newline at end of file
diff --git a/env/.env.stag b/env/.env.stag
index e4ade08..276f95b 100644
--- a/env/.env.stag
+++ b/env/.env.stag
@@ -1,2 +1,13 @@
+###
+ # @Author: husq 931347610@qq.com
+ # @Date: 2023-08-22 09:55:39
+ # @LastEditors: husq 931347610@qq.com
+ # @LastEditTime: 2023-08-30 17:56:53
+ # @FilePath: \Cloud-API-Demo-Web\env\.env.stag
+ # @Description:
+ #
+ # Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+###
VITE_APP_ENVIRONMENT=STAG
-VITE_APP_APIGATEWAY_BACKEND_HOST=''
\ No newline at end of file
+VITE_APP_APIGATEWAY_BACKEND_HOST=''
+VITE_HTTP = 'http://172.16.13.129:8100'
\ No newline at end of file
diff --git a/src/pages/page-web/projects/project_list/add_page/add.vue b/src/pages/page-web/projects/project_list/add_page/add.vue
index d1d89b0..de17b9a 100644
--- a/src/pages/page-web/projects/project_list/add_page/add.vue
+++ b/src/pages/page-web/projects/project_list/add_page/add.vue
@@ -13,19 +13,67 @@
<a-input v-model:value="formState[FormProject.PROJECT_NAME]" placeholder="项目名称" />
</a-form-item>
<a-form-item label="项目简介">
- <a-textarea :auto-size="{ minRows: 4, maxRows: 8 }" type="textarea" v-model:value="formState[FormProject.PROJCECT_INTRO]" placeholder="项目简介" />
+ <a-textarea :auto-size="{ minRows: 4, maxRows: 8 }" type="textarea"
+ v-model:value="formState[FormProject.PROJCECT_INTRO]" placeholder="项目简介" />
</a-form-item>
<a-form-item>
- <div class="application">
+ <div class="application flex-display flex-align-center flex-justify-between">
<p>申请码加入项目</p>
- <div class="button">
- <a-button type="text">
- 未开启
- <template #icon><right-outlined /></template>
+ <div class="btn dis_opticy">
+ <a-button type="text" disabled>
+ <span class="button_name">未开启</span>
+ <template #icon><right-outlined
+ :style="{ fontSize: '14px', color: '#fff', marginLeft: '8px' }" /></template>
</a-button>
</div>
</div>
- <a-textarea :auto-size="{ minRows: 4, maxRows: 8 }" type="textarea" v-model:value="formState[FormProject.PROJCECT_INTRO]" placeholder="项目简介" />
+ </a-form-item>
+ <a-form-item>
+ <div class="application flex-display flex-align-center flex-justify-between">
+ <p>天气阻飞设置</p>
+ <div class="btn">
+ <a-button type="text" disabled>
+ <span class="button_name">未开启</span>
+ <template #icon><right-outlined
+ :style="{ fontSize: '14px', color: '#fff', marginLeft: '8px' }" /></template>
+ </a-button>
+ </div>
+ </div>
+ </a-form-item>
+ <a-form-item>
+ <div class="application flex-display flex-align-center flex-justify-between">
+ <p>项目成员</p>
+ <div>
+ <a-button type="text">
+ <span class="button_add">添加成员</span>
+ <template #icon><plus-outlined :style="{ fontSize: '14px', color: '#2d8cf0' }" /></template>
+ </a-button>
+ </div>
+ </div>
+ <a-table :columns="columns" :data-source="dataSource" bordered>
+ <template v-for="col in ['name', 'age', 'address']" #[col]="{ text, record }" :key="col">
+ <div>
+ <a-input v-if="editableData[record.key]" v-model:value="editableData[record.key][col]"
+ style="margin: -5px 0" />
+ <template v-else>
+ {{ text }}
+ </template>
+ </div>
+ </template>
+ <template #operation="{ record }">
+ <div class="editable-row-operations">
+ <span v-if="editableData[record.key]">
+ <a @click="save(record.key)">Save</a>
+ <a-popconfirm title="Sure to cancel?" @confirm="cancel(record.key)">
+ <a>Cancel</a>
+ </a-popconfirm>
+ </span>
+ <span v-else>
+ <a @click="edit(record.key)">Edit</a>
+ </span>
+ </div>
+ </template>
+ </a-table>
</a-form-item>
<a-form-item>
<a-button type="primary">Submit</a-button>
@@ -36,9 +84,42 @@
</template>
<script setup lang="ts">
-import { LeftOutlined, RightOutlined } from '@ant-design/icons-vue'
+import { LeftOutlined, RightOutlined, PlusOutlined } from '@ant-design/icons-vue'
import { FormState, FormProject } from './type'
-
+import { UnwrapRef } from 'vue'
+const columns = [
+ {
+ title: '人员项目呼号',
+ dataIndex: 'name',
+ key: 'name',
+ },
+ {
+ title: '项目角色',
+ dataIndex: 'role',
+ key: 'role',
+ responsive: ['md'],
+ },
+ {
+ title: '编辑',
+ dataIndex: 'edit',
+ key: 'edit',
+ responsive: ['lg'],
+ },
+]
+interface DataItem {
+ key: string;
+ name: string;
+ role: number;
+ edit: string;
+}
+const dataSource = ref([
+ {
+ key: '1',
+ name: '接口活',
+ role: '项目管理员'
+ }
+])
+const editableData: UnwrapRef<Record<string, DataItem>> = reactive({})
const formState = ref<FormState>({
[FormProject.PROJECT_NAME]: '',
[FormProject.PROJECT_STATUS]: '',
@@ -54,6 +135,7 @@
display: flex;
flex-direction: column;
height: 100%;
+ color: #fff;
background-color: #232323;
.side-header {
@@ -80,12 +162,41 @@
padding: 16px;
flex: 1;
overflow-y: auto;
+
+ .application {
+ color: #fff;
+
+ >p {
+ margin: 0;
+ }
+
+ .btn {
+ :deep(.ant-btn-text) {
+ display: flex;
+ align-items: center;
+ flex-direction: row-reverse;
+ }
+
+ .button_name {
+ color: #fff;
+ }
+ }
+
+ .button_add {
+ color: $primary;
+ margin: 0;
+ }
+ }
}
:deep(.ant-form-item-label > label) {
color: #fff;
}
+ :deep(.ant-form-item) {
+ margin-bottom: 16px;
+ }
+
:deep(.ant-input) {
background: #101010;
border: 1px solid #444;
diff --git a/src/pages/page-web/projects/project_list/list_page/list.vue b/src/pages/page-web/projects/project_list/list_page/list.vue
index 2f3e688..1120166 100644
--- a/src/pages/page-web/projects/project_list/list_page/list.vue
+++ b/src/pages/page-web/projects/project_list/list_page/list.vue
@@ -3,7 +3,7 @@
<div class="side-header">
<div class="side-option flex-display flex-align-center flex-justify-between">
<h2 class="title">项目列表</h2>
- <PlusCircleOutlined @click="goAdd" :style="{ fontSize: '20px' }" />
+ <PlusCircleOutlined @click="goAdd(11)" :style="{ fontSize: '20px' }" />
</div>
<div class="border-bottom"></div>
</div>
@@ -55,7 +55,8 @@
const goDetail = () => {
router.push({ name: ERouterName.WORKSPACE })
}
-const goAdd = () => {
+const goAdd = (number:number) => {
+ console.log(number, 'number')
router.push({ name: ERouterName.ADD_PROJECT })
}
const cardList = ref<projectCard[]>([])
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 6d41b09..9f2d9a0 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -3,7 +3,9 @@
height: 100%;
overflow: hidden;
}
-
+.dis_opticy{
+ opacity: .25;
+}
body {
background-color: #f7f9fa;
-webkit-font-smoothing: antialiased;
diff --git a/vite.config.ts b/vite.config.ts
index 68fef87..b8b964a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -12,6 +12,7 @@
import cesium from 'vite-plugin-cesium'
// autoImport
import AutoImport from 'unplugin-auto-import/vite'
+import { CURRENT_CONFIG } from './src/api/http/config'
// https://vitejs.dev/config/
export default ({ command, mode }: ConfigEnv): UserConfigExport => defineConfig({
plugins: [
@@ -60,7 +61,7 @@
proxy: {
'/api': {
// 代理请求之后的请求地址(你的真实接口地址)
- target: 'http://172.16.13.129:8100',
+ target: CURRENT_CONFIG.baseURL,
rewrite: path => path.replace(/^\/api/, ''),
// 跨域
changeOrigin: true
--
Gitblit v1.9.3