From 60609230f220fccdf0768b2d2255291f30940a4f Mon Sep 17 00:00:00 2001 From: ZhangXianQiang <1135831638@qq.com> Date: 星期三, 20 三月 2024 14:16:36 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui --- src/views/system/check-result/city/index.vue | 4 +- src/api/system/role.js | 8 +++ src/views/system/check-result/index.vue | 4 +- src/layout/components/Navbar.vue | 13 ++++++ src/views/system/check-template/index.vue | 60 ++++++++++++++++++++++++++---- src/views/system/report/index.vue | 2 src/views/system/work-order/index.vue | 13 +++--- 7 files changed, 83 insertions(+), 21 deletions(-) diff --git a/src/api/system/role.js b/src/api/system/role.js index f13e6f4..3e28128 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -56,7 +56,13 @@ data: data }) } - +// 鍒囨崲瑙掕壊 +export function exchangeRole(roleId) { + return request({ + url: '/system/role/exchange/'+ roleId, + method: 'get', + }) +} // 鍒犻櫎瑙掕壊 export function delRole(roleId) { return request({ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c79a894..9436b0e 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -6,6 +6,11 @@ <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/> <div class="right-menu"> + <el-button-group style="vertical-align: text-bottom;"> + <el-button @click="exchange(100)">鐪佸巺瑙掕壊</el-button> + <el-button @click="exchange(103)">鍖哄幙瑙掕壊</el-button> + <el-button @click="exchange(2)">杩愮淮瑙掕壊</el-button> + </el-button-group> <template v-if="device!=='mobile'"> <screenfull id="screenfull" class="right-menu-item hover-effect" /> <el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom"> @@ -31,6 +36,7 @@ </el-dropdown-item> </el-dropdown-menu> </el-dropdown> + </div> </div> </template> @@ -45,7 +51,7 @@ import Search from '@/components/HeaderSearch' import RuoYiGit from '@/components/RuoYi/Git' import RuoYiDoc from '@/components/RuoYi/Doc' - +import { exchangeRole} from "@/api/system/role"; export default { components: { Breadcrumb, @@ -81,6 +87,11 @@ } }, methods: { + exchange(roleId){ + exchangeRole(roleId).then(response => { + this.$modal.msgSuccess("淇敼鎴愬姛"); + }).catch(()=>{}); + }, toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, diff --git a/src/views/system/check-result/city/index.vue b/src/views/system/check-result/city/index.vue index 20982a9..781a138 100644 --- a/src/views/system/check-result/city/index.vue +++ b/src/views/system/check-result/city/index.vue @@ -94,8 +94,8 @@ <div class="text item">鑰冩牳棰戠巼<span class="time">{{ "瀛e害" }}</span></div> <div class="text item">鑰冩牳鏃堕棿 <span class="time">{{ item.checkTime }}</span> - <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1">纭鍙戝竷</el-button> - <el-button size="small" round style="float: right;" v-show="item.publish == 1" disabled="true">宸插彂甯�</el-button> + <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:city:publish']">纭鍙戝竷</el-button> + <el-button size="small" round style="float: right;" v-show="item.publish == 1" disabled="true" v-hasPermi="['result:city:publish']">宸插彂甯�</el-button> </div> </el-card> diff --git a/src/views/system/check-result/index.vue b/src/views/system/check-result/index.vue index 0817e2b..536bd3a 100644 --- a/src/views/system/check-result/index.vue +++ b/src/views/system/check-result/index.vue @@ -94,8 +94,8 @@ <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</span></div> <div class="text item">鑰冩牳鏃堕棿 <span class="time">{{ item.checkTime }}</span> - <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1">纭鍙戝竷</el-button> - <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1">宸插彂甯�</el-button> + <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:contract:publish']">纭鍙戝竷</el-button> + <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1" v-hasPermi="['result:contract:publish']">宸插彂甯�</el-button> </div> </el-card> diff --git a/src/views/system/check-template/index.vue b/src/views/system/check-template/index.vue index 70c8f5c..52dc255 100644 --- a/src/views/system/check-template/index.vue +++ b/src/views/system/check-template/index.vue @@ -116,14 +116,15 @@ <el-input v-model="form.templateName" placeholder="璇疯緭鍏ユā鏉垮悕绉�" /> </el-form-item> <el-form-item label="鑰冩牳瀵硅薄" prop="unitName"> - <el-select v-model="form.unitName" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in unitList" - :key="item.id" - :label="item.value" - :value="item.id"> - </el-option> - </el-select> + <div class="block"> + <span class="demonstration"></span> + <el-cascader + v-model="value" + :options="options" + :props = "props" + @change="handleChange"></el-cascader> + </div> + </el-form-item> <el-form-item label="鑰冩牳瑙勫垯" prop="tempRuleFormList"> <div class="row-warp"> @@ -193,6 +194,46 @@ name: "CheckTemplate", data() { return { + props: { multiple: true }, + value: [], + options: [{ + value: 'city', + label: '鍖哄幙', + children: [{ + value: 'fushun', + label: '瀵岄『鍘�', + }, { + value: 'rong', + label: '鑽e幙', + },{ + value: 'gaoxin', + label: '楂樻柊鍖�', + },{ + value: 'ziliujing', + label: '鑷祦浜曞尯', + },{ + value: 'gongjing', + label: '璐′簳鍖�', + },{ + value: 'daan', + label: '澶у畨鍖�', + },{ + value: 'yantan', + label: '娌挎哗鍖�', + }, + ] + }, { + value: 'company', + label: '鍏徃', + children: [{ + value: 'yunwei', + label: '鎴愰兘x杩愮淮', + }, { + value: 'yunwei2', + label: '鑷础x杩愮淮', + }, ] + }, + ], ruleList: [], unitList: [], // 涓存椂瑙勫垯琛ㄥ崟 @@ -250,6 +291,9 @@ this.selectUnit(); }, methods: { + handleChange(value) { + console.log(value); + }, removeRule(form) { console.log(form) this.ruleFormList = this.ruleFormList.filter(item => item !== form); diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue index aff69e5..458bf4d 100644 --- a/src/views/system/report/index.vue +++ b/src/views/system/report/index.vue @@ -104,7 +104,7 @@ type="text" icon="el-icon-edit" @click="handleAuditing(scope.row)" - v-hasPermi="['system:report:auditing']" + v-hasPermi="['system:report:audit']" >瀹℃牳</el-button> <el-button size="mini" diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue index f04eb76..a40125e 100644 --- a/src/views/system/work-order/index.vue +++ b/src/views/system/work-order/index.vue @@ -107,15 +107,16 @@ type="text" @click="handleYwCondition(scope.row)" >杩愮淮鎯呭喌</el-button> - <el-button - size="mini" - type="text" - @click="handleYwResult(scope.row)" - >杩愮淮缁撴灉</el-button> +<!-- <el-button--> +<!-- size="mini"--> +<!-- type="text"--> +<!-- @click="handleYwResult(scope.row)"--> +<!-- >杩愮淮缁撴灉</el-button>--> <el-button size="mini" type="text" @click="handleCheckResult(scope.row)" + v-hasPermi="['work:order:result']" >妫�娴嬬粨鏋�</el-button> <el-button size="mini" @@ -281,7 +282,7 @@ </el-form> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="submitYwResult">纭� 瀹�</el-button> - <el-button @click="cancelYwResult">鍙� 娑�</el-button> + <el-button @click="cancelCheckResult">鍙� 娑�</el-button> </div> </el-dialog> -- Gitblit v1.8.0