dev_2022-05-11
e 3 years ago
parent fc80c438cf
commit d24bcf3129
  1. 20
      src/components/quill/index.vue
  2. 19
      src/pages/project/add/index.vue
  3. 2
      src/pages/project/list/index.vue
  4. 1
      src/setting.js
  5. 1
      src/store/modules/user.js

@ -24,21 +24,24 @@
}, },
readonly: { readonly: {
type: Boolean, type: Boolean,
default: false default:false
}, },
toTop: { toTop: {
type: Boolean, type: Boolean,
default: true default:true
}, },
border: { border: {
type: Boolean, type: Boolean,
default: false default:false
}, },
height: { height: {
type: Number type: Number
}, },
minHeight: { minHeight: {
type: Number type: Number
},
elseRead:{
type:String,default:'false'
} }
}, },
data () { data () {
@ -65,7 +68,7 @@
} }
}, },
placeholder: '', placeholder: '',
readOnly: this.readonly readOnly: true
}, },
loading: false loading: false
} }
@ -87,7 +90,8 @@
style.height = `${this.height}px`; style.height = `${this.height}px`;
} }
return style; return style;
} },
}, },
watch: { watch: {
value: { value: {
@ -102,6 +106,12 @@
immediate: true immediate: true
} }
}, },
created(){
console.log(this.elseRead,'elseRead');
console.log(this.readonly,'readonly');
console.log(this.value,'value');
},
mounted () { mounted () {
this.init(); this.init();
}, },

@ -109,7 +109,7 @@
</el-table-column> </el-table-column>
<el-table-column label="实验要求" align="center"> <el-table-column label="实验要求" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<quill :border="true" :readonly="true" v-model="scope.row.experimentalRequirements" :minHeight="150" :height="150" /> <quill :border="true" :readonly="true" elseRead="true" v-model="scope.row.experimentalRequirements" :minHeight="150" :height="150" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="140" align="center"> <el-table-column label="操作" width="140" align="center">
@ -275,13 +275,13 @@ import quill from '@/components/quill'
export default { export default {
data (){ data (){
return { return {
host: Setting.host, host: Setting.apiBaseURL,
isHh: Setting.isHh, isHh: Setting.isHh,
id: this.$route.query.id, id: this.$route.query.id,
systemList: Setting.systemList, systemList: Setting.systemList,
token: btoa(util.local.get(Setting.tokenKey)), token: btoa(util.local.get(Setting.tokenKey)),
userIdEd: this.userId, userIdEd: this.userId,
systemId: this.lastSystemId, systemId: this.$store.state.project.lastSystemId,
isDetail: Boolean(this.$route.query.show), isDetail: Boolean(this.$route.query.show),
roleIdEd: this.roleId, roleIdEd: this.roleId,
newroleArray: [], newroleArray: [],
@ -399,13 +399,18 @@ export default {
components: { components: {
quill quill
}, },
created(){
console.log(this.systemId,'this.systemId',this.lastSystemId);
},
computed: { computed: {
...mapState('user', [ ...mapState('user', [
'userId','roleId' 'userId','roleId'
]), ]),
...mapState('project', [ ...mapState('project', [
'projectFields' 'projectFields','lastSystemId'
]), ]),
handDistributionScore: function() { handDistributionScore: function() {
//100 //100
let score = 0; let score = 0;
@ -569,6 +574,7 @@ export default {
this.setSystemId(this.systemId) this.setSystemId(this.systemId)
}).catch(() => { }).catch(() => {
this.systemId = this.lastSystemId this.systemId = this.lastSystemId
console.log(this.lastSystemId,'this.lastSystemId');
}) })
} }
}, },
@ -660,6 +666,7 @@ export default {
// //
return; return;
} }
console.log(this.systemId,'this.systemId---670');
this.setSystemId(this.systemId) this.setSystemId(this.systemId)
if (this.id != null) { if (this.id != null) {
let url = this.api.updateProjectManagement let url = this.api.updateProjectManagement
@ -743,6 +750,8 @@ export default {
// //
return; return;
} }
console.log(this.systemId,'this.systemId---755');
this.setSystemId(this.systemId) this.setSystemId(this.systemId)
if (this.id != null) { if (this.id != null) {
let url = this.api.updateProjectManagement let url = this.api.updateProjectManagement
@ -1018,11 +1027,13 @@ export default {
this.flag02 && (data.flag02 = this.flag02) this.flag02 && (data.flag02 = this.flag02)
this.projectNameRepeat && (data.projectNameRepeat = this.projectNameRepeat) this.projectNameRepeat && (data.projectNameRepeat = this.projectNameRepeat)
this.isToPoint = true this.isToPoint = true
console.log(data,'取得数据查看');
this.setProject(data) this.setProject(data)
}, },
toJudgePoint(row){ toJudgePoint(row){
let host = this.host let host = this.host
let systemId = this.systemId let systemId = this.systemId
console.log(this.systemId,'sys');
this.handleCacheData() this.handleCacheData()
let href = '' let href = ''
if(row){ if(row){

@ -203,6 +203,7 @@ export default {
}, },
mounted() { mounted() {
this.systemId = this.lastSystemId ? this.lastSystemId : Setting.systemId this.systemId = this.lastSystemId ? this.lastSystemId : Setting.systemId
console.log(this.systemId,'外面的sysid');
this.getData() this.getData()
}, },
methods: { methods: {
@ -253,6 +254,7 @@ export default {
this.$router.push('add') this.$router.push('add')
}, },
edit(row){ edit(row){
console.log(row,'编辑触发');
this.setSystemId(row.systemId) this.setSystemId(row.systemId)
this.$router.push(`add?id=${row.projectId}`) this.$router.push(`add?id=${row.projectId}`)
}, },

@ -8,6 +8,7 @@ const isHh = url.includes('10.196.131.73') //是否是河海版本
const isBeta = isDev || url.includes('120.78.198.231') //是否是职站测试(本地亦调用测试服接口) const isBeta = isDev || url.includes('120.78.198.231') //是否是职站测试(本地亦调用测试服接口)
const Setting = { const Setting = {
/** /**
* 基础配置 * 基础配置
* */ * */

@ -48,6 +48,7 @@ export default {
res.message.listValue && Setting.dynamicRoute && addRoutes(res.message.listValue) res.message.listValue && Setting.dynamicRoute && addRoutes(res.message.listValue)
util.local.set(Setting.tokenKey,data.token,Setting.tokenExpires) util.local.set(Setting.tokenKey,data.token,Setting.tokenExpires)
util.successMsg('登录成功') util.successMsg('登录成功')
console.log(data,'登录保存的数据');
commit('SET_INFO',data) commit('SET_INFO',data)
resolve() resolve()
}else{ }else{

Loading…
Cancel
Save