From 6a414d07df1a519f586a76bf7c35a9f98ba56294 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Mon, 1 Jul 2024 12:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.base | 6 ++++-- index.html | 2 +- src/api/school/place/index.js | 4 ++-- src/views/Basic/User/UserForm.vue | 13 +++++++------ src/views/Basic/User/index.vue | 8 ++++---- src/views/Clue/Pool/Comp/DialogClue.vue | 2 +- src/views/Clue/Pool/Comp/DialogFollow.vue | 2 ++ src/views/Clue/Pool/Comp/DrawerClue.vue | 6 ++++-- src/views/SchoolManagement/Place/index.vue | 8 ++++---- 9 files changed, 29 insertions(+), 22 deletions(-) diff --git a/.env.base b/.env.base index 6a61f7b..a5f94e7 100644 --- a/.env.base +++ b/.env.base @@ -4,10 +4,12 @@ VITE_NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://118.31.23.45:48080' +# VITE_BASE_URL='http://118.31.23.45:48080' +VITE_BASE_URL='http://114.55.169.15:48080' # 上传路径 -VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' +# VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' +VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload' # 接口前缀 VITE_API_BASEPATH=/crm-api diff --git a/index.html b/index.html index 533c69b..a622563 100644 --- a/index.html +++ b/index.html @@ -141,7 +141,7 @@ <script type="module" src="/src/main.js"></script> <script type="text/javascript"> window._AMapSecurityConfig = { - securityJsCode: 'a2f0d14a4c5c1e387f9271b1045a781d' // 你的密钥 + securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab' // 你的密钥 } </script> </body> diff --git a/src/api/school/place/index.js b/src/api/school/place/index.js index f0c1dec..0c743e7 100644 --- a/src/api/school/place/index.js +++ b/src/api/school/place/index.js @@ -30,9 +30,9 @@ export const deletePlace = async (id) => { return await request.delete({ url: '/admin-api/crm/sch-place/delete?id=' + id }) } -export const updatePlaceStatus = async (id, status) => { +export const updatePlaceStatus = async (placeId, status) => { const data = { - id, + placeId, status } return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data }) diff --git a/src/views/Basic/User/UserForm.vue b/src/views/Basic/User/UserForm.vue index 941d81a..3130993 100644 --- a/src/views/Basic/User/UserForm.vue +++ b/src/views/Basic/User/UserForm.vue @@ -9,8 +9,8 @@ > <el-row :gutter="20"> <el-col :span="12"> - <el-form-item label="用户昵称" prop="nickname"> - <el-input v-model="formData.nickname" placeholder="请输入用户昵称" /> + <el-form-item label="用户姓名" prop="nickname"> + <el-input v-model="formData.nickname" placeholder="请输入用户姓名" /> </el-form-item> </el-col> <el-col :span="12"> @@ -69,8 +69,8 @@ </el-row> <el-row :gutter="20"> <el-col :span="12"> - <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username"> - <el-input v-model="formData.username" placeholder="请输入用户名称" /> + <el-form-item v-if="formData.id === undefined" label="登录账号" prop="username"> + <el-input v-model="formData.username" placeholder="请输入登录账号" /> </el-form-item> </el-col> <el-col :span="12"> @@ -142,8 +142,8 @@ const formData = ref({ hireDate: '' }) const formRules = ref<any>({ - username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }], - nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }], + username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }], + nickname: [{ required: true, message: '用户姓名不能为空', trigger: 'blur' }], password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }], email: [ { @@ -153,6 +153,7 @@ const formRules = ref<any>({ } ], mobile: [ + { required: true, message: '手机号不能为空', trigger: 'blur' }, { pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, message: '请输入正确的手机号码', diff --git a/src/views/Basic/User/index.vue b/src/views/Basic/User/index.vue index d04a2e8..7af1f6e 100644 --- a/src/views/Basic/User/index.vue +++ b/src/views/Basic/User/index.vue @@ -7,10 +7,10 @@ <el-col :span="20" :xs="24"> <!-- 搜索 --> <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px"> - <el-form-item label="用户名称" prop="username"> + <el-form-item label="登录账号" prop="username"> <el-input v-model="queryParams.username" - placeholder="请输入用户名称" + placeholder="请输入登录账号" clearable @keyup.enter="handleQuery" class="!w-240px" @@ -40,8 +40,8 @@ </el-form> <el-table v-loading="loading" :data="list"> <el-table-column label="用户编号" key="id" prop="id" /> - <el-table-column label="用户名称" prop="username" /> - <el-table-column label="用户昵称" prop="nickname" /> + <el-table-column label="登录账号" prop="username" /> + <el-table-column label="用户姓名" prop="nickname" /> <el-table-column label="部门" key="deptName" prop="deptName" /> <el-table-column label="手机号码" prop="mobile" width="120" /> <el-table-column label="状态" key="status"> diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue index 259f197..9eae359 100644 --- a/src/views/Clue/Pool/Comp/DialogClue.vue +++ b/src/views/Clue/Pool/Comp/DialogClue.vue @@ -320,7 +320,7 @@ let geoCoder = ref(null) function initMap(data) { AMapLoader.load({ - key: '2ffb0e2ea90b1df0b8be48ed66e18fc8', //设置您的key + key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key version: '2.0', plugins: ['AMap.Geocoder', 'AMap.AutoComplete'] }).then((AMap) => { diff --git a/src/views/Clue/Pool/Comp/DialogFollow.vue b/src/views/Clue/Pool/Comp/DialogFollow.vue index e5705bb..abae556 100644 --- a/src/views/Clue/Pool/Comp/DialogFollow.vue +++ b/src/views/Clue/Pool/Comp/DialogFollow.vue @@ -147,6 +147,8 @@ function getSkillList() { }) } +const emit = defineEmits(['success']) + async function handleSave() { // 校验表单 if (!formRef.value) return diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue index 3c2d997..4eff57c 100644 --- a/src/views/Clue/Pool/Comp/DrawerClue.vue +++ b/src/views/Clue/Pool/Comp/DrawerClue.vue @@ -258,9 +258,11 @@ async function open(id) { } function followSuccess() { - ClueApi.getClue(id).then((data) => { + ClueApi.getClue(clueId.value).then((data) => { info.value = { ...data, ...data.diyParams } }) + getFollowList() + emit('getList') } const placeList = ref([]) @@ -276,7 +278,7 @@ const defaultLatLng = ref({ function initMap(data) { AMapLoader.load({ - key: '2ffb0e2ea90b1df0b8be48ed66e18fc8', //设置您的key + key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key version: '2.0' }).then((AMap) => { aMap.value = AMap diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue index 520789a..ba21c03 100644 --- a/src/views/SchoolManagement/Place/index.vue +++ b/src/views/SchoolManagement/Place/index.vue @@ -137,7 +137,7 @@ </el-form> </el-tab-pane> <el-tab-pane label="描述" name="desc"> - <Editor v-model:modelValue="placeForm.remark" /> + <Editor v-model:modelValue="placeForm.introduce" /> </el-tab-pane> </el-tabs> <div class="flex items-center justify-center mt-10px"> @@ -268,7 +268,7 @@ const placeTab = ref('info') function initMap() { AMapLoader.load({ - key: '2ffb0e2ea90b1df0b8be48ed66e18fc8', //设置您的key + key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key version: '2.0', plugins: ['AMap.Geocoder'] }).then((AMap) => { @@ -391,7 +391,7 @@ function handleInsertPlace(schoolId) { lng: undefined, name: undefined, address: undefined, - remark: undefined, + introduce: undefined, phone: undefined, schoolId: schoolId, showInMap: true, @@ -556,7 +556,7 @@ const placeForm = ref({ lng: undefined, name: undefined, address: undefined, - remark: undefined, + introduce: undefined, phone: undefined, flagColor: 'red' })