From fa3ec77225c230a44e107cd188d26e1d974d8029 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 05 一月 2024 15:59:43 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/views/docking/info.vue | 3
Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue | 552 ++++++++++++++++----------------
Source/UBCS-WEB/src/views/wel/index.vue | 453 +++++++++++++-------------
3 files changed, 506 insertions(+), 502 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index e78862f..1c28481 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -40,8 +40,7 @@
<el-button v-if="permissionList.sync" icon="el-icon-share" size="small" @click="PUSH">鍚� 姝�
</el-button>
<el-button v-if="permissionList.query" icon="el-icon-search" size="small"
- @click="openAdvancedQuery">鏌�
- 璇�
+ @click="openAdvancedQuery">鏌� 璇�
</el-button>
</template>
</avue-crud>
diff --git a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
index 4ffee46..18325bc 100644
--- a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
+++ b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -1,21 +1,22 @@
<template>
- <basic-container >
- <avue-crud v-model="form" :option="option" :data="data" ref="crud" @on-load="onLoad" @row-save="rowSave" @row-update="rowUpdate" @row-del="rowDel" :page.sync="page">
+ <basic-container>
+ <avue-crud ref="crud" v-model="form" :data="data" :option="option" :page.sync="page" @on-load="onLoad"
+ @row-save="rowSave" @row-update="rowUpdate" @row-del="rowDel">
<template slot="menu" slot-scope="{ row, index }">
<el-button
- type="text"
- size="small"
- icon="el-icon-edit"
v-if="permissionList.editBtn"
+ icon="el-icon-edit"
+ size="small"
+ type="text"
@click="handleEdit(row, index)"
>
缂栬緫
</el-button>
<el-button
- type="text"
- size="small"
- icon="el-icon-delete"
v-if="permissionList.delBtn"
+ icon="el-icon-delete"
+ size="small"
+ type="text"
@click="handleDel(row, index)"
>
鍒犻櫎
@@ -39,15 +40,16 @@
combination
} from "@/api/system/passwords";
import {mapGetters} from "vuex";
+
export default {
name: "passwords.vue",
data() {
return {
//鏈�灏忛暱搴︾粦瀹歷alue
- values:"",
+ values: "",
//鏈�澶ч暱搴︾粦瀹歷alue
- values1:"",
- form:{},
+ values1: "",
+ form: {},
page: {
pageSize: 10,
currentPage: 1,
@@ -56,22 +58,22 @@
data: [],
//娣诲姞瀛樻斁澶氶�夌殑鍙橀噺,鐢ㄤ簬涓嬫媺鑿滃崟鐨勭鐢ㄦ晥鏋滃拰蹇呭～绉嶇被鏄惁澶т簬缁勫悎鏂瑰紡鐒跺悗鎻愮ず鐢ㄦ埛閲嶆柊閫夋嫨
- checkboxlength:"",
+ checkboxlength: "",
//杩欎釜鏄笅鎷夎彍鍗曠殑鏁版嵁鍙橀噺
- selectlength:"",
+ selectlength: "",
//杩欎釜鏄敤浜庨槻姝hange鏃堕棿鍐掓场,鍑虹幇涓ゆ寮圭獥瀹氫箟鐨勫彉閲�
- checkboxlist:"",
+ checkboxlist: "",
//鐢ㄤ簬棣栨鐐瑰嚮缂栬緫锛屽垽鏂粍鍚堟柟寮忔槸鍚﹀皬浜庡繀濉绫荤殑鍙橀噺
- checkboxNumber:"",
- selectNumber:"",
+ checkboxNumber: "",
+ selectNumber: "",
//杩欎釜涔熸槸瀛樻斁澶氶�夌殑鍙橀噺,鏁堟灉涓�鏍�,鍙槸鐢ㄤ綔鍦ㄧ紪杈戞ā鍧�
- checkboxedit:"",
+ checkboxedit: "",
// 鐢ㄤ簬鍒ゆ柇鏄惁鏄紪杈�
- editFlag:false
+ editFlag: false
}
},
- computed:{
+ computed: {
...mapGetters(["permission"]),
permissionList() {
return {
@@ -89,246 +91,246 @@
editBtn: this.vaildData(this.permission.password.password_edit, false),
};
},
- option(){
- return{
- headerAlign: 'center',
- align: 'center',
- columnBtn:false,
- border: true,
- index: true,
- rowKey:'id',
- addBtn:this.permissionList.addBtn,
- editBtn:false,
- height:700,
- delBtn:false,
- refreshBtn:false,
- column: [
- {
- label: '绛栫暐鍚嶇О',
- prop: 'strategyName',
- align: 'left',
- span:24,
- labelWidth: "11%",
- rules: [{
- required: true,
- message: "璇疯緭鍏ョ瓥鐣ュ悕绉�",
- trigger: "blur"
- }]
- },
- {
- label: '瀵嗙爜鏈�灏忛暱搴�',
- prop: 'minPwdLen',
- span:12,
- labelWidth:"22%",
- rules: [{
- required: true,
- validator:(rule, value,callback)=>{
- this.values=value*1
- if(value == ""){
- callback(new Error('璇疯緭鍏ュ瘑鐮佹渶灏忛暱搴�'));
- }else if(/[^\d]/g.test(value)){
- callback(new Error('瀵嗙爜鏈�灏忛暱搴︾殑杈撳叆绫诲瀷鍙兘涓烘暟瀛楃被鍨�'));
- }else if(this.values >= this.values1 && this.values1 != 0){
- callback(new Error('瀵嗙爜鏈�灏忛暱搴︿笉鑳藉ぇ浜庡瘑鐮佹渶澶ч暱搴�'))
- }else {
- callback();
- }
- },
- trigger: 'blur'
- }]
- },
- {
- label: '瀵嗙爜鏈�澶ч暱搴�',
- prop: 'maxPwdLen',
- span:12,
- labelWidth:"25%",
- rules: [{
- required: true,
- validator:(rule, value,callback) =>{
- this.values1=value*1
- if(value == ""){
- callback(new Error('璇疯緭鍏ュ瘑鐮佹渶澶ч暱搴�'));
- }else if(this.values1 <= this.values){
- callback(new Error('瀵嗙爜鏈�澶ч暱搴︿笉鑳藉皬浜庡瘑鐮佹渶澶ч暱搴�'));
- }else if(/[^\d]/g.test(value)){
- callback(new Error('瀵嗙爜鏈�澶ч暱搴︾殑杈撳叆绫诲瀷鍙兘涓烘暟瀛楃被鍨�'));
- }else {
- callback();
- }
- },
- trigger: 'change'
- }]
- },
- {
- label: '缁勫悎鏂规硶',
- prop: 'combinationNames',
- labelWidth: 91,
- display:false,
-
- },
- {
- label: '缁勫悎鏂规硶',
- prop: 'combinationIds',
- type: "checkbox",
- span:12,
- labelWidth:"22%",
- id:5,
- hide:true,
- change: this.handleCheckboxChange,
- rules: [{
- required: true,
- message: "璇烽�夋嫨缁勫悎鏂规硶",
- trigger: "blur"
- }],
- dicUrl: '/api/ubcs-system/combination/select',
- dicMethod: 'get',
- props: {
- value: "ID",
- label: "NAME",
- },
- },
- {
- label: '蹇呭～绉嶇被',
- prop: 'requiredType',
- type: 'select',
- span:12,
- labelWidth:"25%",
- change:this.handleSelectChange,
- rules: [{
- required: true,
- message: "璇烽�夋嫨蹇呭～绉嶇被",
- trigger: "blur"
- }],
- dicData:[{
- label:'1绉�',
- value:1,
- disabled:false
- },
- {
- label:'2绉�',
- value:2,
- disabled:false
- },
- {
- label:'3绉�',
- value:3,
- disabled:false
- },
- {
- label:'4绉�',
- value:4,
- disabled:false
+ option() {
+ return {
+ headerAlign: 'center',
+ align: 'center',
+ columnBtn: false,
+ border: true,
+ index: true,
+ rowKey: 'id',
+ addBtn: this.permissionList.addBtn,
+ editBtn: false,
+ height: 700,
+ delBtn: false,
+ refreshBtn: false,
+ column: [
+ {
+ label: '绛栫暐鍚嶇О',
+ prop: 'strategyName',
+ align: 'left',
+ span: 24,
+ labelWidth: "11%",
+ rules: [{
+ required: true,
+ message: "璇疯緭鍏ョ瓥鐣ュ悕绉�",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '瀵嗙爜鏈�灏忛暱搴�',
+ prop: 'minPwdLen',
+ span: 12,
+ labelWidth: "22%",
+ rules: [{
+ required: true,
+ validator: (rule, value, callback) => {
+ this.values = value * 1
+ if (value == "") {
+ callback(new Error('璇疯緭鍏ュ瘑鐮佹渶灏忛暱搴�'));
+ } else if (/[^\d]/g.test(value)) {
+ callback(new Error('瀵嗙爜鏈�灏忛暱搴︾殑杈撳叆绫诲瀷鍙兘涓烘暟瀛楃被鍨�'));
+ } else if (this.values >= this.values1 && this.values1 != 0) {
+ callback(new Error('瀵嗙爜鏈�灏忛暱搴︿笉鑳藉ぇ浜庡瘑鐮佹渶澶ч暱搴�'))
+ } else {
+ callback();
}
- ]
+ },
+ trigger: 'blur'
+ }]
+ },
+ {
+ label: '瀵嗙爜鏈�澶ч暱搴�',
+ prop: 'maxPwdLen',
+ span: 12,
+ labelWidth: "25%",
+ rules: [{
+ required: true,
+ validator: (rule, value, callback) => {
+ this.values1 = value * 1
+ if (value == "") {
+ callback(new Error('璇疯緭鍏ュ瘑鐮佹渶澶ч暱搴�'));
+ } else if (this.values1 <= this.values) {
+ callback(new Error('瀵嗙爜鏈�澶ч暱搴︿笉鑳藉皬浜庡瘑鐮佹渶澶ч暱搴�'));
+ } else if (/[^\d]/g.test(value)) {
+ callback(new Error('瀵嗙爜鏈�澶ч暱搴︾殑杈撳叆绫诲瀷鍙兘涓烘暟瀛楃被鍨�'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'change'
+ }]
+ },
+ {
+ label: '缁勫悎鏂规硶',
+ prop: 'combinationNames',
+ labelWidth: 91,
+ display: false,
+ },
+ {
+ label: '缁勫悎鏂规硶',
+ prop: 'combinationIds',
+ type: "checkbox",
+ span: 12,
+ labelWidth: "22%",
+ id: 5,
+ hide: true,
+ change: this.handleCheckboxChange,
+ rules: [{
+ required: true,
+ message: "璇烽�夋嫨缁勫悎鏂规硶",
+ trigger: "blur"
+ }],
+ dicUrl: '/api/ubcs-system/combination/select',
+ dicMethod: 'get',
+ props: {
+ value: "ID",
+ label: "NAME",
},
- {
- label: '杩囨湡鏃堕棿(澶�)',
- prop:'expirationTime',
- span:12,
- labelWidth:"22%",
- rules: [{
- required: true,
- validator: (rule, value,callback) => {
- if(value == ""){
- callback(new Error('璇疯緭鍏ヨ繃鏈熸椂闂�'));
- }else if(/[^\d]/g.test(value)){
- callback(new Error('杩囨湡鏃堕棿鐨勮緭鍏ョ被鍨嬪彧鑳戒负鏁板瓧绫诲瀷'));
- }else {
- callback();
- }
- },
- trigger: 'blur'
- }]
+ },
+ {
+ label: '蹇呭～绉嶇被',
+ prop: 'requiredType',
+ type: 'select',
+ span: 12,
+ labelWidth: "25%",
+ change: this.handleSelectChange,
+ rules: [{
+ required: true,
+ message: "璇烽�夋嫨蹇呭～绉嶇被",
+ trigger: "blur"
+ }],
+ dicData: [{
+ label: '1绉�',
+ value: 1,
+ disabled: false
},
- {
- label: '鎻愰啋鏃堕棿(澶�)',
- prop:'reminderTime',
- span:12,
- labelWidth:"25%",
- rules: [{
- required: true,
- validator:(rule, value,callback) => {
- if(value == ""){
- callback(new Error('璇疯緭鍏ヨ繃鏈熸椂闂�'));
- }else if(/[^\d]/g.test(value)){
- callback(new Error('杩囨湡鏃堕棿鐨勮緭鍏ョ被鍨嬪彧鑳戒负鏁板瓧绫诲瀷'));
- }else {
- callback();
- }
- },
- trigger: 'blur'
- }]
- },
- {
- label: '閿佸畾娆℃暟(娆�)',
- prop:'lockingNum',
- span:12,
- labelWidth:"22%",
- rules: [{
- required: true,
- validator:(rule, value,callback) => {
- if(value == ""){
- callback(new Error('璇疯緭鍏ラ攣瀹氭鏁�'));
- }else if(/[^\d]/g.test(value)){
- callback(new Error('閿佸畾娆℃暟鐨勮緭鍏ョ被鍨嬪彧鑳戒负鏁板瓧绫诲瀷'));
- }else {
- callback();
- }
- },
- trigger: 'blur'
- }]
- },
- {
- label: '閿佸畾鏃堕棿(鍒嗛挓)',
- prop:'lockingTime',
- span:12,
- labelWidth:"25%",
- rules: [{
- required: true,
- validator:(rule, value,callback) => {
- if(value == ""){
- callback(new Error('璇疯緭鍏ラ攣瀹氭椂闂�'));
- }else if(/[^\d]/g.test(value)){
- callback(new Error('閿佸畾鏃堕棿鐨勮緭鍏ョ被鍨嬪彧鑳戒负鏁板瓧绫诲瀷'));
- }else {
- callback();
- }
- },
- trigger: 'blur'
- }]
- },
- {
- label: '鎻忚堪',
- prop:'desc',
- type: 'textarea',
- span:12,
- labelWidth:"22%",
- rows: 5,
- },
- {
- label: '鏄惁涓洪粯璁ょ瓥鐣�',
- prop: 'isDefault',
- type: 'switch',
- labelWidth: 132,
- dicData:[{
- label:'鍚�',
- value:0
- },{
- label:'鏄�',
- value:1
- }]
- }
- ],
+ {
+ label: '2绉�',
+ value: 2,
+ disabled: false
+ },
+ {
+ label: '3绉�',
+ value: 3,
+ disabled: false
+ },
+ {
+ label: '4绉�',
+ value: 4,
+ disabled: false
+ }
+ ]
+
+ },
+ {
+ label: '杩囨湡鏃堕棿(澶�)',
+ prop: 'expirationTime',
+ span: 12,
+ labelWidth: "22%",
+ rules: [{
+ required: true,
+ validator: (rule, value, callback) => {
+ if (value == "") {
+ callback(new Error('璇疯緭鍏ヨ繃鏈熸椂闂�'));
+ } else if (/[^\d]/g.test(value)) {
+ callback(new Error('杩囨湡鏃堕棿鐨勮緭鍏ョ被鍨嬪彧鑳戒负鏁板瓧绫诲瀷'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }]
+ },
+ {
+ label: '鎻愰啋鏃堕棿(澶�)',
+ prop: 'reminderTime',
+ span: 12,
+ labelWidth: "25%",
+ rules: [{
+ required: true,
+ validator: (rule, value, callback) => {
+ if (value == "") {
+ callback(new Error('璇疯緭鍏ヨ繃鏈熸椂闂�'));
+ } else if (/[^\d]/g.test(value)) {
+ callback(new Error('杩囨湡鏃堕棿鐨勮緭鍏ョ被鍨嬪彧鑳戒负鏁板瓧绫诲瀷'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }]
+ },
+ {
+ label: '閿佸畾娆℃暟(娆�)',
+ prop: 'lockingNum',
+ span: 12,
+ labelWidth: "22%",
+ rules: [{
+ required: true,
+ validator: (rule, value, callback) => {
+ if (value == "") {
+ callback(new Error('璇疯緭鍏ラ攣瀹氭鏁�'));
+ } else if (/[^\d]/g.test(value)) {
+ callback(new Error('閿佸畾娆℃暟鐨勮緭鍏ョ被鍨嬪彧鑳戒负鏁板瓧绫诲瀷'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }]
+ },
+ {
+ label: '閿佸畾鏃堕棿(鍒嗛挓)',
+ prop: 'lockingTime',
+ span: 12,
+ labelWidth: "25%",
+ rules: [{
+ required: true,
+ validator: (rule, value, callback) => {
+ if (value == "") {
+ callback(new Error('璇疯緭鍏ラ攣瀹氭椂闂�'));
+ } else if (/[^\d]/g.test(value)) {
+ callback(new Error('閿佸畾鏃堕棿鐨勮緭鍏ョ被鍨嬪彧鑳戒负鏁板瓧绫诲瀷'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }]
+ },
+ {
+ label: '鎻忚堪',
+ prop: 'desc',
+ type: 'textarea',
+ span: 12,
+ labelWidth: "22%",
+ rows: 5,
+ },
+ {
+ label: '鏄惁涓洪粯璁ょ瓥鐣�',
+ prop: 'isDefault',
+ type: 'switch',
+ labelWidth: 132,
+ dicData: [{
+ label: '鍚�',
+ value: 0
+ }, {
+ label: '鏄�',
+ value: 1
+ }]
+ }
+ ],
}
}
},
created() {
this.onLoad()
},
- methods:{
- handleSelectChange(val){
- this.selectlength=val
+ methods: {
+ handleSelectChange(val) {
+ this.selectlength = val
},
handleCheckboxChange(val) {
const arr = this.option.column[5];
@@ -398,7 +400,7 @@
showClose: true,
});
},
- rowDel(row){
+ rowDel(row) {
this.$confirm("纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -413,15 +415,15 @@
message: "鎿嶄綔鎴愬姛!"
});
this.onLoad();
- }).catch(res=>{
+ }).catch(res => {
// console.log(res)
})
},
- rowSave(row,done){
+ rowSave(row, done) {
//灏嗗瘑鐮佺粍鍚堟柟寮忕殑鏁版嵁杞崲涓哄瓧绗︿覆
- const spliceId= row.combinationIds.toString()
- row.combinationIds=spliceId
- getadd(row).then((res)=>{
+ const spliceId = row.combinationIds.toString()
+ row.combinationIds = spliceId
+ getadd(row).then((res) => {
// this.onLoad(this.page);
this.$message({
type: "success",
@@ -429,37 +431,37 @@
});
done(row)
this.onLoad()
- }).catch((res)=>{
+ }).catch((res) => {
this.$message.warning(res)
})
},
- rowEdit(row){
+ rowEdit(row) {
// console.log("鎵撳紑缂栬緫edit",row)
},
- handleDel(row){
- this.$refs.crud.rowDel(row,row.$index);
+ handleDel(row) {
+ this.$refs.crud.rowDel(row, row.$index);
},
- handleEdit(row){
- this.$refs.crud.rowEdit(row,row.$index);
- this.editFlag=true;
- this.checkboxNumber=row.combinationIds.split(",")
- this.selectNumber=row.requiredType
- if(this.checkboxNumber.length < this.selectNumber){
- this.$message({
- type:"warning",
- message:"蹇呭～绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�"
- })
- }
+ handleEdit(row) {
+ this.$refs.crud.rowEdit(row, row.$index);
+ this.editFlag = true;
+ this.checkboxNumber = row.combinationIds.split(",")
+ this.selectNumber = row.requiredType
+ if (this.checkboxNumber.length < this.selectNumber) {
+ this.$message({
+ type: "warning",
+ message: "蹇呭～绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�"
+ })
+ }
},
- rowUpdate(row,index,done){
- getupdata(row).then(()=>{
+ rowUpdate(row, index, done) {
+ getupdata(row).then(() => {
this.onLoad()
this.$message({
type: "success",
message: "淇敼鎴愬姛!"
});
done()
- }).catch(res=>{
+ }).catch(res => {
// console.log(res)
})
},
@@ -472,8 +474,8 @@
// this.loading = false;
// this.selectionClear();
// console.log(res)
- this.page.total=res.data.data.total
- this.data=res.data.data.records
+ this.page.total = res.data.data.total
+ this.data = res.data.data.records
});
}
}
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index bf872e5..cd5bbbe 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -15,41 +15,44 @@
<el-row>
<el-col :span="24">
<basic-container title="寰呭姙娴佺▼浠诲姟">
- <avue-crud ref="crud" :table-loading="loading" :data="todoData" :option="todoOption"
+ <avue-crud ref="crud" :data="todoData" :option="todoOption" :page.sync="page"
+ :table-loading="loading"
@on-load="onLoad"
- @cell-click="cellHandle"
- :page.sync="page">
+ @cell-click="cellHandle">
<template #menu="{size,row,index}">
- <el-button @click="gotodo(row,index)"
+ <el-button :size="size"
icon="el-icon-check"
type="text"
- :size="size">鎵ц</el-button>
+ @click="gotodo(row,index)">鎵ц
+ </el-button>
</template>
</avue-crud>
</basic-container>
</el-col>
-<!-- <el-col :span="8">-->
-<!-- <el-row>-->
-<!-- <basic-container title="娑堟伅鍒楄〃">-->
-<!-- <el-collapse v-model="logActiveNames" @change="handleChange">-->
-<!-- <el-collapse-item v-for="item in noticeData" :title="item.title" :name="item.id">-->
-<!-- <div>{{item.subtitle}}</div>-->
-<!-- </el-collapse-item>-->
-<!-- </el-collapse>-->
-<!-- </basic-container>-->
-<!-- </el-row>-->
+ <!-- <el-col :span="8">-->
+ <!-- <el-row>-->
+ <!-- <basic-container title="娑堟伅鍒楄〃">-->
+ <!-- <el-collapse v-model="logActiveNames" @change="handleChange">-->
+ <!-- <el-collapse-item v-for="item in noticeData" :title="item.title" :name="item.id">-->
+ <!-- <div>{{item.subtitle}}</div>-->
+ <!-- </el-collapse-item>-->
+ <!-- </el-collapse>-->
+ <!-- </basic-container>-->
+ <!-- </el-row>-->
-<!-- </el-col>-->
+ <!-- </el-col>-->
</el-row>
- <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" append-to-body :close-on-press-escape="false" :before-close="Xdelhandle">
- <el-form :model="form" :rules="rules" ref="form">
- <el-form-item label="鍘熷瘑鐮�" :label-width="formLabelWidth" prop="oldPassword">
+ <el-dialog :before-close="Xdelhandle" :close-on-press-escape="false" :visible.sync="dialogFormVisible"
+ append-to-body
+ title="淇敼瀵嗙爜">
+ <el-form ref="form" :model="form" :rules="rules">
+ <el-form-item :label-width="formLabelWidth" label="鍘熷瘑鐮�" prop="oldPassword">
<el-input v-model="form.oldPassword" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item label="鏂板瘑鐮�" :label-width="formLabelWidth" prop="newPassword">
+ <el-form-item :label-width="formLabelWidth" label="鏂板瘑鐮�" prop="newPassword">
<el-input v-model="form.newPassword" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item label="纭瀵嗙爜" :label-width="formLabelWidth" prop="newPassword1">
+ <el-form-item :label-width="formLabelWidth" label="纭瀵嗙爜" prop="newPassword1">
<el-input v-model="form.newPassword1" autocomplete="off"></el-input>
</el-form-item>
</el-form>
@@ -62,229 +65,229 @@
</template>
<script>
- import {mapGetters} from "vuex";
- import {check,updatePassword} from "@/api/system/user"
- import md5 from "js-md5";
- import {removeToken} from "@/util/auth";
- import Statistic from './Statistic.vue';
- import {validatenull} from "@/util/validate";
- import {flowCategory,flowRoute} from "@/util/flow";
- import {todoList} from "@/api/work/work";
+import {mapGetters} from "vuex";
+import {check, updatePassword} from "@/api/system/user"
+import md5 from "js-md5";
+import {removeToken} from "@/util/auth";
+import Statistic from './Statistic.vue';
+import {validatenull} from "@/util/validate";
+import {flowCategory, flowRoute} from "@/util/flow";
+import {todoList} from "@/api/work/work";
- export default {
- name: "wel",
- components: {Statistic},
- data() {
- return {
- loading: false,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
+export default {
+ name: "wel",
+ components: {Statistic},
+ data() {
+ return {
+ loading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ // 浠ｅ姙娴佺▼浠诲姟data
+ todoData: [],
+ // 浠ｅ姙娴佺▼浠诲姟option
+ todoOption: {
+ height: 500,
+ addBtn: false,
+ header: false,
+ align: 'center',
+ index: true,
+ menuWidth: 80,
+ editBtn: false,
+ delBtn: false,
+ border: true,
+ column: [{
+ label: '浠诲姟鍚嶇О',
+ prop: 'taskName',
+ sortable: true,
+ headerAlign: 'center',
+ align: 'left',
+ html: true,
+ width: 300,
+ overHidden: true,
+ formatter: (val) => {
+ return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName + '-' + val.taskName + '</a>'
+ }
},
- // 浠ｅ姙娴佺▼浠诲姟data
- todoData: [],
- // 浠ｅ姙娴佺▼浠诲姟option
- todoOption: {
- height:500,
- addBtn: false,
- header: false,
- align: 'center',
- index: true,
- menuWidth: 80,
- editBtn: false,
- delBtn: false,
- border:true,
- column: [{
- label: '浠诲姟鍚嶇О',
- prop: 'taskName',
- sortable:true,
- headerAlign:'center',
- align:'left',
- html: true,
- width:300,
- overHidden:true,
+ {
+ label: '涓婁竴姝ュ鐞嗘椂闂�',
+ sortable: true,
+ width: 150,
+ prop: 'createTime'
+ },
+ {
+ label: '涓婁竴姝ユ搷浣滀汉',
+ sortable: true,
+ width: 120,
+ prop: 'historyActivityAssigneName'
+ },
+ {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ overHidden: true,
formatter: (val) => {
- return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
+ return val.variables.processDesc
}
},
- {
- label: '涓婁竴姝ュ鐞嗘椂闂�',
- sortable:true,
- width:150,
- prop: 'createTime'
- },
- {
- label: '涓婁竴姝ユ搷浣滀汉',
- sortable:true,
- width:120,
- prop: 'historyActivityAssigneName'
- },
- {
- label: '娴佺▼鎻忚堪',
- prop: 'processDesc',
- overHidden:true,
- formatter: (val) => {
- return val.variables.processDesc
- }
- },
- {
- label: '鎵�灞炴祦绋嬫ā鏉�',
- sortable:true,
- overHidden:true,
- prop: 'categoryName'
- }
- ]
- },
- noticeData: [{
- img: '/img/bg/vip1.png',
- title: '鍙茶拏澶蜂箶甯冩柉 鍏虫敞浜嗕綘',
- subtitle: '05-08 15:08',
- tag: '宸茬粡寮�濮�',
- status: 0
- }, {
- img: '/img/bg/vip2.png',
- title: '鏂拏澶锋矁鍏瑰凹浜氬厠 鍏虫敞浜嗕綘',
- subtitle: '05-08 15:08',
- tag: '鏈紑濮�',
- status: 1
- }, {
- img: '/img/bg/vip3.png',
- title: '钂傚路搴撳厠 鍏虫敞浜嗕綘',
- subtitle: '05-08 15:08',
- status: 3,
- tag: '鏈夐敊璇�'
- }, {
- img: '/img/bg/vip4.png',
- title: '姣斿皵路璐瑰皵鍗楀痉鏂� 鍏虫敞浜嗕綘',
- subtitle: '05-08 15:08',
- status: 4,
- tag: '宸插畬鎴�'
- }],
- logActiveNames: ['28'],
- userarr: [],
- userid: '',
- updataArr: [],
- dialogFormVisible: false,
- form: {
- oldPassword: '',
- newPassword: '',
- newPassword1: '',
- },
- rules: {
- oldPassword: [
- {required: true, message: '璇疯緭鍏ュ師瀵嗙爜', trigger: 'blur'}
- ],
- newPassword: [
- {required: true, message: '璇疯緭鍏ユ柊瀵嗙爜', trigger: 'blur'}
- ],
- newPassword1: [
- {required: true, message: '璇疯緭纭瀵嗙爜', trigger: 'blur'}
- ]
- },
- };
+ {
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable: true,
+ overHidden: true,
+ prop: 'categoryName'
+ }
+ ]
+ },
+ noticeData: [{
+ img: '/img/bg/vip1.png',
+ title: '鍙茶拏澶蜂箶甯冩柉 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ tag: '宸茬粡寮�濮�',
+ status: 0
+ }, {
+ img: '/img/bg/vip2.png',
+ title: '鏂拏澶锋矁鍏瑰凹浜氬厠 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ tag: '鏈紑濮�',
+ status: 1
+ }, {
+ img: '/img/bg/vip3.png',
+ title: '钂傚路搴撳厠 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ status: 3,
+ tag: '鏈夐敊璇�'
+ }, {
+ img: '/img/bg/vip4.png',
+ title: '姣斿皵路璐瑰皵鍗楀痉鏂� 鍏虫敞浜嗕綘',
+ subtitle: '05-08 15:08',
+ status: 4,
+ tag: '宸插畬鎴�'
+ }],
+ logActiveNames: ['28'],
+ userarr: [],
+ userid: '',
+ updataArr: [],
+ dialogFormVisible: false,
+ form: {
+ oldPassword: '',
+ newPassword: '',
+ newPassword1: '',
+ },
+ rules: {
+ oldPassword: [
+ {required: true, message: '璇疯緭鍏ュ師瀵嗙爜', trigger: 'blur'}
+ ],
+ newPassword: [
+ {required: true, message: '璇疯緭鍏ユ柊瀵嗙爜', trigger: 'blur'}
+ ],
+ newPassword1: [
+ {required: true, message: '璇疯緭纭瀵嗙爜', trigger: 'blur'}
+ ]
+ },
+ };
+ },
+ // 鎷垮埌userid璇锋眰鎺ュ彛
+ created() {
+ this.updataArr = JSON.parse(localStorage.getItem("updataid"))
+ this.userid = this.$store.state.user.upadatastatus.user_id
+ const pageFlag = localStorage.getItem("pageFlag")
+ if (pageFlag === null) {
+ this.checkhandle()
+ localStorage.setItem("pageFlag", true)
+ }
+ },
+ computed: {
+ ...mapGetters(["userInfo", "flowRoutes"]),
+ },
+ methods: {
+ handleChange(val) {
+ window.console.log(val);
},
- // 鎷垮埌userid璇锋眰鎺ュ彛
- created() {
- this.updataArr = JSON.parse(localStorage.getItem("updataid"))
- this.userid = this.$store.state.user.upadatastatus.user_id
- const pageFlag = localStorage.getItem("pageFlag")
- if (pageFlag === null) {
+ Xdelhandle() {
+ removeToken()
+ this.dialogFormVisible = false
+ },
+ // 鍏抽棴寮圭獥鍚庢竻闄oken杩斿洖鍒扮櫥褰曢〉闈�
+ delhandle() {
+ removeToken()
+ this.dialogFormVisible = false
+ },
+ // 淇敼瀵嗙爜鏂规硶
+ addok() {
+ this.dialogFormVisible = false
+ updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res => {
+ if (res.data.code == 200) {
+ this.$message({
+ type: "success",
+ message: "淇敼鎴愬姛锛�"
+ })
+ }
+ }).catch(res => {
+ console.log(res)
this.checkhandle()
- localStorage.setItem("pageFlag", true)
- }
+ })
},
- computed: {
- ...mapGetters(["userInfo", "flowRoutes"]),
- },
- methods: {
- handleChange(val) {
- window.console.log(val);
- },
- Xdelhandle() {
- removeToken()
- this.dialogFormVisible = false
- },
- // 鍏抽棴寮圭獥鍚庢竻闄oken杩斿洖鍒扮櫥褰曢〉闈�
- delhandle() {
- removeToken()
- this.dialogFormVisible = false
- },
- // 淇敼瀵嗙爜鏂规硶
- addok() {
- this.dialogFormVisible = false
- updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res => {
- if (res.data.code == 200) {
+ // 鎻愰啋鏃堕棿璇锋眰锛屼篃闇�瑕佸垽鏂槸鍚︿负瓒呯韬唤锛岃秴绠¤韩浠戒笉鍒ゆ柇
+ checkhandle() {
+ if (this.updataArr.user_id != '0' && this.updataArr.tenant_id !== '000000') {
+ check(this.userid).then(res => {
+ if (res.data.data > 0) {
this.$message({
- type: "success",
- message: "淇敼鎴愬姛锛�"
+ type: 'warning',
+ message: `浣犺繕鏈�${res.data.data}澶╁氨瑕佷慨鏀瑰瘑鐮佷簡`
})
+ } else if (res.data.data == -1) {
+ this.$message({
+ type: "warning",
+ message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
+ })
+ setTimeout(() => {
+ this.dialogFormVisible = true
+ }, 1500)
+ } else if (res.data.data == 0) {
+ // this.$message({
+ // type: 'success',
+ // message: "鎿嶄綔鎴愬姛"
+ // })
}
}).catch(res => {
console.log(res)
- this.checkhandle()
})
- },
- // 鎻愰啋鏃堕棿璇锋眰锛屼篃闇�瑕佸垽鏂槸鍚︿负瓒呯韬唤锛岃秴绠¤韩浠戒笉鍒ゆ柇
- checkhandle() {
- if (this.updataArr.user_id != '0' && this.updataArr.tenant_id !== '000000') {
- check(this.userid).then(res => {
- if (res.data.data > 0) {
- this.$message({
- type: 'warning',
- message: `浣犺繕鏈�${res.data.data}澶╁氨瑕佷慨鏀瑰瘑鐮佷簡`
- })
- } else if (res.data.data == -1) {
- this.$message({
- type: "warning",
- message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
- })
- setTimeout(() => {
- this.dialogFormVisible = true
- }, 1500)
- } else if (res.data.data == 0) {
- // this.$message({
- // type: 'success',
- // message: "鎿嶄綔鎴愬姛"
- // })
- }
- }).catch(res => {
- console.log(res)
- })
- }
- },
- onLoad(page, params = {}) {
- this.loading = true;
- const query = {
- ...this.query,
- category: (params.category) ? flowCategory(params.category) : null
- };
- todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.todoData = data.records;
- this.loading = false;
- }).catch(error => {
- this.$message.error(error);
- this.loading = false;
- })
- },
- cellHandle(row, column, cell, event) {
- if (column.property == 'taskName') {
- this.gotodo(row)
- }
- },
- gotodo(row, index) {
- this.$router.push({ path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}` });
}
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ const query = {
+ ...this.query,
+ category: (params.category) ? flowCategory(params.category) : null
+ };
+ todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.todoData = data.records;
+ this.loading = false;
+ }).catch(error => {
+ this.$message.error(error);
+ this.loading = false;
+ })
+ },
+ cellHandle(row, column, cell, event) {
+ if (column.property == 'taskName') {
+ this.gotodo(row)
+ }
+ },
+ gotodo(row, index) {
+ this.$router.push({path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`});
}
- };
+ }
+};
</script>
<style>
- .el-font-size {
- font-size: 14px;
- }
+.el-font-size {
+ font-size: 14px;
+}
</style>
--
Gitblit v1.9.3