8f5b08b3 by xiaomiao

--no commit message

2 parents c97c8c01 c207fe69
1 import Vue from 'vue'
2 import axios from 'axios'
3 import request from '@/utils/request';
1 import { Message } from "element-ui"; 4 import { Message } from "element-ui";
2 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') { 5 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
3 if (!treeList || !treeList.length) { 6 if (!treeList || !treeList.length) {
...@@ -111,7 +114,6 @@ export function down (index, data) { ...@@ -111,7 +114,6 @@ export function down (index, data) {
111 } 114 }
112 } 115 }
113 116
114
115 export function getUrlParam (paraName) { 117 export function getUrlParam (paraName) {
116 let url = document.location.toString(); 118 let url = document.location.toString();
117 let arrObj = url.split('?'); 119 let arrObj = url.split('?');
...@@ -133,3 +135,29 @@ export function getUrlParam (paraName) { ...@@ -133,3 +135,29 @@ export function getUrlParam (paraName) {
133 return ''; 135 return '';
134 } 136 }
135 } 137 }
138 /**
139 * @description: 身份证读卡器
140 * @author: renchao
141 */
142 export function getIdCardInfo (level) {
143 const resultMap = {
144 A: '10 颗星',
145 default: axios.post(Vue.prototype.BASE_API.IDCARDURL),
146 }
147 return resultMap[level] || resultMap.default
148 }
149 /**
150 * @description: 高拍仪组件
151 * @author: renchao
152 */
153 export function getAltimeterInfo () {
154 let data = {
155 "filepath": "base64",
156 "rotate": "0",
157 "cutpage": "0",
158 "camidx": "0",
159 "ColorMode": "0",
160 "quality": "3"
161 }
162 return axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data))
163 }
...\ 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,
......
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
66 <el-select v-model="scope.row.sqrzjlxbm" class="width100"> 66 <el-select v-model="scope.row.sqrzjlxbm" class="width100">
67 <el-option 67 <el-option
68 v-for="item in zjzlData" 68 v-for="item in zjzlData"
69 :key="item.value" 69 :key="item.dcode"
70 :label="item.label" 70 :label="item.dname"
71 :value="item.value"> 71 :value="item.dcode">
72 </el-option> 72 </el-option>
73 </el-select> 73 </el-select>
74 </template> 74 </template>
...@@ -113,10 +113,10 @@ ...@@ -113,10 +113,10 @@
113 </div> 113 </div>
114 </template> 114 </template>
115 <script> 115 <script>
116 import axios from 'axios'
117 import store from '@/store/index.js' 116 import store from '@/store/index.js'
118 import { getLodop } from "@/utils/LodopFuncs"
119 import { datas } from "./addjtfcdata"; 117 import { datas } from "./addjtfcdata";
118 import { getLodop } from "@/utils/LodopFuncs"
119 import { getIdCardInfo } from '@/utils/operation.js'
120 import { getPrintTemplateByCode } from "@/api/system"; 120 import { getPrintTemplateByCode } from "@/api/system";
121 import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx"; 121 import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx";
122 export default { 122 export default {
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
359 this.isSearch = false; 359 this.isSearch = false;
360 }, 360 },
361 handleRead (row, type) { 361 handleRead (row, type) {
362 axios.post(this.BASE_API.IDCARDURL).then(res => { 362 getIdCardInfo().then(res => {
363 if (res.data.code == 0) { 363 if (res.data.code == 0) {
364 let data = res.data.IDCardInfo 364 let data = res.data.IDCardInfo
365 row.sqrxm = data.name 365 row.sqrxm = data.name
...@@ -372,7 +372,6 @@ ...@@ -372,7 +372,6 @@
372 if (type == 'sqr') { 372 if (type == 'sqr') {
373 this.form.qlrList = _.cloneDeep(this.form.sqrList) 373 this.form.qlrList = _.cloneDeep(this.form.sqrList)
374 } 374 }
375 console.log(this.form.sqrList);
376 } else { 375 } else {
377 this.$message({ 376 this.$message({
378 message: res.data.message, 377 message: res.data.message,
......
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>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 13:14:26 4 * @LastEditTime: 2023-06-16 10:38:23
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
12 </div> 12 </div>
13 </template> 13 </template>
14 <script> 14 <script>
15 import axios from 'axios'
16 import { mapGetters } from 'vuex' 15 import { mapGetters } from 'vuex'
16 import { getIdCardInfo } from '@/utils/operation.js'
17 import addQlr from './dialog/addQlr.vue' 17 import addQlr from './dialog/addQlr.vue'
18 export default { 18 export default {
19 components: { 19 components: {
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
195 195
196 // 身份证读取 196 // 身份证读取
197 readClick (row) { 197 readClick (row) {
198 axios.post(this.BASE_API.IDCARDURL).then(res => { 198 getIdCardInfo().then(res => {
199 if (res.data.code == 0) { 199 if (res.data.code == 0) {
200 let data = res.data.IDCardInfo 200 let data = res.data.IDCardInfo
201 row.sqrmc = data.name 201 row.sqrmc = data.name
......