c9000eb5 by renchao@pashanhoo.com

style:高拍仪

1 parent f19ed400
......@@ -134,7 +134,25 @@ export function getUrlParam (paraName) {
return '';
}
}
/**
* @description: 身份证读卡器组件
* @author: renchao
*/
export function getIdCardInfo () {
return axios.post(Vue.prototype.BASE_API.IDCARDURL)
}
/**
* @description: 高拍仪组件
* @author: renchao
*/
export function getAltimeterInfo () {
let data = {
"filepath": "base64",
"rotate": "0",
"cutpage": "0",
"camidx": "0",
"ColorMode": "0",
"quality": "3"
}
return axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data))
}
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-14 11:10:26
* @LastEditTime: 2023-06-16 11:12:13
-->
<template>
<div class="rlPopup">
......@@ -46,7 +46,7 @@
</div>
</template>
<script>
import axios from 'axios'
import { getAltimeterInfo } from '@/utils/operation.js'
import PhotoZoom from '@/components/PhotoZoom'
import { uploadSjClmx, deleteClmx } from "@/api/clxx.js";
import publicPicture from '@/components/publicPicture/index.vue'
......@@ -149,20 +149,11 @@
const file = new File([blob], options);
return file;
}
let data = {
"filepath": "base64",
"rotate": "0",
"cutpage": "0",
"camidx": "0",
"ColorMode": "0",
"quality": "3"
}
axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data)).then((res) => {
getAltimeterInfo().then(res => {
let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
let file = blobToFile(blob);
var formData = new FormData();
formData.append('file', file.raw)
formData.append('file', file)
formData.append("bsmSj", this.previewImg.bsmSj);
formData.append("bsmSlsq", this.previewImg.bsmSlsq);
uploadSjClmx(formData).then((res) => {
......
......@@ -24,7 +24,7 @@
</div>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
</div>
<image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......@@ -39,7 +39,7 @@
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { popupDialog } from "@/utils/popup.js";
export default {
components: { clxxAddDialog, imagePreview},
components: { clxxAddDialog, imagePreview },
data () {
return {
isDialog: false,
......
......@@ -5,13 +5,11 @@
<el-tab-pane
:disabled="isshow"
label="审批意见"
name="spyj"
></el-tab-pane>
name="spyj"></el-tab-pane>
<el-tab-pane
:disabled="isshow"
label="材料信息"
name="clxx"
></el-tab-pane>
name="clxx"></el-tab-pane>
</el-tabs>
<div v-if="activeName == 'slxx'">
<div class="from-clues-header">
......@@ -24,8 +22,7 @@
v-for="item in qsztList"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
......@@ -34,8 +31,7 @@
<el-form-item
:prop="item.prop"
:label="item.label"
label-width="140px"
>
label-width="140px">
<el-input v-model="form[item.prop]"></el-input>
</el-form-item>
</el-col>
......@@ -55,8 +51,7 @@
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="120px"
>
label-width="120px">
<div class="spyj_form">
<div class="item_left">初审意见</div>
<div class="item_right">
......@@ -65,15 +60,13 @@
<el-form-item
label-width="0"
class="opinion_item"
prop="shyj"
>
prop="shyj">
<el-input
type="textarea"
:rows="4"
class="opinion"
placeholder="请输入审批意见"
v-model="ruleForm.shyj"
></el-input>
v-model="ruleForm.shyj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -82,8 +75,7 @@
<el-form-item
prop="shryxm"
label="审查人"
label-width="90px"
>
label-width="90px">
<el-input v-model="ruleForm.shr"></el-input>
</el-form-item>
</el-col>
......@@ -91,8 +83,7 @@
<el-form-item
label="审核时间"
prop="shjssj"
label-width="90px"
>
label-width="90px">
<el-input v-model="ruleForm.shsj"></el-input>
</el-form-item>
</el-col>
......@@ -104,8 +95,7 @@
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="120px"
>
label-width="120px">
<div class="spyj_form">
<div class="item_left">复审意见</div>
<div class="item_right">
......@@ -114,15 +104,13 @@
<el-form-item
label-width="0"
class="opinion_item"
prop="shyj"
>
prop="shyj">
<el-input
type="textarea"
:rows="4"
class="opinion"
placeholder="请输入审批意见"
v-model="ruleForm.shyj"
></el-input>
v-model="ruleForm.shyj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -131,8 +119,7 @@
<el-form-item
prop="shryxm"
label="审查人"
label-width="90px"
>
label-width="90px">
<el-input v-model="ruleForm.shr"></el-input>
</el-form-item>
</el-col>
......@@ -140,8 +127,7 @@
<el-form-item
label="审核时间"
prop="shjssj"
label-width="90px"
>
label-width="90px">
<el-input v-model="ruleForm.shsj"></el-input>
</el-form-item>
</el-col>
......@@ -153,8 +139,7 @@
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="120px"
>
label-width="120px">
<div class="spyj_form">
<div class="item_left">核定意见</div>
<div class="item_right">
......@@ -163,15 +148,13 @@
<el-form-item
label-width="0"
class="opinion_item"
prop="shyj"
>
prop="shyj">
<el-input
type="textarea"
:rows="4"
class="opinion"
placeholder="请输入审批意见"
v-model="ruleForm.shyj"
></el-input>
v-model="ruleForm.shyj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -180,8 +163,7 @@
<el-form-item
prop="shryxm"
label="审查人"
label-width="90px"
>
label-width="90px">
<el-input v-model="ruleForm.shr"></el-input>
</el-form-item>
</el-col>
......@@ -189,8 +171,7 @@
<el-form-item
label="审核时间"
prop="shjssj"
label-width="90px"
>
label-width="90px">
<el-input v-model="ruleForm.shsj"></el-input>
</el-form-item>
</el-col>
......@@ -228,7 +209,7 @@
</div>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()">新增</el-button>
</div>
<image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......@@ -248,15 +229,15 @@
import clxxAddDialog from "./tabsconcent/clxxAddDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
export default {
export default {
components: { clxxAddDialog, imagePreview },
props: {
formData: {
type: Object,
default: () => {},
default: () => { },
},
},
data() {
data () {
return {
activeName: "slxx",
form: {},
......@@ -308,7 +289,7 @@ export default {
created () {
this.clmlInitList(1)
},
mounted() {
mounted () {
if (this.formData.data) {
this.$nextTick(() => {
this.form = Object.assign({}, this.formData.data);
......@@ -330,7 +311,7 @@ export default {
methods: {
// 受理信息保存
slxxsubmitForm() {
slxxsubmitForm () {
this.$refs.form.validate((valid) => {
if (valid) {
// addUserCommonOpinion({ commonOpinion: this.form.commonOpinion }).then(res => {
......@@ -349,8 +330,8 @@ export default {
this.isshow = false;
},
// 审批意见保存
spyjsubmitForm() {
console.log("this.ruleForm",this.ruleForm);
spyjsubmitForm () {
console.log("this.ruleForm", this.ruleForm);
// this.ruleForm.bsmSlsq = this.bsmSlsq
// this.ruleForm.bestepid = this.bestepid
// saveSpyjBySlsq(this.ruleForm).then(res => {
......@@ -364,8 +345,8 @@ export default {
},
// 材料信息保存
clxxsubmitForm() {},
closeDialog() {
clxxsubmitForm () { },
closeDialog () {
this.$alert("取消后填写内容将被清空", "提示", {
confirmButtonText: "确定",
callback: (action) => {
......@@ -380,10 +361,10 @@ export default {
// this.resetTableFields();
},
handleTabClick() {},
handleTabClick () { },
//使用常用意见
useOpinion(opinion) {
useOpinion (opinion) {
this.ruleForm.shyj = opinion;
},
......@@ -533,13 +514,13 @@ export default {
})
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
.from-clues-header {
.from-clues-header {
@include flex;
flex-direction: column;
overflow-y: hidden;
......@@ -550,11 +531,11 @@ export default {
margin-bottom: 20px;
text-align: center;
}
}
}
// 审批意见样式
// 审批意见样式
.spyj {
.spyj {
.box {
overflow-x: auto;
width: 100%;
......@@ -567,7 +548,7 @@ export default {
padding: 20px 40px;
/deep/.el-input__inner {
width: 200px;
border:none;
border: none;
}
}
.spyj_title {
......@@ -646,9 +627,9 @@ export default {
text-align: center;
margin: 15px 0;
}
}
}
// 材料信息样式
// 材料信息样式
.active {
background: $light-blue !important;
color: #fff;
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:40:46
* @LastEditTime: 2023-06-16 11:12:40
-->
<template>
<div class="clxx">
......@@ -33,7 +33,7 @@
</div>
</div>
</div>
<image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......