From 6d1a626add47da55f6c02f40fb3cfcd58d1587eb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 15:07:28 +0800
Subject: [PATCH] 最新版本
---
admin/src/views/business/problems.vue | 1 +
admin/src/components/business/OperaHiddenDangerWindow.vue | 19 +++++++++++--------
admin/src/components/business/OperaProblemsWindow.vue | 7 ++++++-
admin/src/views/business/internalMember.vue | 2 +-
admin/src/api/system/permission.js | 4 ++--
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/admin/src/api/system/permission.js b/admin/src/api/system/permission.js
index 3145591..cc31a6c 100644
--- a/admin/src/api/system/permission.js
+++ b/admin/src/api/system/permission.js
@@ -26,12 +26,12 @@
// 鍒犻櫎
export function deleteById (id) {
- return request.get(`/system/permission/delete/${id}`)
+ return request.get(`/visitsAdmin/cloudService/system/permission/delete/${id}`)
}
// 鎵归噺鍒犻櫎
export function deleteByIdInBatch (ids) {
- return request.get('/system/permission/delete/batch', {
+ return request.get('/visitsAdmin/cloudService/system/permission/delete/batch', {
params: {
ids
}
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index b43e322..ae6acc1 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- :visible.sync="visable"
+ :visible.sync="visible"
@confirm="confirm"
@close="reject"
>
@@ -9,15 +9,15 @@
<div class="modal_content">
<div class="header">
<div class="left">
- <div class="h1">闅愭偅闅忔墜鎷�</div>
+ <div class="h1">闅愭偅鎻愭姤</div>
<div class="time">鎻愭姤鏃堕棿锛歿{model.createDate}}</div>
</div>
- <div class="right" v-if="model.status==0">寰呭鏍�</div>
+ <div class="right" v-if="model.status==0">寰呭鐞�</div>
<div class="right" v-if="model.status==1">宸插鐞�</div>
<div class="right" v-if="model.status==2">宸叉挙閿�</div>
</div>
<div class="info">
- <div class="title">闅愭偅闅忔墜鎷嶈鎯�</div>
+ <div class="title">闅愭偅鎻愭姤璇︽儏</div>
<div class="list">
<div class="item">
<div class="label">鎻愭姤浜�</div>
@@ -99,8 +99,11 @@
</div>
</div>
<!-- -->
- <template #btns>
- <el-button type="primary" plain @click="handleTransfer">杞氦</el-button>
+ <template v-slot:footer>
+ <el-button @click="dealDo" type="primary" v-if="model.status==0" class="status-red">澶勭悊</el-button>
+ <el-button type="primary" plain v-if="model.status==0" @click="handleTransfer">杞氦</el-button>
+ <el-button @click="backDo" v-if="model.status==0" type="danger" >閫�鍥�</el-button>
+ <el-button @click="visible=false">杩斿洖</el-button>
</template>
<!-- 鍚屾剰/鎷掔粷 -->
<el-dialog
@@ -181,7 +184,7 @@
data() {
return {
title: '璁垮棰勭害璇︽儏',
- visable: false,
+ visible: false,
model: { },
isShowAppr: false,
apprTitle: '鍚屾剰',
@@ -193,7 +196,7 @@
methods: {
open(title,target){
this.title =title
- this.visable=true
+ this.visible=true
this.model = target
},
confirm() {
diff --git a/admin/src/components/business/OperaProblemsWindow.vue b/admin/src/components/business/OperaProblemsWindow.vue
index abd0aae..c39b287 100644
--- a/admin/src/components/business/OperaProblemsWindow.vue
+++ b/admin/src/components/business/OperaProblemsWindow.vue
@@ -23,8 +23,11 @@
<el-radio :label="2">浠呭姵鍔�</el-radio>
</el-radio-group>
</el-form-item>
+ <el-form-item label="鍒嗗��" prop="score">
+ <el-input v-model="form.score" type="number" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
<el-form-item label="棰樼洰椤哄簭(鍗囧簭)" prop="sortnu">
- <el-input v-model="form.sortnu" placeholder="璇疯緭鍏�" v-trim/>
+ <el-input v-model="form.sortnu" type="number" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="閫夐」闆嗗悎" prop="objectList" v-if="form.type === 1 || form.type === 2">
<el-button type="primary" style="width: 120px; margin-bottom: 15px;" @click="add" icon="el-icon-plus">娣诲姞閫夐」</el-button>
@@ -84,6 +87,7 @@
answer: '',
sortnu: '',
type: 0,
+ scroe:null,
useType: 0
},
// 楠岃瘉瑙勫垯
@@ -146,6 +150,7 @@
sortnu: this.form.sortnu,
type: this.form.type,
useType: this.form.useType,
+ score: this.form.score,
objectList: this.form.objectList
})
.then(() => {
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 88dbdbe..9629aed 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -37,7 +37,7 @@
</section>
</el-form>
<template v-slot:menu>
- <div style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">浼佷笟缁勭粐鏋舵瀯</div>areaSet
+ <div style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">浼佷笟缁勭粐鏋舵瀯</div>
<div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
<Tree :list="companyTree" :defaultProps="{name: 'name', status: 'fsStatus', children: 'childList', id: 'id'}" @callback="callback" />
</div>
diff --git a/admin/src/views/business/problems.vue b/admin/src/views/business/problems.vue
index a89e4c4..a628525 100644
--- a/admin/src/views/business/problems.vue
+++ b/admin/src/views/business/problems.vue
@@ -42,6 +42,7 @@
<span v-if="row.type === 2">澶氶��</span>
</template>
</el-table-column>
+ <el-table-column prop="scroe" label="鍒嗗��" min-width="100px"></el-table-column>
<el-table-column prop="sortnu" label="棰樼洰椤哄簭(鍗囧簭)" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="creatorName" label="鍒涘缓浜�" min-width="100px"></el-table-column>
--
Gitblit v1.9.3