From d24bcf3129d14a8bfd5866b15a0383895f9424f8 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Mon, 16 Aug 2021 18:21:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E5=88=86=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/quill/index.vue | 20 +++++++++++++++-----
src/pages/project/add/index.vue | 19 +++++++++++++++----
src/pages/project/list/index.vue | 2 ++
src/setting.js | 1 +
src/store/modules/user.js | 1 +
5 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/components/quill/index.vue b/src/components/quill/index.vue
index f4d2118..e6964c2 100644
--- a/src/components/quill/index.vue
+++ b/src/components/quill/index.vue
@@ -24,21 +24,24 @@
},
readonly: {
type: Boolean,
- default: false
+ default:false
},
toTop: {
type: Boolean,
- default: true
+ default:true
},
border: {
type: Boolean,
- default: false
+ default:false
},
height: {
type: Number
},
minHeight: {
type: Number
+ },
+ elseRead:{
+ type:String,default:'false'
}
},
data () {
@@ -65,7 +68,7 @@
}
},
placeholder: '',
- readOnly: this.readonly
+ readOnly: true
},
loading: false
}
@@ -87,7 +90,8 @@
style.height = `${this.height}px`;
}
return style;
- }
+ },
+
},
watch: {
value: {
@@ -102,6 +106,12 @@
immediate: true
}
},
+ created(){
+ console.log(this.elseRead,'elseRead');
+ console.log(this.readonly,'readonly');
+
+ console.log(this.value,'value');
+ },
mounted () {
this.init();
},
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index a509e3f..b0c777d 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -109,7 +109,7 @@
-
+
@@ -275,13 +275,13 @@ import quill from '@/components/quill'
export default {
data (){
return {
- host: Setting.host,
+ host: Setting.apiBaseURL,
isHh: Setting.isHh,
id: this.$route.query.id,
systemList: Setting.systemList,
token: btoa(util.local.get(Setting.tokenKey)),
userIdEd: this.userId,
- systemId: this.lastSystemId,
+ systemId: this.$store.state.project.lastSystemId,
isDetail: Boolean(this.$route.query.show),
roleIdEd: this.roleId,
newroleArray: [],
@@ -399,13 +399,18 @@ export default {
components: {
quill
},
+ created(){
+ console.log(this.systemId,'this.systemId',this.lastSystemId);
+ },
computed: {
...mapState('user', [
'userId','roleId'
]),
+
...mapState('project', [
- 'projectFields'
+ 'projectFields','lastSystemId'
]),
+
handDistributionScore: function() {
//计算判分点分值，超出100提示，
let score = 0;
@@ -569,6 +574,7 @@ export default {
this.setSystemId(this.systemId)
}).catch(() => {
this.systemId = this.lastSystemId
+ console.log(this.lastSystemId,'this.lastSystemId');
})
}
},
@@ -660,6 +666,7 @@ export default {
//判断页面是否有没有输入的内容
return;
}
+ console.log(this.systemId,'this.systemId---670');
this.setSystemId(this.systemId)
if (this.id != null) {
let url = this.api.updateProjectManagement
@@ -743,6 +750,8 @@ export default {
//判断页面是否有没有输入的内容
return;
}
+ console.log(this.systemId,'this.systemId---755');
+
this.setSystemId(this.systemId)
if (this.id != null) {
let url = this.api.updateProjectManagement
@@ -1018,11 +1027,13 @@ export default {
this.flag02 && (data.flag02 = this.flag02)
this.projectNameRepeat && (data.projectNameRepeat = this.projectNameRepeat)
this.isToPoint = true
+ console.log(data,'取得数据查看');
this.setProject(data)
},
toJudgePoint(row){
let host = this.host
let systemId = this.systemId
+ console.log(this.systemId,'sys');
this.handleCacheData()
let href = ''
if(row){
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index 8e92080..aaffeaa 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -203,6 +203,7 @@ export default {
},
mounted() {
this.systemId = this.lastSystemId ? this.lastSystemId : Setting.systemId
+ console.log(this.systemId,'外面的sysid');
this.getData()
},
methods: {
@@ -253,6 +254,7 @@ export default {
this.$router.push('add')
},
edit(row){
+ console.log(row,'编辑触发');
this.setSystemId(row.systemId)
this.$router.push(`add?id=${row.projectId}`)
},
diff --git a/src/setting.js b/src/setting.js
index 73916d7..999e5dc 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -8,6 +8,7 @@ const isHh = url.includes('10.196.131.73') //是否是河海版本
const isBeta = isDev || url.includes('120.78.198.231') //是否是职站测试(本地亦调用测试服接口)
const Setting = {
+
/**
* 基础配置
* */
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c1382b1..68fb2b0 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -48,6 +48,7 @@ export default {
res.message.listValue && Setting.dynamicRoute && addRoutes(res.message.listValue)
util.local.set(Setting.tokenKey,data.token,Setting.tokenExpires)
util.successMsg('登录成功')
+ console.log(data,'登录保存的数据');
commit('SET_INFO',data)
resolve()
}else{