From fd7c13ce580074ab32c9432a2d8b625e207d4bc5 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 02 Feb 2026 15:01:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-wx/src/static/images/lbt1.png | 0
uniapps/work-wx/src/static/images/lbt2.png | 0
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue | 1 -
applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue | 14 ++++++++++++--
uniapps/work-wx/src/static/images/lbt3.png | 0
uniapps/work-wx/src/pages/page/index.vue | 34 ++++++++++++++++++++++++++--------
6 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
index 7757fad..61a5900 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
@@ -87,7 +87,6 @@
</template>
<script setup>
import { Search, RefreshRight, Plus, Delete } from '@element-plus/icons-vue'
-import { onMounted, ref, nextTick, provide } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDictLabel } from '@ztzf/utils'
@@ -99,12 +98,14 @@
import { useStore } from 'vuex'
const store = useStore()
const userDepartment = store.state.user.userInfo?.dept_id
+const permission = computed(() => store.state.user.permission);
// 初始化查询参数
const initSearchParams = () => ({
caseName: '', // 案例名称
innovationStatus: '', // 应用创新状态
current: 1, // 当前页
size: 10, // 每页大小
+ isQueryAll:''//是否查询所有
})
const searchParams = ref(initSearchParams()) // 查询参数
const total = ref(0) // 总条数
@@ -129,7 +130,16 @@
async function getList() {
loading.value = true
try {
- const res = await gdApplicationInnovationPageApi(searchParams.value)
+ // 根据权限设置查询参数
+ const params = { ...searchParams.value }
+ if (permission.value.yycx_shtg) {
+ params.innovationStatus = '1'
+ params.isQueryAll = true
+ } else {
+ params.isQueryAll = false
+ delete params.innovationStatus
+ }
+ const res = await gdApplicationInnovationPageApi(params)
res?.data?.data?.records.forEach(item => {
item.isTheSameDepartment = String(item.createDept) === String(userDepartment)
})
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
index b3b3a77..58066d9 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
@@ -91,7 +91,6 @@
const store = useStore()
const userDepartment = store.state.user.userInfo?.dept_id
const permission = computed(() => store.state.user.permission);
-console.log('ppppppp', permission.value.sjyy_shtg)
// 初始化查询参数
const initSearchParams = () => ({
title: '', // 标题
diff --git a/uniapps/work-wx/src/pages/page/index.vue b/uniapps/work-wx/src/pages/page/index.vue
index 55e40b8..59c1917 100644
--- a/uniapps/work-wx/src/pages/page/index.vue
+++ b/uniapps/work-wx/src/pages/page/index.vue
@@ -78,7 +78,9 @@
<script setup>
import { onMounted, reactive, ref } from 'vue'
- import lbPng from '@/static/images/lbt.png'
+ import lbPng1 from '@/static/images/lbt1.png'
+ import lbPng2 from '@/static/images/lbt2.png'
+ import lbPng3 from '@/static/images/lbt3.png'
import kyxxPng from '@/static/images/kyxx.png'
import fxsqPng from '@/static/images/fxsq.png'
import flfgPng from '@/static/images/flfg.png'
@@ -91,15 +93,31 @@
import { useAppStore } from "@/store";
const appStore = useAppStore()
-const lbList = reactive([]);
-// lbPng 轮播图 5次
-for (let i = 0; i < 5; i++) {
- lbList.push({
- image: lbPng,
+const lbList = reactive([
+ {
+ image: lbPng1,
title: '法律政策',
link: '/pages/legalPolicy/index',
- })
-}
+ },
+ {
+ image: lbPng2,
+ title: '法律政策',
+ link: '/pages/legalPolicy/index',
+ },
+ {
+ image: lbPng3,
+ title: '法律政策',
+ link: '/pages/legalPolicy/index',
+ },
+]);
+// lbPng 轮播图 5次
+// for (let i = 0; i < 5; i++) {
+// lbList.push({
+// image: lbPng,
+// title: '法律政策',
+// link: '/pages/legalPolicy/index',
+// })
+// }
// const change = (index) => {
// console.log('轮播图切换到第', index + 1, '张');
diff --git a/uniapps/work-wx/src/static/images/lbt1.png b/uniapps/work-wx/src/static/images/lbt1.png
new file mode 100644
index 0000000..8f56f04
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/lbt1.png
Binary files differ
diff --git a/uniapps/work-wx/src/static/images/lbt2.png b/uniapps/work-wx/src/static/images/lbt2.png
new file mode 100644
index 0000000..0d9549f
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/lbt2.png
Binary files differ
diff --git a/uniapps/work-wx/src/static/images/lbt3.png b/uniapps/work-wx/src/static/images/lbt3.png
new file mode 100644
index 0000000..9c00238
--- /dev/null
+++ b/uniapps/work-wx/src/static/images/lbt3.png
Binary files differ
--
Gitblit v1.9.3