c9000eb5 by renchao@pashanhoo.com

style:高拍仪

1 parent f19ed400
...@@ -134,7 +134,25 @@ export function getUrlParam (paraName) { ...@@ -134,7 +134,25 @@ export function getUrlParam (paraName) {
134 return ''; 134 return '';
135 } 135 }
136 } 136 }
137 137 /**
138 * @description: 身份证读卡器组件
139 * @author: renchao
140 */
138 export function getIdCardInfo () { 141 export function getIdCardInfo () {
139 return axios.post(Vue.prototype.BASE_API.IDCARDURL) 142 return axios.post(Vue.prototype.BASE_API.IDCARDURL)
140 } 143 }
144 /**
145 * @description: 高拍仪组件
146 * @author: renchao
147 */
148 export function getAltimeterInfo () {
149 let data = {
150 "filepath": "base64",
151 "rotate": "0",
152 "cutpage": "0",
153 "camidx": "0",
154 "ColorMode": "0",
155 "quality": "3"
156 }
157 return axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data))
158 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 11:10:26 4 * @LastEditTime: 2023-06-16 11:12:13
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 </div> 46 </div>
47 </template> 47 </template>
48 <script> 48 <script>
49 import axios from 'axios' 49 import { getAltimeterInfo } from '@/utils/operation.js'
50 import PhotoZoom from '@/components/PhotoZoom' 50 import PhotoZoom from '@/components/PhotoZoom'
51 import { uploadSjClmx, deleteClmx } from "@/api/clxx.js"; 51 import { uploadSjClmx, deleteClmx } from "@/api/clxx.js";
52 import publicPicture from '@/components/publicPicture/index.vue' 52 import publicPicture from '@/components/publicPicture/index.vue'
...@@ -149,20 +149,11 @@ ...@@ -149,20 +149,11 @@
149 const file = new File([blob], options); 149 const file = new File([blob], options);
150 return file; 150 return file;
151 } 151 }
152 152 getAltimeterInfo().then(res => {
153 let data = {
154 "filepath": "base64",
155 "rotate": "0",
156 "cutpage": "0",
157 "camidx": "0",
158 "ColorMode": "0",
159 "quality": "3"
160 }
161 axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data)).then((res) => {
162 let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64); 153 let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
163 let file = blobToFile(blob); 154 let file = blobToFile(blob);
164 var formData = new FormData(); 155 var formData = new FormData();
165 formData.append('file', file.raw) 156 formData.append('file', file)
166 formData.append("bsmSj", this.previewImg.bsmSj); 157 formData.append("bsmSj", this.previewImg.bsmSj);
167 formData.append("bsmSlsq", this.previewImg.bsmSlsq); 158 formData.append("bsmSlsq", this.previewImg.bsmSlsq);
168 uploadSjClmx(formData).then((res) => { 159 uploadSjClmx(formData).then((res) => {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 </div> 24 </div>
25 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button> 25 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
26 </div> 26 </div>
27 <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" 27 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
28 @prevPriview="prevPriview" /> 28 @prevPriview="prevPriview" />
29 </div> 29 </div>
30 </div> 30 </div>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 39 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
40 import { popupDialog } from "@/utils/popup.js"; 40 import { popupDialog } from "@/utils/popup.js";
41 export default { 41 export default {
42 components: { clxxAddDialog, imagePreview}, 42 components: { clxxAddDialog, imagePreview },
43 data () { 43 data () {
44 return { 44 return {
45 isDialog: false, 45 isDialog: false,
......
...@@ -5,13 +5,11 @@ ...@@ -5,13 +5,11 @@
5 <el-tab-pane 5 <el-tab-pane
6 :disabled="isshow" 6 :disabled="isshow"
7 label="审批意见" 7 label="审批意见"
8 name="spyj" 8 name="spyj"></el-tab-pane>
9 ></el-tab-pane>
10 <el-tab-pane 9 <el-tab-pane
11 :disabled="isshow" 10 :disabled="isshow"
12 label="材料信息" 11 label="材料信息"
13 name="clxx" 12 name="clxx"></el-tab-pane>
14 ></el-tab-pane>
15 </el-tabs> 13 </el-tabs>
16 <div v-if="activeName == 'slxx'"> 14 <div v-if="activeName == 'slxx'">
17 <div class="from-clues-header"> 15 <div class="from-clues-header">
...@@ -24,8 +22,7 @@ ...@@ -24,8 +22,7 @@
24 v-for="item in qsztList" 22 v-for="item in qsztList"
25 :key="item.value" 23 :key="item.value"
26 :label="item.label" 24 :label="item.label"
27 :value="item.value" 25 :value="item.value">
28 >
29 </el-option> 26 </el-option>
30 </el-select> 27 </el-select>
31 </el-form-item> 28 </el-form-item>
...@@ -34,8 +31,7 @@ ...@@ -34,8 +31,7 @@
34 <el-form-item 31 <el-form-item
35 :prop="item.prop" 32 :prop="item.prop"
36 :label="item.label" 33 :label="item.label"
37 label-width="140px" 34 label-width="140px">
38 >
39 <el-input v-model="form[item.prop]"></el-input> 35 <el-input v-model="form[item.prop]"></el-input>
40 </el-form-item> 36 </el-form-item>
41 </el-col> 37 </el-col>
...@@ -55,8 +51,7 @@ ...@@ -55,8 +51,7 @@
55 :model="ruleForm" 51 :model="ruleForm"
56 :rules="rules" 52 :rules="rules"
57 ref="ruleForm" 53 ref="ruleForm"
58 label-width="120px" 54 label-width="120px">
59 >
60 <div class="spyj_form"> 55 <div class="spyj_form">
61 <div class="item_left">初审意见</div> 56 <div class="item_left">初审意见</div>
62 <div class="item_right"> 57 <div class="item_right">
...@@ -65,15 +60,13 @@ ...@@ -65,15 +60,13 @@
65 <el-form-item 60 <el-form-item
66 label-width="0" 61 label-width="0"
67 class="opinion_item" 62 class="opinion_item"
68 prop="shyj" 63 prop="shyj">
69 >
70 <el-input 64 <el-input
71 type="textarea" 65 type="textarea"
72 :rows="4" 66 :rows="4"
73 class="opinion" 67 class="opinion"
74 placeholder="请输入审批意见" 68 placeholder="请输入审批意见"
75 v-model="ruleForm.shyj" 69 v-model="ruleForm.shyj"></el-input>
76 ></el-input>
77 </el-form-item> 70 </el-form-item>
78 </el-col> 71 </el-col>
79 </el-row> 72 </el-row>
...@@ -82,8 +75,7 @@ ...@@ -82,8 +75,7 @@
82 <el-form-item 75 <el-form-item
83 prop="shryxm" 76 prop="shryxm"
84 label="审查人" 77 label="审查人"
85 label-width="90px" 78 label-width="90px">
86 >
87 <el-input v-model="ruleForm.shr"></el-input> 79 <el-input v-model="ruleForm.shr"></el-input>
88 </el-form-item> 80 </el-form-item>
89 </el-col> 81 </el-col>
...@@ -91,8 +83,7 @@ ...@@ -91,8 +83,7 @@
91 <el-form-item 83 <el-form-item
92 label="审核时间" 84 label="审核时间"
93 prop="shjssj" 85 prop="shjssj"
94 label-width="90px" 86 label-width="90px">
95 >
96 <el-input v-model="ruleForm.shsj"></el-input> 87 <el-input v-model="ruleForm.shsj"></el-input>
97 </el-form-item> 88 </el-form-item>
98 </el-col> 89 </el-col>
...@@ -104,8 +95,7 @@ ...@@ -104,8 +95,7 @@
104 :model="ruleForm" 95 :model="ruleForm"
105 :rules="rules" 96 :rules="rules"
106 ref="ruleForm" 97 ref="ruleForm"
107 label-width="120px" 98 label-width="120px">
108 >
109 <div class="spyj_form"> 99 <div class="spyj_form">
110 <div class="item_left">复审意见</div> 100 <div class="item_left">复审意见</div>
111 <div class="item_right"> 101 <div class="item_right">
...@@ -114,15 +104,13 @@ ...@@ -114,15 +104,13 @@
114 <el-form-item 104 <el-form-item
115 label-width="0" 105 label-width="0"
116 class="opinion_item" 106 class="opinion_item"
117 prop="shyj" 107 prop="shyj">
118 >
119 <el-input 108 <el-input
120 type="textarea" 109 type="textarea"
121 :rows="4" 110 :rows="4"
122 class="opinion" 111 class="opinion"
123 placeholder="请输入审批意见" 112 placeholder="请输入审批意见"
124 v-model="ruleForm.shyj" 113 v-model="ruleForm.shyj"></el-input>
125 ></el-input>
126 </el-form-item> 114 </el-form-item>
127 </el-col> 115 </el-col>
128 </el-row> 116 </el-row>
...@@ -131,8 +119,7 @@ ...@@ -131,8 +119,7 @@
131 <el-form-item 119 <el-form-item
132 prop="shryxm" 120 prop="shryxm"
133 label="审查人" 121 label="审查人"
134 label-width="90px" 122 label-width="90px">
135 >
136 <el-input v-model="ruleForm.shr"></el-input> 123 <el-input v-model="ruleForm.shr"></el-input>
137 </el-form-item> 124 </el-form-item>
138 </el-col> 125 </el-col>
...@@ -140,8 +127,7 @@ ...@@ -140,8 +127,7 @@
140 <el-form-item 127 <el-form-item
141 label="审核时间" 128 label="审核时间"
142 prop="shjssj" 129 prop="shjssj"
143 label-width="90px" 130 label-width="90px">
144 >
145 <el-input v-model="ruleForm.shsj"></el-input> 131 <el-input v-model="ruleForm.shsj"></el-input>
146 </el-form-item> 132 </el-form-item>
147 </el-col> 133 </el-col>
...@@ -153,8 +139,7 @@ ...@@ -153,8 +139,7 @@
153 :model="ruleForm" 139 :model="ruleForm"
154 :rules="rules" 140 :rules="rules"
155 ref="ruleForm" 141 ref="ruleForm"
156 label-width="120px" 142 label-width="120px">
157 >
158 <div class="spyj_form"> 143 <div class="spyj_form">
159 <div class="item_left">核定意见</div> 144 <div class="item_left">核定意见</div>
160 <div class="item_right"> 145 <div class="item_right">
...@@ -163,15 +148,13 @@ ...@@ -163,15 +148,13 @@
163 <el-form-item 148 <el-form-item
164 label-width="0" 149 label-width="0"
165 class="opinion_item" 150 class="opinion_item"
166 prop="shyj" 151 prop="shyj">
167 >
168 <el-input 152 <el-input
169 type="textarea" 153 type="textarea"
170 :rows="4" 154 :rows="4"
171 class="opinion" 155 class="opinion"
172 placeholder="请输入审批意见" 156 placeholder="请输入审批意见"
173 v-model="ruleForm.shyj" 157 v-model="ruleForm.shyj"></el-input>
174 ></el-input>
175 </el-form-item> 158 </el-form-item>
176 </el-col> 159 </el-col>
177 </el-row> 160 </el-row>
...@@ -180,8 +163,7 @@ ...@@ -180,8 +163,7 @@
180 <el-form-item 163 <el-form-item
181 prop="shryxm" 164 prop="shryxm"
182 label="审查人" 165 label="审查人"
183 label-width="90px" 166 label-width="90px">
184 >
185 <el-input v-model="ruleForm.shr"></el-input> 167 <el-input v-model="ruleForm.shr"></el-input>
186 </el-form-item> 168 </el-form-item>
187 </el-col> 169 </el-col>
...@@ -189,8 +171,7 @@ ...@@ -189,8 +171,7 @@
189 <el-form-item 171 <el-form-item
190 label="审核时间" 172 label="审核时间"
191 prop="shjssj" 173 prop="shjssj"
192 label-width="90px" 174 label-width="90px">
193 >
194 <el-input v-model="ruleForm.shsj"></el-input> 175 <el-input v-model="ruleForm.shsj"></el-input>
195 </el-form-item> 176 </el-form-item>
196 </el-col> 177 </el-col>
...@@ -228,7 +209,7 @@ ...@@ -228,7 +209,7 @@
228 </div> 209 </div>
229 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()">新增</el-button> 210 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()">新增</el-button>
230 </div> 211 </div>
231 <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" 212 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
232 @prevPriview="prevPriview" /> 213 @prevPriview="prevPriview" />
233 </div> 214 </div>
234 </div> 215 </div>
...@@ -248,15 +229,15 @@ ...@@ -248,15 +229,15 @@
248 import clxxAddDialog from "./tabsconcent/clxxAddDialog.vue"; 229 import clxxAddDialog from "./tabsconcent/clxxAddDialog.vue";
249 import imagePreview from '@/views/components/imagePreview.vue' 230 import imagePreview from '@/views/components/imagePreview.vue'
250 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 231 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
251 export default { 232 export default {
252 components: { clxxAddDialog, imagePreview }, 233 components: { clxxAddDialog, imagePreview },
253 props: { 234 props: {
254 formData: { 235 formData: {
255 type: Object, 236 type: Object,
256 default: () => {}, 237 default: () => { },
257 }, 238 },
258 }, 239 },
259 data() { 240 data () {
260 return { 241 return {
261 activeName: "slxx", 242 activeName: "slxx",
262 form: {}, 243 form: {},
...@@ -308,7 +289,7 @@ export default { ...@@ -308,7 +289,7 @@ export default {
308 created () { 289 created () {
309 this.clmlInitList(1) 290 this.clmlInitList(1)
310 }, 291 },
311 mounted() { 292 mounted () {
312 if (this.formData.data) { 293 if (this.formData.data) {
313 this.$nextTick(() => { 294 this.$nextTick(() => {
314 this.form = Object.assign({}, this.formData.data); 295 this.form = Object.assign({}, this.formData.data);
...@@ -330,7 +311,7 @@ export default { ...@@ -330,7 +311,7 @@ export default {
330 311
331 methods: { 312 methods: {
332 // 受理信息保存 313 // 受理信息保存
333 slxxsubmitForm() { 314 slxxsubmitForm () {
334 this.$refs.form.validate((valid) => { 315 this.$refs.form.validate((valid) => {
335 if (valid) { 316 if (valid) {
336 // addUserCommonOpinion({ commonOpinion: this.form.commonOpinion }).then(res => { 317 // addUserCommonOpinion({ commonOpinion: this.form.commonOpinion }).then(res => {
...@@ -349,8 +330,8 @@ export default { ...@@ -349,8 +330,8 @@ export default {
349 this.isshow = false; 330 this.isshow = false;
350 }, 331 },
351 // 审批意见保存 332 // 审批意见保存
352 spyjsubmitForm() { 333 spyjsubmitForm () {
353 console.log("this.ruleForm",this.ruleForm); 334 console.log("this.ruleForm", this.ruleForm);
354 // this.ruleForm.bsmSlsq = this.bsmSlsq 335 // this.ruleForm.bsmSlsq = this.bsmSlsq
355 // this.ruleForm.bestepid = this.bestepid 336 // this.ruleForm.bestepid = this.bestepid
356 // saveSpyjBySlsq(this.ruleForm).then(res => { 337 // saveSpyjBySlsq(this.ruleForm).then(res => {
...@@ -364,8 +345,8 @@ export default { ...@@ -364,8 +345,8 @@ export default {
364 }, 345 },
365 346
366 // 材料信息保存 347 // 材料信息保存
367 clxxsubmitForm() {}, 348 clxxsubmitForm () { },
368 closeDialog() { 349 closeDialog () {
369 this.$alert("取消后填写内容将被清空", "提示", { 350 this.$alert("取消后填写内容将被清空", "提示", {
370 confirmButtonText: "确定", 351 confirmButtonText: "确定",
371 callback: (action) => { 352 callback: (action) => {
...@@ -380,10 +361,10 @@ export default { ...@@ -380,10 +361,10 @@ export default {
380 361
381 // this.resetTableFields(); 362 // this.resetTableFields();
382 }, 363 },
383 handleTabClick() {}, 364 handleTabClick () { },
384 365
385 //使用常用意见 366 //使用常用意见
386 useOpinion(opinion) { 367 useOpinion (opinion) {
387 this.ruleForm.shyj = opinion; 368 this.ruleForm.shyj = opinion;
388 }, 369 },
389 370
...@@ -533,13 +514,13 @@ export default { ...@@ -533,13 +514,13 @@ export default {
533 }) 514 })
534 }, 515 },
535 }, 516 },
536 }; 517 };
537 </script> 518 </script>
538 <style scoped lang="scss"> 519 <style scoped lang="scss">
539 @import "~@/styles/mixin.scss"; 520 @import "~@/styles/mixin.scss";
540 @import "~@/styles/public.scss"; 521 @import "~@/styles/public.scss";
541 522
542 .from-clues-header { 523 .from-clues-header {
543 @include flex; 524 @include flex;
544 flex-direction: column; 525 flex-direction: column;
545 overflow-y: hidden; 526 overflow-y: hidden;
...@@ -550,11 +531,11 @@ export default { ...@@ -550,11 +531,11 @@ export default {
550 margin-bottom: 20px; 531 margin-bottom: 20px;
551 text-align: center; 532 text-align: center;
552 } 533 }
553 } 534 }
554 535
555 // 审批意见样式 536 // 审批意见样式
556 537
557 .spyj { 538 .spyj {
558 .box { 539 .box {
559 overflow-x: auto; 540 overflow-x: auto;
560 width: 100%; 541 width: 100%;
...@@ -567,7 +548,7 @@ export default { ...@@ -567,7 +548,7 @@ export default {
567 padding: 20px 40px; 548 padding: 20px 40px;
568 /deep/.el-input__inner { 549 /deep/.el-input__inner {
569 width: 200px; 550 width: 200px;
570 border:none; 551 border: none;
571 } 552 }
572 } 553 }
573 .spyj_title { 554 .spyj_title {
...@@ -646,9 +627,9 @@ export default { ...@@ -646,9 +627,9 @@ export default {
646 text-align: center; 627 text-align: center;
647 margin: 15px 0; 628 margin: 15px 0;
648 } 629 }
649 } 630 }
650 631
651 // 材料信息样式 632 // 材料信息样式
652 .active { 633 .active {
653 background: $light-blue !important; 634 background: $light-blue !important;
654 color: #fff; 635 color: #fff;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:40:46 4 * @LastEditTime: 2023-06-16 11:12:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 </div> 33 </div>
34 </div> 34 </div>
35 </div> 35 </div>
36 <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" 36 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
37 @prevPriview="prevPriview" /> 37 @prevPriview="prevPriview" />
38 </div> 38 </div>
39 </div> 39 </div>
......