Skip to content

T
tl_estate
Commit cfc44b2a authored by agping's avatar agping
Browse files
Options

Merge branch 'liu-9-27' into v0929-3.4.0

parents f615411e 8cf13de3
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 11 deletions
.project
View file @ cfc44b2a
...@@ -75,5 +75,14 @@ ...@@ -75,5 +75,14 @@
<arguments>1.0-name-matches-false-false-node_modules</arguments> <arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher> </matcher>
</filter> </filter>
<filter>
<id>1569658174595</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources> </filteredResources>
</projectDescription> </projectDescription>
public/appnew/src/components/eval/eval_function.vue
View file @ cfc44b2a
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
</header> </header>
<div style="margin-top:1.2rem;" id="capture"> <div style="margin-top:1.2rem;" id="capture">
<div class="header_seat"></div> <div class="header_seat"></div>
<div class="overflow"> <div class="overflow">
<div class="title_dark"> <div class="title_dark">
{{name}} {{name}}
...@@ -19,12 +20,17 @@ ...@@ -19,12 +20,17 @@
<div class="star_ten" > <div class="star_ten" >
<span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">简述亏损主要原因</span> <span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">简述亏损主要原因</span>
</div> </div>
<div> <div >
<textarea class="detail" placeholder="点击填写" style="height:100px;" @input="autoTextarea($event,100)" v-model="lost"></textarea> <textarea class="detail detail-divL" placeholder="点击填写" style="height:100px;" @input="autoTextarea($event,100)" v-model="lost"></textarea>
</div> </div>
<!--可编辑div-->
<div class="detail-div" contenteditable="true" v-show="false">{{lost}}</div>
</div> </div>
</div> </div>
<div class="overflow"> <div class="overflow">
<div class="forDiv" v-for="obj,index in details"> <div class="forDiv" v-for="obj,index in details">
<div class="title_span"> <div class="title_span">
{{index+1}}.{{obj.title}} {{index+1}}.{{obj.title}}
...@@ -35,16 +41,32 @@ ...@@ -35,16 +41,32 @@
</div> </div>
<img :src="index1 < obj.scall ? starOn : starOff" style="width:.56rem;height:.56rem;margin-top:.1rem;margin-left;" v-for="item,index1 in stars" @click="changeStar(stars,index1,index)"> <img :src="index1 < obj.scall ? starOn : starOff" style="width:.56rem;height:.56rem;margin-top:.1rem;margin-left;" v-for="item,index1 in stars" @click="changeStar(stars,index1,index)">
</div> </div>
<div v-show="!obj.isscall" style="margin-top:.2rem;" > <div v-show="!obj.isscall" style="margin-top:.2rem;" >
<textarea class="detail" placeholder="点击填写" style="height:100px" v-model="obj.goHigh" @input="autoTextarea($event,100)" ></textarea> <textarea class="detail detail-divL" placeholder="点击填写" style="height:100px" v-model="obj.goHigh" @input="autoTextarea($event,100)" ></textarea>
<!--可编辑的div-->
<div class="detail-div" contenteditable="true" v-show="false">{{obj.goHigh}}</div>
</div> </div>
<div class="star_ten" v-show="obj.reason"> <div class="star_ten" v-show="obj.reason">
<span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">{{obj.title1}}：</span> <span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">{{obj.title1}}：</span>
</div> </div>
<div v-show="obj.reason"> <div v-show="obj.reason">
<textarea class="detail" :placeholder="obj.placeH ? obj.placeH : '点击填写'" :style="obj.placeH ?{'height':'300px'}:{}" v-model="obj.goHigh" @input="autoTextarea($event,300)"></textarea> <textarea class="detail detail-divL" :placeholder="obj.placeH ? obj.placeH : '点击填写'" :style="obj.placeH ?{'height':'300px'}:{}" v-model="obj.goHigh" @input="autoTextarea($event,300)"></textarea>
<div class="detail-div" contenteditable="true" v-show="false">{{obj.goHigh}}</div>
</div> </div>
<!--可编辑的div-->
</div> </div>
<div style="margin-top:.3rem;" v-show="level != 10"> <div style="margin-top:.3rem;" v-show="level != 10">
<div class="star_ten" > <div class="star_ten" >
<span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">温馨提示：</span> <span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">温馨提示：</span>
...@@ -88,6 +110,7 @@ ...@@ -88,6 +110,7 @@
stars : [true,false,false,false,false,false,false,false,false,false] , stars : [true,false,false,false,false,false,false,false,false,false] ,
scall : 0, scall : 0,
title : '方法分析', title : '方法分析',
text1:'',
details : [ details : [
{ {
title : '团队战略定位', title : '团队战略定位',
...@@ -292,6 +315,10 @@ ...@@ -292,6 +315,10 @@
getImg (){ getImg (){
let that = this ; let that = this ;
if ( this.validateParams() ){ if ( this.validateParams() ){
for(var i=0;i<=20;i++){
document.getElementsByClassName("detail-divL")[i].style.display="none";
document.getElementsByClassName("detail-div")[i].style.display="block";
}
window.scrollTo(0,0) ; window.scrollTo(0,0) ;
html2canvas(document.getElementById("capture"),{ html2canvas(document.getElementById("capture"),{
background: "rgba(255,255,255,1)", background: "rgba(255,255,255,1)",
...@@ -302,6 +329,7 @@ ...@@ -302,6 +329,7 @@
that.aaa = canvas.toDataURL(); that.aaa = canvas.toDataURL();
that.saveData(canvas.toDataURL('image/jpeg')) that.saveData(canvas.toDataURL('image/jpeg'))
}) })
} }
}, },
saveData(img){ saveData(img){
...@@ -320,6 +348,11 @@ ...@@ -320,6 +348,11 @@
}).then(function(res) { }).then(function(res) {
if (res.data.code == 200 ){ if (res.data.code == 200 ){
layer.tipsX('提交成功'); layer.tipsX('提交成功');
//恢复
for(var i = 0; i <= 20; i++){
document.getElementsByClassName("detail-div")[i].style.display="none";
document.getElementsByClassName("detail-divL")[i].style.display="block";
}
} else { } else {
layer.tipsX(res.data.msg); layer.tipsX(res.data.msg);
} }
...@@ -360,6 +393,7 @@ ...@@ -360,6 +393,7 @@
e.target.style.height = e.target.scrollHeight +'px'; e.target.style.height = e.target.scrollHeight +'px';
} }
}, },
}, },
} }
</script> </script>
...@@ -505,4 +539,22 @@ ...@@ -505,4 +539,22 @@
header+.header_seat { header+.header_seat {
height: 0.88rem; height: 0.88rem;
} }
.contenteditable-div{
width: 5rem;
height: 5rem;
background: #ccc;
}
.detail-div{
font-size: .28rem;
font-family: PingFangSC-Regular;
font-weight: 400;
color: rgba(39,39,39,1);
line-height: .4rem;
width: 6.38rem;
/*height: 2rem;*/
border: 1px solid #eeeeee;
padding: .1rem .2rem;
box-sizing: border-box;
/*word-break:break-all;*/
}
</style> </style>
\ No newline at end of file
public/appnew/src/components/eval/eval_sz.vue
View file @ cfc44b2a
...@@ -30,13 +30,18 @@ ...@@ -30,13 +30,18 @@
<span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">做的不足需要提升的部分：</span> <span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">做的不足需要提升的部分：</span>
</div> </div>
<div> <div>
<textarea class="detail" placeholder="点击填写，选择5项描述" v-model="obj.goHigh" style="height:50px" @input="autoTextarea($event,50)"></textarea> <textarea class="detail detail-divL" placeholder="点击填写，选择5项描述" v-model="obj.goHigh" style="height:50px" @input="autoTextarea($event,50)"></textarea>
<!--可编辑div-->
<div class="detail-div" contenteditable="true" v-show="false">{{obj.goHigh}}</div>
</div> </div>
<div class="star_ten" > <div class="star_ten" >
<span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">解决办法：</span> <span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">解决办法：</span>
</div> </div>
<div> <div>
<textarea v-show="index==0" class="detail" style="height:400px;" placeholder="方法措施，要有目标、具体方案、奖惩措施，以及监督人。
<div v-show="index==0">
<textarea class="detail detail-divL" style="height:400px;" placeholder="方法措施，要有目标、具体方案、奖惩措施，以及监督人。
举例说明: 举例说明:
目标:本月分部目标120万(人员80*人均1.5万) 目标:本月分部目标120万(人员80*人均1.5万)
方案1:紧盯每个团队的日绩效完成情况，并监督好团队执行情况 方案1:紧盯每个团队的日绩效完成情况，并监督好团队执行情况
...@@ -49,7 +54,26 @@ ...@@ -49,7 +54,26 @@
奖惩:完成目标奖励店长聚餐，未完成本人和区域所有店长外罚100俯卧增 奖惩:完成目标奖励店长聚餐，未完成本人和区域所有店长外罚100俯卧增
执行人：XXX 执行人：XXX
监督人：X部全体人员" v-model="obj.deal" @input="autoTextarea($event,400)"></textarea> 监督人：X部全体人员" v-model="obj.deal" @input="autoTextarea($event,400)"></textarea>
<textarea v-show="index>0" class="detail" style="height:400px;" placeholder="点击填写" v-model="obj.deal" @input="autoTextarea($event,400)"></textarea> <!--可编辑div-->
<div class="detail-div" contenteditable="true" v-show="false">{{obj.deal}}</div>
</div>
<div v-show="index>0">
<textarea class="detail detail-divL" style="height:400px;" placeholder="点击填写" v-model="obj.deal" @input="autoTextarea($event,400)"></textarea>
<!--可编辑div-->
<div class="detail-div" contenteditable="true" v-show="false">{{obj.deal}}</div>
</div>
</div> </div>
</div> </div>
...@@ -58,7 +82,10 @@ ...@@ -58,7 +82,10 @@
<span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">你想过带团队最坏的情况是什么?如果出现,你如何应对?</span> <span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">你想过带团队最坏的情况是什么?如果出现,你如何应对?</span>
</div> </div>
<div> <div>
<textarea class="detail" placeholder="点击填写" style="height:50px" @input="autoTextarea($event,50)" v-model="dealWay"></textarea> <textarea class="detail detail-divL" placeholder="点击填写" style="height:50px" @input="autoTextarea($event,50)" v-model="dealWay"></textarea>
<div class="detail-div" contenteditable="true" v-show="false">{{dealWay}}</div>
<!--可编辑div-->
</div> </div>
</div> </div>
<div style="margin-top:.3rem;"> <div style="margin-top:.3rem;">
...@@ -66,7 +93,10 @@ ...@@ -66,7 +93,10 @@
<span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">自我总结自我批评</span> <span style="line-height:.7rem;font-size:.28rem;font-family:PingFangSC-Regular;font-weight:600;color:rgba(39,39,39,1);">自我总结自我批评</span>
</div> </div>
<div> <div>
<textarea class="detail" placeholder="点击填写" style="height:50px" @input="autoTextarea($event,50)" v-model="myself"></textarea> <textarea class="detail detail-divL" placeholder="点击填写" style="height:50px" @input="autoTextarea($event,50)" v-model="myself"></textarea>
<!--可编辑div-->
<div class="detail-div" contenteditable="true" v-show="false">{{myself}}</div>
</div> </div>
</div> </div>
<div style="margin-top:.3rem;" v-show="level != 10"> <div style="margin-top:.3rem;" v-show="level != 10">
...@@ -224,6 +254,10 @@ ...@@ -224,6 +254,10 @@
getImg (){ getImg (){
let that = this ; let that = this ;
if ( this.validateParams() ){ if ( this.validateParams() ){
for(var i=0;i<=28;i++){
document.getElementsByClassName("detail-divL")[i].style.display="none";
document.getElementsByClassName("detail-div")[i].style.display="block";
}
window.scrollTo(0,0) ; window.scrollTo(0,0) ;
let shareContent = document.getElementById("capture"),//需要截图的包裹的（原生的）DOM 对象 let shareContent = document.getElementById("capture"),//需要截图的包裹的（原生的）DOM 对象
...@@ -294,6 +328,10 @@ ...@@ -294,6 +328,10 @@
}).then(function(res) { }).then(function(res) {
if (res.data.code == 200 ){ if (res.data.code == 200 ){
layer.tipsX('提交成功'); layer.tipsX('提交成功');
for(var i=0;i<=28;i++){
document.getElementsByClassName("detail-div")[i].style.display="none";
document.getElementsByClassName("detail-divL")[i].style.display="block";
}
} else { } else {
layer.tipsX(res.data.msg); layer.tipsX(res.data.msg);
} }
...@@ -480,4 +518,17 @@ ...@@ -480,4 +518,17 @@
header+.header_seat { header+.header_seat {
height: 0.88rem; height: 0.88rem;
} }
.detail-div{
font-size: .28rem;
font-family: PingFangSC-Regular;
font-weight: 400;
color: rgba(39,39,39,1);
line-height: .4rem;
width: 6.38rem;
/*height: 2rem;*/
border: 1px solid #eeeeee;
padding: .1rem .2rem;
box-sizing: border-box;
/*word-break:break-all;*/
}
</style> </style>
\ No newline at end of file
public/appnew/src/components/eval/eval_table.vue
View file @ cfc44b2a
...@@ -45,7 +45,9 @@ ...@@ -45,7 +45,9 @@
<span style="line-height: 0.3rem; font-size: 0.28rem; font-family: PingFangSC-Regular; color: rgb(39, 39, 39);">(必填)弘扬一件八星级事迹 +10分</span> <span style="line-height: 0.3rem; font-size: 0.28rem; font-family: PingFangSC-Regular; color: rgb(39, 39, 39);">(必填)弘扬一件八星级事迹 +10分</span>
</div> </div>
<div> <div>
<textarea class="detail" placeholder="点击填写，选择5项描述" v-model="jiazhi" style="height:100px" @input="autoTextarea($event,100)"></textarea> <textarea class="detail detail-divL" placeholder="点击填写，选择5项描述" v-model="jiazhi" style="height:100px" @input="autoTextarea($event,100)"></textarea>
<!--可编辑div-->
<div class="detail-div" contenteditable="true" v-show="false">{{jiazhi}}</div>
</div> </div>
</div> </div>
<div style="margin-top:.3rem;"> <div style="margin-top:.3rem;">
...@@ -56,7 +58,9 @@ ...@@ -56,7 +58,9 @@
<span style="line-height: 0.3rem; font-size: 0.28rem; font-family: PingFangSC-Regular; color: rgb(39, 39, 39);">(选填)被感谢的人一件事迹 +10分</span> <span style="line-height: 0.3rem; font-size: 0.28rem; font-family: PingFangSC-Regular; color: rgb(39, 39, 39);">(选填)被感谢的人一件事迹 +10分</span>
</div> </div>
<div> <div>
<textarea class="detail" placeholder="点击填写，选择5项描述" v-model="thanks" style="height:100px" @input="autoTextarea($event,100)"></textarea> <textarea class="detail detail-divL" placeholder="点击填写，选择5项描述" v-model="thanks" style="height:100px" @input="autoTextarea($event,100)"></textarea>
<!--可编辑div-->
<div class="detail-div" contenteditable="true" v-show="false">{{thanks}}</div>
</div> </div>
</div> </div>
<div style="margin-top:.3rem;"> <div style="margin-top:.3rem;">
...@@ -260,6 +264,10 @@ ...@@ -260,6 +264,10 @@
getImg (){ getImg (){
let that = this ; let that = this ;
if ( this.validateParams() ){ if ( this.validateParams() ){
for(var i=0;i<=1;i++){
document.getElementsByClassName("detail-divL")[i].style.display="none";
document.getElementsByClassName("detail-div")[i].style.display="block";
}
window.scrollTo(0,0) ; window.scrollTo(0,0) ;
html2canvas(document.getElementById("capture"),{ html2canvas(document.getElementById("capture"),{
background: "rgba(255,255,255,1)", background: "rgba(255,255,255,1)",
...@@ -286,6 +294,10 @@ ...@@ -286,6 +294,10 @@
console.log(res) console.log(res)
if (res.data.code == 200 ){ if (res.data.code == 200 ){
layer.tipsX('提交成功'); layer.tipsX('提交成功');
for(var i=0;i<=1;i++){
document.getElementsByClassName("detail-div")[i].style.display="none";
document.getElementsByClassName("detail-divL")[i].style.display="block";
}
} else { } else {
layer.tipsX(res.data.msg); layer.tipsX(res.data.msg);
} }
...@@ -492,4 +504,17 @@ ...@@ -492,4 +504,17 @@
header+.header_seat { header+.header_seat {
height: 0.88rem; height: 0.88rem;
} }
.detail-div{
font-size: .28rem;
font-family: PingFangSC-Regular;
font-weight: 400;
color: rgba(39,39,39,1);
line-height: .4rem;
width: 6.38rem;
/*height: 2rem;*/
border: 1px solid #eeeeee;
padding: .1rem .2rem;
box-sizing: border-box;
/*word-break:break-all;*/
}
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment