丁玲 / A6079080424317 · 提交

转到一个项目

作者 朱振飞
提交 99687d1a93622c913dc8ef7728093cf1480998c5 2 个父辈 e11ff982 d46ee9fb

合并分支 'lihongjuan' 到 'master' 

数据中心的部分



查看合并请求 !14
内嵌 并排对比
正在显示 3 个修改的文件 包含 118 行增加 和 20 行删除
... ... @@ -23,9 +23,10 @@ var app = new Vue({
},
created: function () {
// apiready = function () {
// app.broth_info=$("#date2").val();
console.log(this.broth_info)
this.broth_info=localStorage.getItem("birth")
// app.broth_info=$ ("#date2").val();
this.broth_info=localStorage.getItem("birth");
console.log(this.broth_info);
// this.rid = api.pageParam.rid;
// this.date_type = api.pageParam.date_type;
// this.type_name = api.pageParam.type_name;
... ... @@ -122,7 +123,6 @@ var app = new Vue({
},
// 获取疾病类型
getIllness: function () {
var app=this;
var heder = {
"XX-Device-Type": getDevice(),
... ... @@ -137,7 +137,7 @@ var app = new Vue({
label: res.data.data[i].name
})
}
loadEnd()
//loadEnd()
}
})
},
... ... @@ -206,10 +206,12 @@ var app = new Vue({
var app=this;
weui.picker(app.Illness_list, {
onChange: function (result) {
app.broth_info=$("#date2").val()
},
onConfirm: function (result) {
app.choose_type_name = result[0].label
app.choose_type_name = result[0].label;
}
})
},
... ... @@ -218,9 +220,11 @@ var app = new Vue({
var app=this;
weui.picker(app.org_list, {
onChange: function (result) {
app.broth_info=$("#date2").val()
},
onConfirm: function (result) {
app.choose_homes = result[0].label
app.choose_homes = result[0].label;
}
})
},
... ... @@ -253,7 +257,6 @@ var app = new Vue({
var app=this;
app.broth_info=$("#date2").val();
localStorage.setItem("birth",app.broth_info);
console.log(localStorage)
console.log( app.broth_info)
var header = {
"XX-Device-Type": getDevice(),
... ... @@ -276,21 +279,23 @@ var app = new Vue({
} else if (app.choose_homes == '机构名称') {
toastMsg('请选择机构名称')
} else if (app.content == '') {
toastMsg('请输入描述')
} else if (app.img_report == '' && app.code == '') {
toastMsg('请上传报告照片')
toastMsg('请输入描述');
}
// } else if (app.img_report == '' && app.code == '') {
// toastMsg('请上传报告照片')
// }
else {
getRequest('post', 'user/index/addReport', post, header).then(function (res) {
// alert(JSON.stringify(res))
if (res.data.code == 1) {
toastMsg('添加成功');
api.sendEvent({
name:'add_success'
});
setTimeout(function() {
api.closeWin()
}, 1000)
// api.sendEvent({
// name:'add_success'
// });
// setTimeout(function() {
// api.closeWin()
// }, 1000)
window.history.back();
} else {
toastMsg(res.msg)
}
... ...
... ... @@ -160,3 +160,4 @@
}
})
</script>
... ...
... ... @@ -93,6 +93,17 @@
.photo_item img {
width: 100%;
}
#preview{
width: 2rem;
height: 2rem;
}
#imghead{
width:2rem;
height:2rem;
border-radius:0.16rem;
}
</style>
</head>
<body>
... ... @@ -134,10 +145,10 @@
<!--<span v-else class="iconfont icon-jiajianzujianjiahao"></span>-->
<!--</div>-->
<div class="photo_item">
<div class="addphoto">
<!--../img/addimg.png-->
<div id="preview">
<img id="imghead" border="0" src="" style="width:100%;height:100%" onclick="$('#previewImg').click();">
<img id="imghead" border="0" src="../../assets/image/tri.png" style="width:100%;height:100%" onclick="$('#previewImg').click();">
</div>
<!--<img src="../img/delet.png" alt="" style="position:absolute;bottom:92px;left:46px" class="deleteimg"/>-->
<input type="file" onchange="previewImage(this)" style="display: none;" id="previewImg">
... ... @@ -145,7 +156,6 @@
<div class="photo_item" @click="openQrc">
<img v-if='img_sao_yi_sao' :src="img_sao_yi_sao" alt="">
<span v-else class="iconfont icon-saoyisao"></span>
... ... @@ -185,4 +195,86 @@
beginYear:2000,
endYear:2100
})
function clacImgZoomParam(maxWidth, maxHeight, width, height) {
var param = {
top: 0,
left: 0,
width: width,
height: height
};
if(width > maxWidth || height > maxHeight) {
rateWidth = width / maxWidth;
rateHeight = height / maxHeight;
if(rateWidth > rateHeight) {
param.width = maxWidth;
param.height = Math.round(height / rateWidth);
} else {
param.width = Math.round(width / rateHeight);
param.height = maxHeight;
}
}
param.left = Math.round((maxWidth - param.width) / 2);
param.top = Math.round((maxHeight - param.height) / 2);
return param;
}
function previewImage(file) {
var url=baseurl + 'user/index/addReportPic';
console.log(url)
var MAXWIDTH =60;
var MAXHEIGHT =77;
var div = document.getElementById('preview');
if(file.files && file.files[0]) {
div.innerHTML = '<img id=imghead onclick=$("#previewImg").click()>';
var img = document.getElementById('imghead');
img.onload = function() {
var rect = clacImgZoomParam(MAXWIDTH, MAXHEIGHT, img.offsetWidth, img.offsetHeight);
img.width = rect.width;
img.height = rect.height;
// img.style.marginLeft = rect.left+'px';
// img.style.marginTop = rect.top + 'px';
}
var reader = new FileReader();
reader.onload = function(evt) {
img.src = evt.target.result;
}
reader.readAsDataURL(file.files[0]);
} else //兼容IE
{
var sFilter = 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale,src="';
file.select();
var src = document.selection.createRange().text;
div.innerHTML = '<img id=imghead>';
var img = document.getElementById('imghead');
img.filters.item('DXImageTransform.Microsoft.AlphaImageLoader').src = src;
var rect = clacImgZoomParam(MAXWIDTH, MAXHEIGHT, img.offsetWidth, img.offsetHeight);
status = ('rect:' + rect.top + ',' + rect.left + ',' + rect.width + ',' + rect.height);
div.innerHTML = "<div id=divhead style='width:" + rect.width + "px;height:" + rect.height + "px;margin-top:" + rect.top + "px;" + sFilter + src + "\"'></div>";
}
var formData = new FormData();
var fileM = document.querySelector("#previewImg");
var fileObj = fileM.files[0];
formData.append("files", fileObj);
formData.append("r_type",2)
$.ajax({
url: baseurl + 'user/index/addReportPic',
type: 'POST',
data: formData,
async: false,
cache: false,
contentType: false,
processData: false,
success: function(res) {
console.log(res);
alert(res)
},
error: function() {
}
});
}
</script>
... ...