wwl
/
daikins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

main
王文龙 2023-12-29 17:18:50 +08:00
parent 9abadc86d8
commit 14fec77952
10 changed files with 856 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
11.txt
View File

@ -48,6 +48,39 @@ urfhsdkjdwerwnvsojj
}, },
] ]
{
cateId:1,
uploadIds:[1,2,3],
reviewIds:[4,5,6]
}
{
id:1,
cateId:1,
cateName:'xxxx',
... 更新时间，修改时间等..
uploadIds:[
{ //上传者信息
id:1,
name:'xxxx',
... 用户信息
}，
{
id:2,
name:'xxxx',
... 用户信息
},
...
],
reviewIds:[
{ //审核者信息
id:1,
name:'xxxx',
...审核者用户信息
}，
...
]
}
审批流按钮权限对应显示 审批流按钮权限对应显示

8
index.html
View File

@ -1,13 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<link rel="icon" href="src/assets/images/favicon.svg"> <link rel="icon" href="src/assets/images/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>大金中国调达本部网站</title> <title>大金中国调达本部网站</title>
<style> <style>
.n-modal-container { .n-modal-container {
z-index: 999!important; z-index: 999;
} }
</style> </style>
</head> </head>

1
package.json
View File

@ -21,6 +21,7 @@
"@vueuse/core": "^9.13.0", "@vueuse/core": "^9.13.0",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"axios": "^1.4.0", "axios": "^1.4.0",
"dayjs": "^1.11.10",
"echarts": "^5.4.3", "echarts": "^5.4.3",
"echarts-liquidfill": "^3.1.0", "echarts-liquidfill": "^3.1.0",
"element-plus": "^2.3.7", "element-plus": "^2.3.7",

8
src/api/daikin/base.ts
View File

