fgm
/
cankao-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
34701892@qq.com 2025-11-10 16:41:37 +08:00
parent bc3059ebb8 742f0b3c54
commit bde6e84e3e
2 changed files with 60 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/pages/richedit/index.vue
View File

@ -683,7 +683,7 @@ const isScoreShow = ref(false);
const curScore = ref(0); const curScore = ref(0);
const scoreDetail = ref<any>({}); const scoreDetail = ref<any>({});
const isAdmin = computed(() => { const isAdmin = computed(() => {
return route.query.admin == 'superman' ? true : false; return route.query.admin == 'superman' || Session.get('userInfoLocal').userType == '02' || Session.get('userInfoLocal').userType == '01' ? true : false;
}); });
async function getScoreDetail(id: any) { async function getScoreDetail(id: any) {
if (!isAdmin.value) return; if (!isAdmin.value) return;

134
src/views/pages/richedit/indexMobile.vue
View File

@ -2,13 +2,8 @@
<!-- v-infinite-scroll="getDataByScoll" --> <!-- v-infinite-scroll="getDataByScoll" -->
<div class="all" ref="mescrollRef" style="overflow: auto"> <div class="all" ref="mescrollRef" style="overflow: auto">
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<el-input <el-input v-model="form.keyword" placeholder="输入关键字进行搜索（以空格隔开）" class="input-with-select"
v-model="form.keyword" @keyup.enter="handleSearch" style="width: 80%">
placeholder="输入关键字进行搜索（以空格隔开）"
class="input-with-select"
@keyup.enter="handleSearch"
style="width: 80%"
>
<template #append> <template #append>
<el-button icon="Search" @click="handleSearch" /> <el-button icon="Search" @click="handleSearch" />
</template> </template>
@ -17,27 +12,17 @@
<el-button style="width: 20%" type="text" @click="restData">清空条件</el-button> <el-button style="width: 20%" type="text" @click="restData">清空条件</el-button>
</div> </div>
<el-date-picker <el-date-picker style="margin-top: 20px; width: 100%; max-height: 40px" v-model="daterange" type="daterange"
style="margin-top: 20px; width: 100%; max-height: 40px" range-separator="至" value-format="YYYY-MM-DD" start-placeholder="选择报道时间" end-placeholder="选择报道时间"
v-model="daterange" @change="handleSearch" />
type="daterange"
range-separator="至"
value-format="YYYY-MM-DD"
start-placeholder="选择报道时间"
end-placeholder="选择报道时间"
@change="handleSearch"
/>
<div class="filter"> <div class="filter">
<div class="r_tabs"> <div class="r_tabs">
<div class="tabItem" v-for="(item, index) in tabsList" :key="index" @click="changeTab(index)"> <div class="tabItem" v-for="(item, index) in tabsList" :key="index" @click="changeTab(index)">
<text <text :style="{
:style="{ color: tabIndex == index ? '#409eff' : '#333',
color: tabIndex == index ? '#409eff' : '#333', fontWeight: tabIndex == index ? 'bold' : 'normal',
fontWeight: tabIndex == index ? 'bold' : 'normal', }">{{ item.name }}</text>
}"
>{{ item.name }}</text
>
<div class="tab_line" v-if="tabIndex == index"></div> <div class="tab_line" v-if="tabIndex == index"></div>
</div> </div>
</div> </div>
@ -51,7 +36,8 @@
<div class="card_header" @click.stop="goDetail(1, item, true)"> <div class="card_header" @click.stop="goDetail(1, item, true)">
<text class="card_title" v-html="item.title"></text> <text class="card_title" v-html="item.title"></text>
<div class="r_point" :style="{ color: '#000' }"> <div class="r_point" :style="{ color: '#000' }">
<div class="point" :style="{ backgroundColor: item.status == 2 ? '#52C41A' : '#D9D9D9' }"></div> <div class="point" :style="{ backgroundColor: item.status == 2 ? '#52C41A' : '#D9D9D9' }">
</div>
<text v-if="item.status == 0" style="color: rgba(0, 0, 0, 0.65)">草稿</text> <text v-if="item.status == 0" style="color: rgba(0, 0, 0, 0.65)">草稿</text>
<text v-if="item.status == 1" style="color: rgba(0, 0, 0, 0.65)"> <text v-if="item.status == 1" style="color: rgba(0, 0, 0, 0.65)">
{{ item.deleted ? '已删除' : '未发布' }} {{ item.deleted ? '已删除' : '未发布' }}
@ -86,54 +72,59 @@
<div style="display: flex; justify-content: space-between; align-items: center; height: 10px"> <div style="display: flex; justify-content: space-between; align-items: center; height: 10px">
<div></div> <div></div>
<div class="option"> <div class="option">
<el-button v-if="item.deleted" type="text" style="margin-left: -10px" @click="doRecoverFn(item)"> <el-button v-if="item.deleted" type="text" style="margin-left: -10px"
@click="doRecoverFn(item)">
<text>恢复</text> <text>恢复</text>
</el-button> </el-button>
<div v-else style="display: flex; gap: 3px; align-items: center; flex-wrap: nowrap; white-space: nowrap"> <div v-else
style="display: flex; gap: 3px; align-items: center; flex-wrap: nowrap; white-space: nowrap">
<!-- 新闻状态 0-草稿 | 1-未发布 | 2-已发布 | 3-送审 | 4-已二审 | -1-退改中 --> <!-- 新闻状态 0-草稿 | 1-未发布 | 2-已发布 | 3-送审 | 4-已二审 | -1-退改中 -->
<div v-if="Session.get('userInfoLocal').userType == '00'"> <div v-if="Session.get('userInfoLocal').userType == '00'">
<!-- 普通账号 --> <!-- 普通账号 -->
<el-button v-if="item.status == 0 || item.status == 1 || item.status == -1" type="text" @click="goDetail(1, item, false)" <el-button v-if="item.status == 0 || item.status == 1 || item.status == -1"
>编辑</el-button type="text" @click="goDetail(1, item, false)">编辑</el-button>
>
<el-button v-if="item.status == 0 || item.status == 1 || item.status == -1" type="text" @click="doApprovalFn(item, item.status)" <el-button v-if="item.status == 0 || item.status == 1 || item.status == -1"
>送审</el-button type="text" @click="doApprovalFn(item, item.status)">送审</el-button>
> <el-button v-else-if="item.status == 3" type="text"
<el-button v-else-if="item.status == 3" type="text" @click="doApprovalFn(item, item.status)">撤审</el-button> @click="doApprovalFn(item, item.status)">撤审</el-button>
<el-button <el-button v-if="item.status == 0 || item.status == 1 || item.status == -1"
v-if="item.status == 0 || item.status == 1 || item.status == -1" type="text" style="color: #ff1818" @click="doDeleteNewsFn(item)">删除</el-button>
type="text"
style="color: #ff1818"
@click="doDeleteNewsFn(item)"
>删除</el-button
>
</div> </div>
<div v-if="Session.get('userInfoLocal').userType == '02'"> <div v-if="Session.get('userInfoLocal').userType == '02'">
<el-button v-if="item.status == 4" type="text" @click="doApprovalFn(item, item.status)">撤审</el-button> <el-button v-if="item.status == 4" type="text"
@click="doApprovalFn(item, item.status)">撤审</el-button>
<!-- 二审账号 --> <!-- 二审账号 -->
<el-button v-if="item.status == 3" type="text" style="color: #ff1818" @click="doNewReturnFn(item)">退改</el-button> <el-button v-if="item.status == 3" type="text" style="color: #ff1818"
@click="doNewReturnFn(item)">退改</el-button>
<el-button v-if="item.status == 3" type="text" @click="goDetail(1, item, false)">编辑</el-button> <el-button v-if="item.status == 3" type="text"
@click="goDetail(1, item, false)">编辑</el-button>
<el-button v-if="item.status == 3" type="text" @click="doNewCheckFn(item)">复审</el-button> <el-button v-if="item.status == 3" type="text"
@click="doNewCheckFn(item)">复审</el-button>
<el-button type="text" v-if="item.status == 4" @click="doNewsPublishFn(item, 2)">发布</el-button> <el-button type="text" v-if="item.status == 4"
@click="doNewsPublishFn(item, 2)">发布</el-button>
</div> </div>
<div v-if="Session.get('userInfoLocal').userType == '01'"> <div v-if="Session.get('userInfoLocal').userType == '01'">
<!-- 终审账号 --> <!-- 终审账号 -->
<el-button v-if="item.status == 3 || item.status == 4" type="text" @click="goDetail(1, item, false)">编辑</el-button> <el-button v-if="item.status == 3 || item.status == 4" type="text"
@click="goDetail(1, item, false)">编辑</el-button>
<el-button v-if="item.status == 4" type="text" style="color: #ff1818" @click="doNewReturnFn(item)">退改</el-button> <el-button v-if="item.status == 4" type="text" style="color: #ff1818"
@click="doNewReturnFn(item)">退改</el-button>
<el-button type="text" v-if="item.status == 2" @click="doNewsPublishFn(item, 1)">撤稿</el-button> <el-button type="text" v-if="item.status == 2"
<el-button type="text" v-else-if="item.status != -1 && item.status == 4" @click="doNewsPublishFn(item, 2)">发布</el-button> @click="doNewsPublishFn(item, 1)">撤稿</el-button>
<el-button type="text" v-else-if="item.status != -1 && item.status == 4"
@click="doNewsPublishFn(item, 2)">发布</el-button>
<el-button v-if="item.status == 3" type="text" style="color: #ff1818; margin-left: 5px" @click="doNewReturnFn(item)" <el-button v-if="item.status == 3" type="text"
>退改</el-button style="color: #ff1818; margin-left: 5px"
> @click="doNewReturnFn(item)">退改</el-button>
</div> </div>
<!-- <el-icon size="16" @click="goRecord(scope.row)"> <!-- <el-icon size="16" @click="goRecord(scope.row)">
@ -155,16 +146,9 @@
</el-icon> </el-icon>
</div> </div>
<keep-alive> <keep-alive>
<DetailDrawer <DetailDrawer v-model="drawer" :data="newsData" :readOnly="readOnly" :type="newstype"
v-model="drawer" @handleEditStatus="handleEditStatus" @doNewsPublishFn="doNewsPublishFn" @doDeleteNewsFn="doDeleteNewsFn"
:data="newsData" @getData="getData" />
:readOnly="readOnly"
:type="newstype"
@handleEditStatus="handleEditStatus"
@doNewsPublishFn="doNewsPublishFn"
@doDeleteNewsFn="doDeleteNewsFn"
@getData="getData"
/>
</keep-alive> </keep-alive>
</div> </div>
</template> </template>
@ -326,20 +310,20 @@ async function doNewsPublishFn(item, status) {
let { code } = let { code } =
status == 1 status == 1
? await doNewRevoke({ ? await doNewRevoke({
id: item.id, id: item.id,
status: status, status: status,
}) })
: await doNewsPublish({ : await doNewsPublish({
id: item.id, id: item.id,
status: status, status: status,
}); });
if (code == 200) { if (code == 200) {
ElMessage.success('操作成功'); ElMessage.success('操作成功');
drawer.value = false; drawer.value = false;
getData(); getData();
} }
}) })
.catch(() => {}); .catch(() => { });
} }
/** 管理后台需求文件0519（V1.1） start */ /** 管理后台需求文件0519（V1.1） start */
@ -465,18 +449,18 @@ async function doApprovalFn(item, status) {
let { code } = let { code } =
status == 3 || status == 4 status == 3 || status == 4
? await doNewRevoke({ ? await doNewRevoke({
id: item.id, id: item.id,
}) })
: await doNewSubmit({ : await doNewSubmit({
id: item.id, id: item.id,
}); });
if (code == 200) { if (code == 200) {
ElMessage.success('操作成功'); ElMessage.success('操作成功');
drawer.value = false; drawer.value = false;
getData(); getData();
} }
}) })
.catch(() => {}); .catch(() => { });
} }
onMounted(() => { onMounted(() => {