wulin/wl_management_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into version_equipment_20200901

Browse Source
This commit is contained in:
wulin 2020-09-15 19:40:42 +08:00
commit d8fc25165c
4 changed files with 9 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/router/index.js
View File

@ -9,9 +9,9 @@ import Router from 'vue-router'
import { apiGetMenuNav } from '@/api/api_menu'
import { isURL } from '@/utils/validate'
import {clearLoginInfo} from '@/utils'
import VConsole from 'vconsole'
//import VConsole from 'vconsole'
let vConsole = new VConsole()
//let vConsole = new VConsole()
Vue.use(Router)
// 开发环境不使用懒加载, 因为懒加载页面太多的话会造成webpack热更新太慢, 所以只有生产环境使用懒加载

4
src/views/common/login.vue
View File

@ -35,7 +35,7 @@
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="captcha">
<el-form-item prop="captcha">
<el-row :gutter="20">
<el-col :span="14">
<el-input v-model="dataForm.verify" placeholder="验证码">
@ -46,7 +46,7 @@
<el-button v-else type="primary">重新发送({{time}}S)</el-button>
</el-col>
</el-row>
</el-form-item>-->
</el-form-item>
<el-form-item>
<el-button
class="login-btn-submit"

56
src/views/modules/result/record/recorddetail-add-or-update.vue
View File

@ -12,13 +12,13 @@
<div id="keyResultEditorElem" class="editor"></div>
</el-form-item>
<el-form-item label="3.5-考核标准" v-show="auth.keyResult35 >= 1 && this.type ===1 " prop="keyResult35">
<!-- <el-form-item label="3.5-考核标准" v-show="auth.keyResult35 >= 1 && this.type ===1 " prop="keyResult35">
<div id="keyResultEditorElem3_5" class="editor"></div>
</el-form-item>
<el-form-item label="3.75-考核标准" v-show="auth.keyResult37 >= 1 && this.type ===1" prop="keyResult37">
<div id="keyResultEditorElem3_7" class="editor"></div>
</el-form-item>
</el-form-item>-->
<el-form-item v-show="auth.checkWeight>=1" label="考核权重" prop="checkWeight">
<el-input v-model="dataForm.checkWeight" :disabled="auth.checkWeight<2" placeholder="考核权重"></el-input>
@ -112,8 +112,6 @@ export default {
checkResultEditor: null,
recordResultId: null,
scoreCommentEditor: null,
keyResultEditorElem3_5: null,
keyResultEditorElem3_7: null,
auth: [],
recordType: 0,
type: 0,
@ -209,12 +207,6 @@ export default {
this.scoreCommentEditor.txt.html('')
}
if (this.keyResultEditorElem3_5 !== null) {
this.keyResultEditorElem3_5.txt.html('<p>无</p>')
}
if (this.keyResultEditorElem3_7 !== null) {
this.keyResultEditorElem3_7.txt.html('<p>无</p>')
}
this.visible = true
this.$nextTick(async () => {
this.$refs['dataForm'].resetFields()
@ -251,28 +243,6 @@ export default {
this.scoreCommentEditor.$textElem.attr('contenteditable', false)
}
}
if (this.keyResultEditorElem3_5 === null) {
this.keyResultEditorElem3_5 = new E('#keyResultEditorElem3_5')
this.keyResultEditorElem3_5.customConfig.uploadImgServer = '/uploadPicture'
this.keyResultEditorElem3_5.customConfig.uploadFileName = 'file'
this.keyResultEditorElem3_5.customConfig.uploadImgParams = ''
this.keyResultEditorElem3_5.customConfig.debug = true
this.keyResultEditorElem3_5.create()
if (this.auth.keyResult35 < 2) {
this.keyResultEditorElem3_5.$textElem.attr('contenteditable', false)
}
}
if (this.keyResultEditorElem3_7 === null) {
this.keyResultEditorElem3_7 = new E('#keyResultEditorElem3_7')
this.keyResultEditorElem3_7.customConfig.uploadImgServer = '/uploadPicture'
this.keyResultEditorElem3_7.customConfig.uploadFileName = 'file'
this.keyResultEditorElem3_7.customConfig.uploadImgParams = ''
this.keyResultEditorElem3_7.customConfig.debug = true
this.keyResultEditorElem3_7.create()
if (this.auth.keyResult37 < 2) {
this.keyResultEditorElem3_7.$textElem.attr('contenteditable', false)
}
}
if (this.dataForm.id && this.dataForm.id > 0) {
const data = await apiDetailInfo(this.dataForm.id)
@ -295,13 +265,6 @@ export default {
this.keyResultEditorElem3_5.txt.html('<p>无</p>')
}
}
if (this.keyResultEditorElem3_7 !== null) {
if (this.dataForm.keyResult37 !== null) {
this.keyResultEditorElem3_7.txt.html(this.dataForm.keyResult37 || '')
} else {
this.keyResultEditorElem3_7.txt.html('<p>无</p>')
}
}
}
}
})
@ -338,18 +301,7 @@ export default {
return
}
}
if (this.auth.keyResult35 === 2 && this.type === 1) {
if (this.stringIsNull(this.keyResultEditorElem3_5.txt.html())) {
this.alertInfo('3.5考核标准不能为空')
return
}
}
if (this.auth.keyResult37 === 2 && this.type === 1) {
if (this.stringIsNull(this.keyResultEditorElem3_7.txt.html())) {
this.alertInfo('3.7考核标准不能为空')
return
}
}
if (this.auth.checkWeight === 2) {
if (this.stringIsNull(this.dataForm.checkWeight)) {
this.alertInfo('权重不能为空')
@ -406,8 +358,6 @@ export default {
'type': this.type,
'target': this.dataForm.target,
'keyResult': Base64.encode(this.keyResultEditor.txt.html()),
'keyResult35': Base64.encode(this.keyResultEditorElem3_5.txt.html()),
'keyResult37': Base64.encode(this.keyResultEditorElem3_7.txt.html()),
'checkWeight': this.dataForm.checkWeight,
'checkResult': Base64.encode(this.checkResultEditor.txt.html()),
'superScore': superScore1,

4
src/views/modules/result/record/recorddetail.vue
View File

@ -81,7 +81,7 @@
</template>
</el-table-column>
<!--
<el-table-column label="3.5-考核标准" prop="keyResult35" align="left" width="280">
<template slot-scope="scope" >
<div v-html="scope.row.keyResult35" class="rich">
@ -94,7 +94,7 @@
<div v-html="scope.row.keyResult37" class="rich">
</div>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column label="考核权重" prop="checkWeight" align="center" >
<template slot-scope="scope">