From 6b338b45fe9b688996d1d1440a3b87767f042ec3 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Wed, 29 Apr 2026 08:41:05 +0800
Subject: [PATCH] 修改
---
src/views/work/onlineEducation/courseEvaluate/index.vue | 18 +
src/api/environment/factors.js | 19 ++
src/views/work/onlineEducation/offlineEducation/index.vue | 17 +
src/views/work/onlineEducation/trainPlan/index.vue | 19 ++
src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue | 144 +++++++++++++++--
src/views/build/conpanyFunctionConsult/riskManage/control/index.vue | 146 ++++++++++++++++--
src/views/build/conpanyFunctionConsult/environment/controlFactors/index.vue | 42 +++--
src/views/build/conpanyFunctionConsult/riskManage/record/index.vue | 42 +++--
8 files changed, 375 insertions(+), 72 deletions(-)
diff --git a/src/api/environment/factors.js b/src/api/environment/factors.js
index cb9b820..d6e54ef 100644
--- a/src/api/environment/factors.js
+++ b/src/api/environment/factors.js
@@ -39,6 +39,25 @@
})
}
+//复制
+export function copyControl(data) {
+ return request({
+ url: '/composite/risk/manage/copy',
+ method: 'post',
+ data: data
+ })
+}
+
+export function copyFactor(data) {
+ return request({
+ url: '/composite/factor/discern/copy',
+ method: 'post',
+ data: data
+ })
+}
+
+
+
//控制
export function getControl(params) {
return request({
diff --git a/src/views/build/conpanyFunctionConsult/environment/controlFactors/index.vue b/src/views/build/conpanyFunctionConsult/environment/controlFactors/index.vue
index a334688..8df6b48 100644
--- a/src/views/build/conpanyFunctionConsult/environment/controlFactors/index.vue
+++ b/src/views/build/conpanyFunctionConsult/environment/controlFactors/index.vue
@@ -22,23 +22,28 @@
</el-select>
</el-form-item>
<el-form-item label="年份:" style="margin-left: 20px">
- <el-select
+ <el-date-picker
v-model="data.queryParams.year"
- placeholder="请选择年份"
- style="width: 240px"
- filterable
- allow-create
- default-first-option
- :reserve-keyword="false"
- @change="handleChangeNum"
- >
- <el-option
- v-for="item in data.yearList"
- :key="item.value"
- :label="item.label"
- :value="item.label"
- />
- </el-select>
+ type="year"
+ value-format="YYYY"
+ />
+<!-- <el-select-->
+<!-- v-model="data.queryParams.year"-->
+<!-- placeholder="请选择年份"-->
+<!-- style="width: 240px"-->
+<!-- filterable-->
+<!-- allow-create-->
+<!-- default-first-option-->
+<!-- :reserve-keyword="false"-->
+<!-- @change="handleChangeNum"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in data.yearList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.label"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
<el-form-item>
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
@@ -150,11 +155,15 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
if(data.isAdmin){
getCompanyList()
}
});
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true;
const res = await getControl(data.queryParams);
@@ -231,6 +240,7 @@
type: ''
}
}
+ getNowYear()
getList();
}
diff --git a/src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue b/src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue
index c580ad0..c5bc4eb 100644
--- a/src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue
+++ b/src/views/build/conpanyFunctionConsult/environment/environmentalFactors/index.vue
@@ -22,23 +22,28 @@
</el-select>
</el-form-item>
<el-form-item label="年份:" style="margin-left: 20px">
- <el-select
+ <el-date-picker
v-model="data.queryParams.year"
- placeholder="请选择年份"
- style="width: 240px"
- filterable
- allow-create
- default-first-option
- :reserve-keyword="false"
- @change="handleChangeNum"
- >
- <el-option
- v-for="item in data.yearList"
- :key="item.value"
- :label="item.label"
- :value="item.label"
- />
- </el-select>
+ type="year"
+ value-format="YYYY"
+ />
+<!-- <el-select-->
+<!-- v-model="data.queryParams.year"-->
+<!-- placeholder="请选择年份"-->
+<!-- style="width: 240px"-->
+<!-- filterable-->
+<!-- allow-create-->
+<!-- default-first-option-->
+<!-- :reserve-keyword="false"-->
+<!-- @change="handleChangeNum"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in data.yearList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.label"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
<el-form-item>
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
@@ -49,6 +54,7 @@
type="primary"
@click="exportData"
>导出</el-button>
+ <el-button type="primary" plain @click="copy">复制</el-button>
</el-form-item>
</el-form>
</div>
@@ -84,6 +90,49 @@
/>
</div>
<editDialog ref="noticeRef" @getList = "getList"></editDialog>
+ <el-dialog
+ v-model="copyVisible"
+ width="500px"
+ :before-close="handleCloseCopy"
+ :close-on-press-escape="false"
+ :close-on-click-modal="false"
+ >
+ <div v-if="data.isAdmin">
+ <span style="display:block;margin-bottom: 8px">单位名称:</span>
+ <el-select
+ v-model="queryParams.companyId"
+ filterable
+ style="width: 100%;margin-bottom: 8px"
+ >
+ <el-option
+ v-for="item in data.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </div>
+ <span style="display:block;margin-bottom: 8px">将以下年份数据：</span>
+ <el-date-picker
+ v-model="data.copyYear"
+ type="year"
+ value-format="YYYY"
+ style="margin-bottom: 8px;width: 100%;"
+ placeholder="请选择"
+ />
+ <span style="display:block;margin-bottom: 8px">复制到：</span>
+ <el-date-picker
+ v-model="data.targetYear"
+ type="year"
+ value-format="YYYY"
+ style="margin-bottom: 8px;width: 100%"
+ placeholder="请选择"
+ />
+ <div class="dialog-footer" style="display: flex;justify-content: right">
+ <el-button @click="handleCloseCopy" size="default">取 消</el-button>
+ <el-button type="primary" @click="onSubmitCopy" size="default" v-preReClick>确认</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -95,7 +144,8 @@
import Cookies from "js-cookie";
import {generateWordDocument} from "@/utils/exportWord";
import {delTable, getTable} from "@/api/qualityObjectives/table";
-import {delDiscern, getDiscern} from "@/api/environment/factors";
+import {copyControl, copyFactor, delDiscern, getDiscern} from "@/api/environment/factors";
+import {copySysClause} from "@/api/staffManage/staff";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const noticeRef = ref();
@@ -110,6 +160,9 @@
year: '',
type: ''
},
+ copyVisible: false,
+ targetYear:'',
+ copyYear:'',
companyList: [],
isAdmin: false,
dialogVisible: false,
@@ -139,7 +192,7 @@
const dataList = ref([]);
const total = ref(0);
-const { queryParams } = toRefs(data);
+const { queryParams,copyVisible,chooseYearId } = toRefs(data);
onMounted(() => {
const userInfo = JSON.parse(Cookies.get('userInfo'))
@@ -150,11 +203,15 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
if(data.isAdmin){
getCompanyList()
}
});
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true;
const res = await getDiscern(data.queryParams);
@@ -231,6 +288,7 @@
type: ''
}
}
+ getNowYear()
getList();
}
@@ -315,7 +373,57 @@
data.yearList.push({ value, label: value }); // 添加新选项（这里简单地将值和标签设为相同）
}
}
+const copy = () => {
+ data.copyVisible = true
+}
+const onSubmitCopy = async () => {
+ if(data.isAdmin && !data.queryParams.companyId){
+ ElMessage.warning('请先选择单位')
+ return
+ }
+ if(!data.copyYear){
+ ElMessage.warning('请先选择要复制的年份')
+ return
+ }
+ if(!data.targetYear){
+ ElMessage.warning('请选择目标年份')
+ return
+ }
+ ElMessageBox.confirm(
+ '该操作将覆盖目标年份的数据，是否继续？',
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then( async() => {
+ const param = {
+ companyId: data.queryParams.companyId,
+ copyYear: data.copyYear,
+ targetYear: data.targetYear
+ }
+ const res = await copyFactor(param);
+ if(res.code === 200){
+ ElMessage({
+ type: 'success',
+ message: res.data
+ });
+ await handleCloseCopy()
+ await getList();
+ }else{
+ ElMessage.warning(res.message)
+ }
+
+ }).catch(err => {
+ })
+}
+const handleCloseCopy = () => {
+ data.targetYear=''
+ data.copyYear=''
+ data.copyVisible = false
+}
</script>
<style lang="scss">
.pag-container{
diff --git a/src/views/build/conpanyFunctionConsult/riskManage/control/index.vue b/src/views/build/conpanyFunctionConsult/riskManage/control/index.vue
index f1aa212..5d7ed13 100644
--- a/src/views/build/conpanyFunctionConsult/riskManage/control/index.vue
+++ b/src/views/build/conpanyFunctionConsult/riskManage/control/index.vue
@@ -22,33 +22,40 @@
</el-select>
</el-form-item>
<el-form-item label="年份:" style="margin-left: 20px">
- <el-select
+ <el-date-picker
v-model="data.queryParams.year"
- placeholder="请选择年份"
- style="width: 240px"
- filterable
- allow-create
- default-first-option
- :reserve-keyword="false"
- @change="handleChangeNum"
- >
- <el-option
- v-for="item in data.yearList"
- :key="item.value"
- :label="item.label"
- :value="item.label"
- />
- </el-select>
+ type="year"
+ value-format="YYYY"
+ />
+<!-- <el-select-->
+<!-- v-model="data.queryParams.year"-->
+<!-- placeholder="请选择年份"-->
+<!-- style="width: 240px"-->
+<!-- filterable-->
+<!-- allow-create-->
+<!-- default-first-option-->
+<!-- :reserve-keyword="false"-->
+<!-- @change="handleChangeNum"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in data.yearList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.label"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
<el-form-item>
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
+
</el-form-item>
<el-form-item style="margin-left: 15px">
<el-button
type="primary"
@click="exportData"
>导出</el-button>
+ <el-button type="primary" plain @click="copy">复制</el-button>
</el-form-item>
</el-form>
</div>
@@ -84,6 +91,49 @@
/>
</div>
<editDialog ref="noticeRef" @getList = "getList"></editDialog>
+ <el-dialog
+ v-model="copyVisible"
+ width="500px"
+ :before-close="handleCloseCopy"
+ :close-on-press-escape="false"
+ :close-on-click-modal="false"
+ >
+ <div v-if="data.isAdmin">
+ <span style="display:block;margin-bottom: 8px">单位名称:</span>
+ <el-select
+ v-model="queryParams.companyId"
+ filterable
+ style="width: 100%;margin-bottom: 8px"
+ >
+ <el-option
+ v-for="item in data.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </div>
+ <span style="display:block;margin-bottom: 8px">将以下年份数据：</span>
+ <el-date-picker
+ v-model="data.copyYear"
+ type="year"
+ value-format="YYYY"
+ style="margin-bottom: 8px;width: 100%;"
+ placeholder="请选择"
+ />
+ <span style="display:block;margin-bottom: 8px">复制到：</span>
+ <el-date-picker
+ v-model="data.targetYear"
+ type="year"
+ value-format="YYYY"
+ style="margin-bottom: 8px;width: 100%"
+ placeholder="请选择"
+ />
+ <div class="dialog-footer" style="display: flex;justify-content: right">
+ <el-button @click="handleCloseCopy" size="default">取 消</el-button>
+ <el-button type="primary" @click="onSubmitCopy" size="default" v-preReClick>确认</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -96,6 +146,8 @@
import {generateWordDocument} from "@/utils/exportWord";
import {delTable, getTable} from "@/api/qualityObjectives/table";
import {delRiskControl, getRiskControl} from "@/api/riskManage/risk";
+import {copySysClause} from "@/api/staffManage/staff";
+import {copyControl} from "@/api/environment/factors";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const noticeRef = ref();
@@ -110,6 +162,9 @@
year: '',
type: ''
},
+ copyVisible: false,
+ targetYear:'',
+ copyYear:'',
companyList: [],
isAdmin: false,
dialogVisible: false,
@@ -139,7 +194,7 @@
const dataList = ref([]);
const total = ref(0);
-const { queryParams } = toRefs(data);
+const { queryParams,copyVisible,chooseYearId } = toRefs(data);
onMounted(() => {
const userInfo = JSON.parse(Cookies.get('userInfo'))
@@ -150,11 +205,15 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
if(data.isAdmin){
getCompanyList()
}
});
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true;
const res = await getRiskControl(data.queryParams);
@@ -231,6 +290,7 @@
type: ''
}
}
+ getNowYear()
getList();
}
@@ -312,6 +372,58 @@
data.yearList.push({ value, label: value }); // 添加新选项（这里简单地将值和标签设为相同）
}
}
+const copy = () => {
+
+ data.copyVisible = true
+}
+
+const onSubmitCopy = async () => {
+ if(data.isAdmin && !data.queryParams.companyId){
+ ElMessage.warning('请先选择单位')
+ return
+ }
+ if(!data.copyYear){
+ ElMessage.warning('请先选择要复制的年份')
+ return
+ }
+ if(!data.targetYear){
+ ElMessage.warning('请选择目标年份')
+ return
+ }
+ ElMessageBox.confirm(
+ '该操作将覆盖目标年份的数据，是否继续？',
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then( async() => {
+ const param = {
+ companyId: data.queryParams.companyId,
+ copyYear: data.copyYear,
+ targetYear: data.targetYear
+ }
+ const res = await copyControl(param);
+ if(res.code === 200){
+ ElMessage({
+ type: 'success',
+ message: res.data
+ });
+ await handleCloseCopy()
+ await getList();
+
+ }else{
+ ElMessage.warning(res.message)
+ }
+ }).catch(err => {
+ })
+}
+const handleCloseCopy = () => {
+ data.targetYear=''
+ data.copyYear=''
+ data.copyVisible = false
+}
</script>
<style lang="scss">
diff --git a/src/views/build/conpanyFunctionConsult/riskManage/record/index.vue b/src/views/build/conpanyFunctionConsult/riskManage/record/index.vue
index 1e4c852..a1b9def 100644
--- a/src/views/build/conpanyFunctionConsult/riskManage/record/index.vue
+++ b/src/views/build/conpanyFunctionConsult/riskManage/record/index.vue
@@ -22,23 +22,28 @@
</el-select>
</el-form-item>
<el-form-item label="年份:" style="margin-left: 20px">
- <el-select
+ <el-date-picker
v-model="data.queryParams.year"
- placeholder="请选择年份"
- style="width: 240px"
- filterable
- allow-create
- default-first-option
- :reserve-keyword="false"
- @change="handleChangeNum"
- >
- <el-option
- v-for="item in data.yearList"
- :key="item.value"
- :label="item.label"
- :value="item.label"
- />
- </el-select>
+ type="year"
+ value-format="YYYY"
+ />
+<!-- <el-select-->
+<!-- v-model="data.queryParams.year"-->
+<!-- placeholder="请选择年份"-->
+<!-- style="width: 240px"-->
+<!-- filterable-->
+<!-- allow-create-->
+<!-- default-first-option-->
+<!-- :reserve-keyword="false"-->
+<!-- @change="handleChangeNum"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in data.yearList"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.label"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
<el-form-item>
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
@@ -150,11 +155,15 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
if(data.isAdmin){
getCompanyList()
}
});
+const getNowYear = () =>{
+ data.queryParams.year = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true;
const res = await getMonitorRecord(data.queryParams);
@@ -231,6 +240,7 @@
type: ''
}
}
+ getNowYear()
getList();
}
diff --git a/src/views/work/onlineEducation/courseEvaluate/index.vue b/src/views/work/onlineEducation/courseEvaluate/index.vue
index e9db2eb..8ec6f3d 100644
--- a/src/views/work/onlineEducation/courseEvaluate/index.vue
+++ b/src/views/work/onlineEducation/courseEvaluate/index.vue
@@ -11,6 +11,13 @@
v-hasPermi="['courseEvaluate:list:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:" style="margin-left: 20px">
+ <el-date-picker
+ v-model="data.queryParams.openYear"
+ type="year"
+ value-format="YYYY"
+ />
+ </el-form-item>
<el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
<el-select v-model="data.queryParams.companyId" placeholder="请选择" filterable clearable>
<el-option
@@ -84,7 +91,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
- year: '',
+ openYear: '',
type: ''
},
companyList: [],
@@ -105,11 +112,15 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
if(data.isAdmin){
getCompanyList()
}
});
+const getNowYear = () =>{
+ data.queryParams.openYear = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true;
const res = await getCourseEvaluate(data.queryParams);
@@ -170,7 +181,7 @@
companyId: '',
pageNum: 1,
pageSize: 10,
- year: '',
+ openYear: '',
type: ''
}
choosedData.value = []
@@ -181,10 +192,11 @@
companyId: data.queryParams.companyId,
pageNum: 1,
pageSize: 10,
- year: '',
+ openYear: '',
type: ''
}
}
+ getNowYear()
getList();
}
diff --git a/src/views/work/onlineEducation/offlineEducation/index.vue b/src/views/work/onlineEducation/offlineEducation/index.vue
index f2896ac..ce24e2e 100644
--- a/src/views/work/onlineEducation/offlineEducation/index.vue
+++ b/src/views/work/onlineEducation/offlineEducation/index.vue
@@ -11,7 +11,14 @@
v-hasPermi="['offlineEducation:list:add']"
>新增登记</el-button>
</el-form-item>
- <el-form-item label="单位名称：" >
+ <el-form-item label="年份:" style="margin-left: 20px">
+ <el-date-picker
+ v-model="data.queryParams.planYear"
+ type="year"
+ value-format="YYYY"
+ />
+ </el-form-item>
+ <el-form-item label="单位名称：" v-if="data.isAdmin" >
<el-input v-model="data.queryParams.companyName" placeholder="请输入单位名称"></el-input>
</el-form-item>
<el-form-item label="课程名称：" >
@@ -133,6 +140,7 @@
courseName: '',
pageNum: 1,
pageSize: 10,
+ planYear: ''
},
total: 0,
dataList: [],
@@ -152,12 +160,15 @@
data.isAdmin = false;
// data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
await getList()
})
onUnmounted(()=>{
})
-
+const getNowYear = () =>{
+ data.queryParams.planYear = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true
const res = await getRecord(data.queryParams)
@@ -187,7 +198,9 @@
courseName: '',
pageNum: 1,
pageSize: 10,
+ planYear: ''
}
+ getNowYear()
getList()
}
const handleDelete = (val) => {
diff --git a/src/views/work/onlineEducation/trainPlan/index.vue b/src/views/work/onlineEducation/trainPlan/index.vue
index 462746b..d0b3c46 100644
--- a/src/views/work/onlineEducation/trainPlan/index.vue
+++ b/src/views/work/onlineEducation/trainPlan/index.vue
@@ -11,6 +11,13 @@
v-hasPermi="['trainPlan:list:add']"
>新增</el-button>
</el-form-item>
+ <el-form-item label="年份:" style="margin-left: 20px">
+ <el-date-picker
+ v-model="data.queryParams.trainTime "
+ type="year"
+ value-format="YYYY"
+ />
+ </el-form-item>
<el-form-item label="单位名称:" v-if="data.isAdmin" style="margin-left: 20px">
<el-select v-model="data.queryParams.companyId" filterable placeholder="请选择" clearable>
<el-option
@@ -21,6 +28,8 @@
</el-option>
</el-select>
</el-form-item>
+
+
<el-form-item v-if="data.isAdmin">
<el-button type="primary" style="margin-left: 30px" @click="searchClick">查询</el-button>
<el-button plain @click="reset">重置</el-button>
@@ -102,6 +111,7 @@
pageNum: 1,
pageSize: 10,
companyId: null,
+ trainTime : ''
},
companyList: [],
isAdmin: false,
@@ -144,8 +154,13 @@
}else {
data.queryParams.companyId = userInfo.companyId
}
+ getNowYear()
getList();
+
});
+const getNowYear = () =>{
+ data.queryParams.trainTime = new Date().getFullYear().toString()
+}
const getList = async () => {
loading.value = true;
const res = await getTrainPlanPage(data.queryParams);
@@ -166,6 +181,7 @@
}
const searchClick = () => {
+ console.log('q',data.queryParams)
getList();
}
const openDialog = (type, value) => {
@@ -200,11 +216,14 @@
companyId: '',
pageNum: 1,
pageSize: 10,
+ trainTime : ''
}
choosedData.value = []
data.companyList = [];
+ getNowYear()
getList();
getCompanyList()
+
}
const exportData = () => {
if(choosedData.value && choosedData.value.length === 0){
--
Gitblit v1.9.2