@ -1304,12 +1304,18 @@ export async function fetchGetViewScope(params?: any) {
export async function fetchdbAuthAdd(data?: any) { export async function fetchdbAuthAdd(data?: any) {
return http.post(`/dbAuth/add`, data) return http.post(`/dbAuth/add`, data)
} }
/**
* DB删除上传/审核者 https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156
*/
export async function fetchdbAuthDel(id?: any) {
return http.get(`/dbAuth/del?id=${id}`)
}
/** /**
* DB获取上传/审核者信息 https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156 * DB获取上传/审核者信息 https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156
*/ */
export async function fetchdbAuthGetInfo(params?: any) { export async function fetchdbAuthGetInfo(params?: any) {
return http.get(`/dbAuth/getInfo`, { params }) return http.get(`/dbAuth/getPerUserList`, { params })
} }
/** /**
* DB撤回 https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156 * DB撤回 https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156

121
src/components/AppHeadUserInfo.vue
View File

@ -1,102 +1,102 @@
<script setup lang="ts"> <script setup lang="ts">
import { NDropdown, NPopover } from "naive-ui"; import { NDropdown, NPopover } from 'naive-ui'
import { getAllNoticeList } from "@/api/daikin/base"; import { getAllNoticeList } from '@/api/daikin/base'
import { useUserStore } from '@/stores/modules/user' import { useUserStore } from '@/stores/modules/user'
// 全屏 // 全屏
const { toggle } = inject<any>("fullscreen"); const { toggle } = inject<any>('fullscreen')
const { push } = useRouter(); const { push } = useRouter()
const store = useUserStore(); const store = useUserStore()
const route = useRoute(); const route = useRoute()
const noticeData = ref(); const noticeData = ref()
const flgs = ref(false); const flgs = ref(false)
const userCode = ref(false) const userCode = ref(false)
async function getNoticeList() { async function getNoticeList() {
const { data } = await getAllNoticeList(); const { data } = await getAllNoticeList()
noticeData.value = data; noticeData.value = data
console.log('🚀 ~ file: AppHeadUserInfo.vue:18 ~ data:', data)
} }
onMounted(() => { onMounted(() => {
getNoticeList(); getNoticeList()
// console.log( flgs.value,flg) // console.log( flgs.value,flg)
}); })
watchEffect(() => { watchEffect(() => {
// console.log( flgs.value,store.user.type) // console.log( flgs.value,store.user.type)
flgs.value = [1, 2, 3, 4].includes(store.user.type); flgs.value = [1, 2, 3, 4].includes(store.user.type)
userCode.value = ['admin', 'tech_service'].includes(store.user.roleCode) userCode.value = ['admin', 'tech_service'].includes(store.user.roleCode)
}); })
const options = [ const options = [
{ label: "个人中心", key: "ucenter" }, { label: '个人中心', key: 'ucenter' },
, ,
{ {
label: "修改密码", label: '修改密码',
key: "ChangePWD", key: 'ChangePWD',
props: { props: {
onclick: () => { onclick: () => {
console.log(route.path); console.log(route.path)
const pth = route.path === "/external" ? "modify" : "modifys"; const pth = route.path === '/external' ? 'modify' : 'modifys'
push({ name: pth }); push({ name: pth })
}, }
}, }
}, },
{ {
key: "logout", key: 'logout',
label: "退出登录", label: '退出登录',
props: { props: {
style: { width: "150px" }, style: { width: '150px' },
onClick: () => { onClick: () => {
store.LogOut(); store.LogOut()
}, }
}, }
}, }
]; ]
const noticeShow = ref(false); const noticeShow = ref(false)
let showIs = false; let showIs = false
//模块id，1-情报 2-市况汇率 3-数据平台 4-BCP管理 5-碳中和 6-品质 7-差别化LAB //模块id，1-情报 2-市况汇率 3-数据平台 4-BCP管理 5-碳中和 6-品质 7-差别化LAB
const goModeuls = (obj) => { const goModeuls = (obj) => {
const { moduleId } = obj; const { moduleId } = obj
if (!moduleId) return; if (!moduleId) return
switch (moduleId) { switch (moduleId) {
case 1: case 1:
if (store.user.isReview === 1 || store.user.isPublish === 1) { if (store.user.isReview === 1 || store.user.isPublish === 1) {
push("/Home/Process"); push('/Home/Process')
} else { } else {
push("/Home/intelligence"); push('/Home/intelligence')
} }
break; break
case 2: case 2:
push({ name: "Market" }); push({ name: 'Market' })
break; break
case 3: case 3:
push({ name: "CD" }); push({ name: 'CD' })
break; break
case 4: case 4:
push({ name: "BCP" }); push({ name: 'BCP' })
break; break
case 5: case 5:
push({ name: "CSR" }); push({ name: 'CSR' })
break; break
case 6: case 6:
push({ name: "Quality" }); push({ name: 'Quality' })
break; break
case 7: case 7:
push({ name: "Diffspace" }); push({ name: 'Diffspace' })
break; break
case 9: case 9:
push({ name: "DataBaseReview" }); push({ name: 'DataBaseReview' })
break; break
default: default:
push("/Home/intelligence"); push('/Home/intelligence')
break; break
}
} }
};
const noticeShows = () => { const noticeShows = () => {
if (noticeData.value && noticeData.value.length > 0) { if (noticeData.value && noticeData.value.length > 0) {
// console.log(noticeData.value) // console.log(noticeData.value)
noticeShow.value = !noticeShow.value; noticeShow.value = !noticeShow.value
}
} }
};
const toFootPrint = () => { const toFootPrint = () => {
console.log(111) console.log(111)
push('/Home/footprint') push('/Home/footprint')
@ -107,7 +107,9 @@ const toFootPrint = () => {
<div class="inline-flex items-center relative"> <div class="inline-flex items-center relative">
<!-- 足迹 --> <!-- 足迹 -->
<!-- <div class="cursor-pointer w-40px h-40px z-200"> --> <!-- <div class="cursor-pointer w-40px h-40px z-200"> -->
<el-icon size="35" v-if="userCode" @click="toFootPrint" ><Platform /></el-icon> <el-icon size="35" v-if="userCode" @click="toFootPrint"
><Platform
/></el-icon>
<!-- </div> --> <!-- </div> -->
<!-- 全屏小图标 --> <!-- 全屏小图标 -->
@ -122,7 +124,6 @@ const toFootPrint = () => {
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 20 20" viewBox="0 0 20 20"
> >
<g fill="none"> <g fill="none">
<path <path
@ -215,7 +216,7 @@ const toFootPrint = () => {
class="ml40px mr16px w60px h60px" class="ml40px mr16px w60px h60px"
/> />
<!-- @click="toggle" --> <!-- @click="toggle" -->
<span>{{ store.user.nikeName ?? "游客" }}</span> <span>{{ store.user.nikeName ?? '游客' }}</span>
<img src="@/assets/images/icon-more.svg" class="ml30px w13px" /> <img src="@/assets/images/icon-more.svg" class="ml30px w13px" />
</div> </div>
</NDropdown> </NDropdown>

7
src/stores/modules/database.ts
View File

@ -1,17 +1,14 @@
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
export const databaseld = defineStore('database', () => { export const databaseld = defineStore('database', () => {
const database = ref({ const database = ref({
id: '', id: '',
name: ''
}) })
function setDataId(data: { id: string }) { function setDataId(data: { id: string }) {
database.value = data database.value.id = data.id
} }
return { database, setDataId } return { database, setDataId }
}) })

2
src/views/home/database/index.vue
View File

@ -180,7 +180,7 @@ function findItemById(
<div v-if="ite.childList && idx == index" class="pl10px"> <div v-if="ite.childList && idx == index" class="pl10px">
<div <div
class="my30px pl10px text-#000" class="my20px py-10px pl10px text-#000"
v-for="(it, ind) in ite.childList" v-for="(it, ind) in ite.childList"
:key="item.id" :key="item.id"
@click.stop="goChild(it)" @click.stop="goChild(it)"

343
src/views/home/database/modify.vue
View File

@ -1,19 +1,21 @@
<template> <template>
<div> <div>
<DataBaseHead /> <DataBaseHead />
<div class="w-full h-1px bg-#507FFD mt50px rd-b-20px"></div> <div class="relative w-full h-1px bg-#507FFD mt50px rd-b-20px">
<div class="bg-#fff rd-15px px30px pt30px w-full h920px">
<el-tabs v-model="activeName" class="demo-tabs">
<div class="absolute z-200 right-0 flex items-center">
<el-button <el-button
class="absolute z-200 right-30px top-[30px]"
v-if="isDbUpload || isDbReview" v-if="isDbUpload || isDbReview"
type="warning" type="warning"
@click="handleClick" @click="handleClick"
> >
审批流程 审批流程
</el-button> </el-button>
</div>
<div class="bg-#fff rd-15px px30px pt30px w-full h920px">
<el-tabs v-model="activeName" class="demo-tabs">
<div class="absolute z-200 right-0 flex items-center">
<div <div
class="rounded-md ml-50px px20px py10px z-200 bg-#f5f5f5 flex items-center justify-center w-100px" class="cursor-pointer rounded-md ml-50px px20px py10px z-200 bg-#f5f5f5 flex items-center justify-center w-100px"
@click="goBacks" @click="goBacks"
> >
<el-icon class="text-red"><ArrowLeftBold size="18" /></el-icon> 返回 <el-icon class="text-red"><ArrowLeftBold size="18" /></el-icon> 返回
@ -57,7 +59,7 @@
<el-button <el-button
type="primary" type="primary"
@click="editClickA('edit', scope.row)" @click="editClickA('edit', scope.row)"
class="mb-20px" class="my-10px"
> >
编辑</el-button 编辑</el-button
> >
@ -69,7 +71,7 @@
scope.row.level === 3 scope.row.level === 3
" "
@click="editClickA('add', scope.row)" @click="editClickA('add', scope.row)"
class="mb-20px" class="my-10px"
> >
新增{{ 新增{{
scope.row.level === 1 scope.row.level === 1
@ -82,7 +84,7 @@
<el-button <el-button
type="danger" type="danger"
@click="deleteClickA(scope.row)" @click="deleteClickA(scope.row)"
class="mb-20px" class="my-10px"
> >
删除</el-button 删除</el-button
> >
@ -109,6 +111,7 @@
> >
查看所有</el-button 查看所有</el-button
> >
<template v-if="false">
<el-button <el-button
v-if="userCode" v-if="userCode"
:type="setUpload ? 'success' : 'warning'" :type="setUpload ? 'success' : 'warning'"
@ -127,6 +130,7 @@
> >
{{ setReview ? '已设置审批人员' : '设置审批人员' }}</el-button {{ setReview ? '已设置审批人员' : '设置审批人员' }}</el-button
> >
</template>
</div> </div>
<div class="w100% h750px overflow-auto"> <div class="w100% h750px overflow-auto">
<el-table <el-table
@ -136,6 +140,7 @@
row-key="id" row-key="id"
border border
default-expand-all default-expand-all
height="710px"
:header-cell-style="{ :header-cell-style="{
background: '#2A7BF7', background: '#2A7BF7',
color: '#fff', color: '#fff',
@ -201,7 +206,7 @@
</div> </div>
</el-tooltip> </el-tooltip>
</p> </p>
<span v-else>''</span> <span v-else></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -214,19 +219,19 @@
<el-button <el-button
type="primary" type="primary"
@click="editClickB('edit', scope.row)" @click="editClickB('edit', scope.row)"
class="mb-20px w45px" class="w45px my-10px"
> >
编辑</el-button 编辑</el-button
> >
<el-button <el-button
type="danger" type="danger"
@click="deleteClickB(scope.row)" @click="deleteClickB(scope.row)"
class="mb-20px w45px" class="w45px my-10px"
> >
删除</el-button 删除</el-button
> >
<div <div
style="float: right" style="float: right; margin: 10px 0"
v-if=" v-if="
scope.$index !== 0 && scope.$index !== 0 &&
scope.$index !== infoData.length - 1 scope.$index !== infoData.length - 1
@ -251,6 +256,178 @@
</el-table> </el-table>
</div> </div>
<div
class="float-right absolute bottom-0px right-30px z-2000 bg-#fff"
>
<el-pagination
v-model:current-page="pageInfo.currentPage"
v-model:page-size="pageInfo.pageSize"
layout="prev, pager, next, jumper"
:total="pageInfo.total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div>
</el-tab-pane>
<el-tab-pane label="权限管理" name="three" v-if="userCode">
<div class="h-52px">
<el-button
v-if="isDbReview || isDbUpload"
type="primary"
@click="handleAuthClick('add')"
class="mb-20px"
>
新增审批关系</el-button
>
</div>
<div class="w100% h750px overflow-auto">
<el-table
class="tableClass"
:data="authData"
style="width: 100%; margin-bottom: 20px"
row-key="id"
border
default-expand-all
height="710px"
:header-cell-style="{
background: '#2A7BF7',
color: '#fff',
height: '60px',
lineHeight: '60px',
textAlign: 'center',
'font-size': '24px'
}"
:cell-style="{ 'text-align': 'center', 'overflow-y': 'auto' }"
>
<el-table-column
prop="cateName"
label="所属分类"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="上传人员"
prop="userIdList"
show-overflow-tooltip
>
<template #default="scope">
<p
v-if="scope.row.uploadList.length"
class="truncate text-ellipsis"
>
{{
scope.row.uploadList
.map((item: any) => item.nickName)
.join('、')
}}
<el-tooltip
v-if="false"
:content="handTooltip(scope.row.uploadList)"
placement="top"
>
<div class="!h-50px descStyle">
<div class="descStyle max-w-60vw !h-46px">
<p
v-for="(it, e) in scope.row.uploadList"
:key="e"
:class="
scope.row.uploadList.length < 2
? '!leading-46px'
: 'xx'
"
>
{{ it.nickName || undefined }}
<span
v-if="e == 1 && scope.row.uploadList.length > 2"
>...共{{ scope.row.uploadList.length }}人</span
>
</p>
</div>
</div>
</el-tooltip>
</p>
<span v-else></span>
</template>
</el-table-column>
<el-table-column
label="审批人员"
prop="userIdList"
show-overflow-tooltip
>
<template #default="scope">
<p
v-if="scope.row.reviewList.length"
class="truncate text-ellipsis"
>
{{
scope.row.reviewList
.map((item: any) => item.nickName)
.join('、')
}}
<el-tooltip
v-if="false"
:content="handTooltip(scope.row.reviewList)"
placement="top"
>
<div class="!h-50px descStyle">
<div class="descStyle max-w-60vw !h-46px">
<p
v-for="(it, e) in scope.row.reviewList"
:key="e"
:class="
scope.row.reviewList.length < 2
? '!leading-46px'
: 'xx'
"
>
{{ it.nickName || undefined }}
<span
v-if="e == 1 && scope.row.reviewList.length > 2"
>...共{{ scope.row.reviewList.length }}人</span
>
</p>
</div>
</div>
</el-tooltip>
</p>
<span v-else></span>
</template>
</el-table-column>
<el-table-column
prop="address"
label="操作"
show-overflow-tooltip
width="180px"
>
<template #default="scope">
<div v-if="userCode">
<el-button
type="primary"
@click="handleAuthClick('edit', scope.row)"
class="w45px my-10px"
>
编辑</el-button
>
<el-popconfirm
title="确认删除此条数据?"
@confirm="handleAuthClick('del', scope.row)"
>
<template #reference>
<el-button
type="danger"
@click=""
class="w45px my-10px"
>
删除</el-button
>
</template>
</el-popconfirm>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div <div
class="float-right absolute bottom-0px right-30px z-2000 bg-#fff" class="float-right absolute bottom-0px right-30px z-2000 bg-#fff"
> >
@ -338,6 +515,47 @@
</el-form> </el-form>
</div> </div>
</NModal> </NModal>
<NModal v-model:show="showAuthModal">
<div class="bg-#FFF p30px">
<el-form :model="authModel" label-width="120px" :inline="true">
<el-form-item v-if="false" label="所属类别">
<el-cascader
:modelValue="authModel.cateIds"
:options="tableData"
@change="handleChange"
:props="{ children: 'childList', label: 'name', value: 'id' }"
/>
</el-form-item>
<br />
<el-form-item label="上传人员" class="w-300px">
<el-button
class="button"
@click="getUser({ userList: uploadIds, key: 'uploadIds' })"
:type="authModel.uploadIds?.length ? 'success' : ''"
:icon="authModel.uploadIds?.length ? 'Check' : ''"
>{{ authModel.uploadIds?.length ? '已设置' : '设置' }}</el-button
>
</el-form-item>
<br />
<el-form-item label="审核人员" class="w-300px">
<el-button
class="button"
@click="getUser({ userList: reviewIds, key: 'reviewIds' })"
:type="authModel.reviewIds?.length ? 'success' : ''"
:icon="authModel.reviewIds?.length ? 'Check' : ''"
>{{ authModel.reviewIds?.length ? '已设置' : '设置' }}</el-button
>
</el-form-item>
<br />
<br />
<div class="text-center">
<el-button type="primary" @click="handleSetAuth" class="mb-20px">
确认</el-button
>
</div>
</el-form>
</div>
</NModal>
<n-modal v-model:show="showModal" :z-index="99999"> <n-modal v-model:show="showModal" :z-index="99999">
<UserList <UserList
:userDataList="setUserList" :userDataList="setUserList"
@ -360,7 +578,7 @@ import {
cateFileUpdate, cateFileUpdate,
cateFileDel, cateFileDel,
cateFileList, cateFileList,
download, fetchdbAuthDel,
dragFile, dragFile,
fetchdbAuthAdd, fetchdbAuthAdd,
fetchdbAuthGetInfo, fetchdbAuthGetInfo,
@ -374,14 +592,21 @@ const { push } = useRouter()
const database = databaseld() const database = databaseld()
const store: any = useUserStore() const store: any = useUserStore()
const message = useMessage() const message = useMessage()
const userCode = ['admin', 'database_dandang'].includes(store.user.roleCode) const userCode = computed(() =>
['admin', 'database_dandang', 'tech_service'].includes(store.user.roleCode)
)
// 'tech_service'
const isDbReview = store.user?.isDbReview === 1 const isDbReview = store.user?.isDbReview === 1
const isDbUpload = store.user?.isDbUpload === 1 const isDbUpload = store.user?.isDbUpload === 1
const tableData = ref([]) const tableData = ref([])
const tableDataAuth = ref([]) const tableDataAuth = ref([])
const infoData = ref() const infoData = ref()
const authData = ref()
const showAuthModal = ref(false)
const authModel = ref<any>({})
const cateIds = ref()
const shomkA = ref(false) const shomkA = ref(false)
const editA = ref() const editA = ref()
const shomkB = ref(false) const shomkB = ref(false)
@ -392,17 +617,60 @@ const pageInfo = reactive({
pageSize: 10, pageSize: 10,
total: 10 total: 10
}) })
const uploadIds = ref([])
const reviewIds = ref([])
const handleAuthClick = (type = '', data: any = {}) => {
if (type === 'add' || type === 'edit') {
delete authModel.value.id
const { cateId, uploadList = [], reviewList = [], id } = data
authModel.value.cateId = cateId
uploadIds.value = uploadList
reviewIds.value = reviewList
authModel.value.uploadIds = uploadList.map((item: any) => item.userId)
authModel.value.reviewIds = reviewList.map((item: any) => item.userId)
if (type === 'edit') authModel.value.id = id
showAuthModal.value = true
}
if (type === 'del') {
const { id } = data
if (!id) return
fetchdbAuthDel(id).then((res: any) => {
if (res.code === 200) {
getAuth()
message.success('操作成功')
}
})
}
}
const handleSetAuth = async () => {
const req = { ...unref(authModel), cateId: cateIds.value }
if (!req.uploadIds?.length) {
message.warning('最少选择1名上传人员！')
return
}
if (!req.reviewIds?.length) {
message.warning('最少选择1名审核人员!')
return
}
const { code }: any = await fetchdbAuthAdd(req)
if (code === 200) {
getAuth()
showAuthModal.value = false
message.success('操作成功')
}
}
async function getTree() { async function getTree() {
const { data } = await treeDbList({}) const { data } = await treeDbList({})
tableData.value = data tableData.value = data
const { data: auth = [] } = await fetchReviewAuthCateList() const { data: auth = [] } = await fetchReviewAuthCateList()
tableDataAuth.value = auth tableDataAuth.value = auth
} }
let cateIds = ref()
watchEffect(() => { watchEffect(() => {
activeName.value = userCode ? 'first' : 'second' activeName.value = userCode.value ? unref(activeName) : 'second'
cateIds.value = database.database.id cateIds.value = database.database.id
// console.log(database.database.id) console.log(database.database)
if (database.database.id) { if (database.database.id) {
getInfo(database.database.id) getInfo(database.database.id)
getAuth() getAuth()
@ -479,7 +747,6 @@ async function addClickA(row: any) {
getTree() getTree()
} }
const editClickB = (edit: any, obj: any = {}) => { const editClickB = (edit: any, obj: any = {}) => {
console.log(obj)
if (edit === 'add' && obj && obj.id) { if (edit === 'add' && obj && obj.id) {
editB.value = { editB.value = {
title: '', title: '',
@ -616,7 +883,7 @@ const handOnExceed: UploadProps['onExceed'] = (
} }
const header = { token: store.user.token } const header = { token: store.user.token }
const goBacks = (e) => { const goBacks = () => {
// console.log(444) // console.log(444)
history.back() history.back()
} }
@ -624,17 +891,27 @@ const showModal = ref(false)
const flg = ref() const flg = ref()
const setUserList = ref() const setUserList = ref()
const dbAuthType = ref() const dbAuthType = ref()
async function getUser(row: { id?: any; userList?: any; type?: number }) { const selSetAuthKey = ref('')
async function getUser(row: {
id?: any
userList?: any
type?: number
key?: string
}) {
showModal.value = !showModal.value showModal.value = !showModal.value
flg.value = row flg.value = row
if (showAuthModal.value) {
setUserList.value = row.userList || []
selSetAuthKey.value = row.key || ''
}
if (row.id && row.userList) { if (row.id && row.userList) {
setUserList.value = row.userList setUserList.value = row.userList
} }
if (typeof row.type === 'number') { if (typeof row.type === 'number') {
dbAuthType.value = row.type dbAuthType.value = row.type
const { data: userArr } = await fetchdbAuthGetInfo({ const { data: userArr } = await fetchdbAuthGetInfo({
cateId: cateIds.value, cateId: cateIds.value
type: row.type // type: row.type
}) })
setUserList.value = userArr setUserList.value = userArr
} }
@ -649,6 +926,10 @@ const handleChild = async (data: any) => {
multipleSelection.value.forEach((i: { userId: any }) => { multipleSelection.value.forEach((i: { userId: any }) => {
userIdList.push(i.userId) userIdList.push(i.userId)
}) })
if (authModel.value && selSetAuthKey.value) {
authModel.value[selSetAuthKey.value] = userIdList
return
}
if (dbAuthType.value) { if (dbAuthType.value) {
const { code }: any = await fetchdbAuthAdd({ const { code }: any = await fetchdbAuthAdd({
cateId: cateIds.value, cateId: cateIds.value,
@ -745,20 +1026,12 @@ const setReview = ref(false)
const hasReview = ref(false) const hasReview = ref(false)
async function getAuth() { async function getAuth() {
if (!cateIds.value) return if (!cateIds.value) return
const { data: uploadUser = [] } = await fetchdbAuthGetInfo({ const { rows: data = [] }: any = await fetchdbAuthGetInfo({
cateId: cateIds.value, cateId: cateIds.value
type: 1 // type: 1
}) })
setUpload.value = uploadUser.length > 0 // 所有的上传者 和 审核者
hasUpload.value = authData.value = data || []
uploadUser.findIndex((x: any) => x.userId === store.user?.id) > -1
const { data: reviewUser = [] } = await fetchdbAuthGetInfo({
cateId: cateIds.value,
type: 2
})
setReview.value = reviewUser.length > 0
hasReview.value =
reviewUser.findIndex((x: any) => x.userId === store.user?.id) > -1
} }
const handleClick = () => { const handleClick = () => {

13
src/views/home/market/Market.vue
View File

@ -52,11 +52,12 @@ onMounted(async ()=>{
const {data} =await getCurrencyList() const {data} =await getCurrencyList()
const {data:dat} =await getMetalList() const {data:dat} =await getMetalList()
if(dat&&dat!='null'&&dat.length>0){ if(dat&&dat!='null'&&dat.length>0){
metal.value = dat.filter((item:any) => { metal.value = dat
if(["Fe","lengmei"].includes(item.value)){ // .filter((item:any) => {
return false // if(["Fe","lengmei"].includes(item.value)){
}else return item // return false
}) // }else return item
// })
from.value.label.radio = dat[0].value from.value.label.radio = dat[0].value
state4.number = dat[0].value state4.number = dat[0].value
console.log("🚀 ~ file: Market.vue:56 ~ metal:", metal) console.log("🚀 ~ file: Market.vue:56 ~ metal:", metal)
@ -294,7 +295,7 @@ async function getUser(moduleId: any) {
<span @click="tabShow(0)" class="title bg-#FF603A p5px pl10px pr20px">{{names}}<el-icon><CaretBottom /></el-icon></span> <span @click="tabShow(0)" class="title bg-#FF603A p5px pl10px pr20px">{{names}}<el-icon><CaretBottom /></el-icon></span>
<div v-if="tab" class="tab absolute bg-#fff w100px top-50px z-50 text-#112144 text-center leading-28px text-18px "> <div v-if="tab" class="tab absolute bg-#fff w100px top-50px z-50 text-#112144 text-center leading-28px text-18px ">
<div v-if="metal" v-for="im in metal" class="py5px !rounded-none" :data-id="im.value" @click="tabClick" >{{im.title}}</div> <div v-if="metal" v-for="im in metal.filter((item:any) => !['Fe','lengmei'].includes(item.value))" class="py5px !rounded-none" :data-id="im.value" @click="tabClick" >{{im.title}}</div>
<!-- <div class="py5px !rounded-none" data-id="Fe" @click="tabClick">Fe</div> <!-- <div class="py5px !rounded-none" data-id="Fe" @click="tabClick">Fe</div>
<div class="py5px !rounded-none" data-id="Cu" @click="tabClick">Cu</div> <div class="py5px !rounded-none" data-id="Cu" @click="tabClick">Cu</div>

180
src/views/home/market/dataModify.vue
View File

@ -5,18 +5,27 @@ import HomeHead from '@/views/home/components/HomeHead.vue'
import { useMessage, NModal } from 'naive-ui' import { useMessage, NModal } from 'naive-ui'
import { useUserStore } from '@/stores/modules/user' import { useUserStore } from '@/stores/modules/user'
import UserList from '@/views/home/intelligence/process/UserPages.vue' import UserList from '@/views/home/intelligence/process/UserPages.vue'
import dayjs from 'dayjs'
import { fetchDelHis,marketPreADD,getMetalList,fetchGetHisPage,fetchUpdateHis,fetchSaveHis } from '@/api/daikin/base' import {
fetchDelHis,
marketPreADD,
getMetalList,
fetchGetHisPage,
fetchUpdateHis,
fetchSaveHis
} from '@/api/daikin/base'
const message = useMessage() const message = useMessage()
const store = useUserStore() const store = useUserStore()
const header = { 'token': store.user.token } const header = { token: store.user.token }
const dataA = ref<any>([]) const dataA = ref<any>([])
const editA = ref() const editA = ref<any>({ stDateList: [] })
const metaList = ref<any>([]) const metaList = ref<any>([])
const metaObj = ref<any>({}) const metaObj = ref<any>({})
const stDateList = ref<any>([])
const shomkA = ref(false) const shomkA = ref(false)
const type = ref(2) const type = ref(2)
@ -37,14 +46,13 @@ async function getDataA() {
// setDataFiles(dataArr); // setDataFiles(dataArr);
} }
onMounted(async () => { onMounted(async () => {
const { data = [] } = await getMetalList() const { data = [] } = await getMetalList()
metaList.value = data metaList.value = data
data.forEach((item: any) => { data.forEach((item: any) => {
metaObj.value[item.value] = item.title metaObj.value[item.value] = item.title
}) })
getDataA(); getDataA()
}) })
async function onSubmitA(row: { id: any; fileList?: any; title?: any }) { async function onSubmitA(row: { id: any; fileList?: any; title?: any }) {
@ -53,37 +61,36 @@ async function onSubmitA(row: { id: any; fileList?: any; title?: any }) {
// let moduleId = 1; // let moduleId = 1;
let sendData = {} let sendData = {}
if (!row.id) { if (!row.id) {
sendData = { title,type:type.value,userIdList:userData.value }; sendData = { title, type: type.value, userIdList: userData.value }
if (row.fileList && row.fileList.length > 0) { if (row.fileList && row.fileList.length > 0) {
row.fileList.map(item => { row.fileList.map((item) => {
if (item.response) { if (item.response) {
sendData.filePath = item.response.url; sendData.filePath = item.response.url
// obj.title = title || computedName(item.response.originalFilename); // obj.title = title || computedName(item.response.originalFilename);
} } else {
else { sendData.filePath = item.url
sendData.filePath = item.url;
// obj.title = title || computedName(item.originalFilename); // obj.title = title || computedName(item.originalFilename);
} }
}) })
} }
} } else {
else{ sendData = { id, title, type: type.value, userIdList: userData.value }
sendData = {id, title,type:type.value,userIdList:userData.value };
} }
const { code, msg } = await marketPreADD(sendData) const { code, msg } = await marketPreADD(sendData)
if (code === 200) { message.success("修改成功！") } if (code === 200) {
else { message.error(msg) } message.success('修改成功！')
shomkA.value = false } else {
getDataA(); message.error(msg)
}
shomkA.value = false
getDataA()
} }
const handleEditA = (type: string, row: any = {}) => { const handleEditA = (type: string, row: any = {}) => {
if (!row) return if (!row) return
editA.value = { ...row } editA.value = { ...row }
editA.value.stDateList = [row.stDate, row.stDate]
stDateList.value = [row.stDate, row.stDate]
// setUserList.value =[] // setUserList.value =[]
shomkA.value = true shomkA.value = true
@ -95,14 +102,16 @@ const handleEditA = (type: string, row: any = {}) => {
// setUserList.value =row.userIdList // setUserList.value =row.userIdList
} }
async function handleDeleteA(index: number, row: any) { async function handleDeleteA(index: number, row: any) {
const { id } = row const { id } = row
if (!id) return if (!id) return
const { code, msg } = await fetchDelHis({ id, type: type.value }) const { code, msg } = await fetchDelHis({ id, type: type.value })
if (code === 200) { message.success("删除成功！") } if (code === 200) {
else { message.error(msg) } message.success('删除成功！')
getDataA(); } else {
message.error(msg)
}
getDataA()
} }
const showModal = ref(false) const showModal = ref(false)
@ -117,12 +126,10 @@ async function getUser(row) {
} }
// const {data: userArr} = await getBPCUser({moduleId}) // const {data: userArr} = await getBPCUser({moduleId})
// setUserList.value = userArr // setUserList.value = userArr
} }
// 获取子组件传过来的值 // 获取子组件传过来的值
const userData = ref() const userData = ref()
const handleChild = (data: any) => { const handleChild = (data: any) => {
console.log(data, 444);
const { showModal: show, multipleSelection } = data const { showModal: show, multipleSelection } = data
showModal.value = unref(show) showModal.value = unref(show)
let userIdList: any[] = [] let userIdList: any[] = []
@ -132,7 +139,7 @@ async function getUser(row) {
if (flg.value.id) { if (flg.value.id) {
flg.value.userIdList = userIdList flg.value.userIdList = userIdList
marketPreADD(flg.value) marketPreADD(flg.value)
getDataA(); getDataA()
console.log(flg.value) console.log(flg.value)
} }
userData.value = userIdList userData.value = userIdList
@ -145,30 +152,56 @@ async function getUser(row) {
} }
const editForm = ref(null) const editForm = ref(null)
const channelList = ref([{ const channelList = ref([
{
label: 'LME', label: 'LME',
value: 'LME' value: 'LME'
}, },
{ {
label: 'SMM', label: 'SMM',
value: 'SMM' value: 'SMM'
}]) }
])
const handleClickA = async () => { const handleClickA = async () => {
let res:any = {} if (stDateList.length == 0) {
if(editA.value.id){ message.error('请选择日期!')
res = await fetchUpdateHis(editA.value) return
}else{
res = await fetchSaveHis(editA.value)
} }
const req = { ...editA.value }
req.stDateList = generateDateRange()
console.log('🚀 ~ file: dataModify.vue:173 ~ req:', req)
let res: any = await fetchSaveHis(req)
if (res.code == 200) { if (res.code == 200) {
shomkA.value = false shomkA.value = false
message.success("操作成功！") message.success('操作成功！')
getDataA(); getDataA()
} else { } else {
message.error(res.msg) message.error(res.msg)
} }
} }
function generateDateRange() {
const [startDate, endDate] = stDateList.value || []
if (!startDate || !endDate) return []
const dateFormat = 'YYYY-MM-DD'
const dates = []
const start = dayjs(startDate, dateFormat)
const end = dayjs(endDate, dateFormat)
// 将开始日期添加到数组中
dates.push(start.format(dateFormat))
// 逐步增加日期，直到结束日期
let currentDate = start
while (currentDate.isSameOrBefore(end)) {
currentDate = currentDate.add(1, 'day')
dates.push(currentDate.format(dateFormat))
}
return dates
}
</script> </script>
<template> <template>
<HomeHead class="top"> <HomeHead class="top">
@ -182,16 +215,29 @@ const handleClickA = async () => {
<div class="text-36px text-#000">市况数据管理</div> <div class="text-36px text-#000">市况数据管理</div>
</div> </div>
<div class="cont relative w100% h800px overflow-y-auto"> <div class="cont relative w100% h800px overflow-y-auto">
<el-button type="primary" @click="handleEditA" class="my20px">市况数据新增</el-button> <el-button type="primary" @click="handleEditA" class="my20px"
>市况数据新增</el-button
>
<div <div
class="rounded-md float-right mr-80px mt-20px px20px py10px z-200 bg-#f5f5f5 flex items-center justify-center w-100px" class="rounded-md float-right mr-80px mt-20px px20px py10px z-200 bg-#f5f5f5 flex items-center justify-center w-100px"
@click="goBacks" @click="goBacks"
> >
<el-icon><ArrowLeftBold size="18" /></el-icon> 返回 <el-icon><ArrowLeftBold size="18" /></el-icon> 返回
</div> </div>
<el-table :data="dataA" style="width: 95%" row-key="id" <el-table
:header-cell-style="{ background: '#2A7BF7', color: '#fff', height: '60px', textAlign: 'center', 'font-size': '24px' }" :data="dataA"
:cell-style="{ 'text-align': 'center' }"> style="width: 95%"
row-key="yearId"
:header-cell-style="{
background: '#2A7BF7',
color: '#fff',
height: '60px',
textAlign: 'center',
'font-size': '24px'
}"
:cell-style="{ 'text-align': 'center' }"
height="700px"
>
<el-table-column label="日期" prop="stDate" /> <el-table-column label="日期" prop="stDate" />
<el-table-column label="渠道" prop="channel" /> <el-table-column label="渠道" prop="channel" />
<el-table-column label="编号" prop="numbers" /> <el-table-column label="编号" prop="numbers" />
@ -205,8 +251,15 @@ const handleClickA = async () => {
<el-table-column label="操作" width="180px"> <el-table-column label="操作" width="180px">
<template #default="scope"> <template #default="scope">
<template v-if="!scope.row.children?.length"> <template v-if="!scope.row.children?.length">
<el-button size="small" @click="handleEditA('edit', scope.row)">编辑</el-button> <el-button size="small" @click="handleEditA('edit', scope.row)"
<el-button size="small" type="danger" @click="handleDeleteA(scope.$index, scope.row)">删除</el-button> >编辑</el-button
>
<el-button
size="small"
type="danger"
@click="handleDeleteA(scope.$index, scope.row)"
>删除</el-button
>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
@ -226,17 +279,31 @@ const handleClickA = async () => {
<div class="bg-#FFF"> <div class="bg-#FFF">
<el-form ref="editForm" :model="editA" label-width="100px" size="large"> <el-form ref="editForm" :model="editA" label-width="100px" size="large">
<el-form-item label="日期" prop="stDate"> <el-form-item label="日期" prop="stDate">
<el-date-picker <!-- <el-date-picker
class="!w-90%" class="!w-90%"
v-model="editA.stDate" v-model="editA.stDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
/> -->
<el-date-picker
v-model="stDateList"
type="daterange"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
value-format="YYYY-MM-DD"
class="!w-90%"
/> />
</el-form-item> </el-form-item>
<br /> <br />
<el-form-item label="渠道" prop="channel"> <el-form-item label="渠道" prop="channel">
<el-select :disabled="editA.id" v-model="editA.channel" placeholder="选择渠道" class="!w-90%"> <el-select
:disabled="editA.id"
v-model="editA.channel"
placeholder="选择渠道"
class="!w-100%"
>
<el-option <el-option
v-for="item in channelList" v-for="item in channelList"
:key="item.value" :key="item.value"
@ -247,7 +314,12 @@ const handleClickA = async () => {
</el-form-item> </el-form-item>
<br /> <br />
<el-form-item label="编号" prop="number"> <el-form-item label="编号" prop="number">
<el-select :disabled="editA.id" v-model="editA.number" placeholder="选择类型" class="!w-90%"> <el-select
:disabled="editA.id"
v-model="editA.number"
placeholder="选择类型"
class="!w-100%"
>
<el-option <el-option
v-for="item in metaList" v-for="item in metaList"
:key="item.value" :key="item.value"
@ -261,12 +333,16 @@ const handleClickA = async () => {
<el-input-number <el-input-number
v-model="editA.negAmount" v-model="editA.negAmount"
:controls="false" :controls="false"
class="!w-90%" class="!w-100%"
/> />
</el-form-item> </el-form-item>
<br /> <br />
<div class="text-center"> <div class="text-center">
<el-button type="primary" @click="handleClickA(editA)" class="mb-20px"> <el-button
type="primary"
@click="handleClickA(editA)"
class="mb-20px"
>
确认</el-button 确认</el-button
> >
</div> </div>
@ -275,7 +351,11 @@ const handleClickA = async () => {
</el-dialog> </el-dialog>
<n-modal v-model:show="showModal"> <n-modal v-model:show="showModal">
<UserList :userDataList="setUserList" @clickChild="handleChild" @CloseThis="CloseThiss"/> <UserList
:userDataList="setUserList"
@clickChild="handleChild"
@CloseThis="CloseThiss"
/>
</n-modal> </n-modal>
</template> </template>