Skip to content

F
founder_vue
Commit 8b3452c2 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 93e45487 d3b56a11
Showing with 1225 additions and 670 deletions
public/JsonData/CODE_XZQH.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-24 17:21:02
* @LastEditTime: 2021-11-26 11:10:49
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......@@ -14,12 +14,7 @@
<script>
import zoom from "./utils/autosize";
export default {
mounted() {
//所在单位数据
this.$store.dispatch("publicData/_getList");
},
};
export default {};
</script>
<style lang="scss">
......
src/assets/img/rybj/dqtzpic.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="26px" height="22px" viewBox="0 0 26 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>编组 125</title>
<desc>Created with Sketch.</desc>
<defs>
<rect id="path-1" x="0" y="0" width="12" height="12" rx="2"></rect>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-125" transform="translate(0.000000, -2.000000)">
<rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="26" height="26"></rect>
<g id="编组-124" transform="translate(0.000000, 2.000000)">
<g id="编组-11备份-5">
<path d="M3,1.7 C3.77119034,1.7 4.44043424,2.13648463 4.77416321,2.77588541 L4.81997792,2.77325646 L4.81997792,2.77325646 L23.8671875,2.77325646 C24.2814011,2.77325646 24.6171875,3.1090429 24.6171875,3.52325646 C24.6171875,3.93747003 24.2814011,4.27325646 23.8671875,4.27325646 L4.9165067,4.2736777 C4.66991687,5.09866144 3.90518351,5.7 3,5.7 C1.8954305,5.7 1,4.8045695 1,3.7 C1,2.5954305 1.8954305,1.7 3,1.7 Z" id="形状结合" fill="#FFCC66"></path>
<path d="M3,9.62677471 C3.80370654,9.62677471 4.49668852,10.1008429 4.81456998,10.7846032 C4.85183703,10.7783026 4.88955551,10.7754179 4.92794775,10.7754179 L10.2082019,10.7754179 C10.6224155,10.7754179 10.9582019,11.1112044 10.9582019,11.5254179 C10.9582019,11.9396315 10.6224155,12.2754179 10.2082019,12.2754179 L4.92794775,12.2754179 L4.89296983,12.2739553 C4.62398965,13.0609122 3.87807697,13.6267747 3,13.6267747 C1.8954305,13.6267747 1,12.7313442 1,11.6267747 C1,10.5222052 1.8954305,9.62677471 3,9.62677471 Z" id="形状结合" fill="#FFAA00"></path>
<path d="M3,17 C3.85650625,17 4.58726191,17.5384022 4.87228829,18.295228 L4.93313925,18.2919996 L4.93313925,18.2919996 L10.2082019,18.2919996 C10.6224155,18.2919996 10.9582019,18.627786 10.9582019,19.0419996 C10.9582019,19.4562131 10.6224155,19.7919996 10.2082019,19.7919996 L4.93313925,19.7919996 L4.83965491,19.7859547 C4.53427955,20.4998096 3.82555264,21 3,21 C1.8954305,21 1,20.1045695 1,19 C1,17.8954305 1.8954305,17 3,17 Z" id="形状结合" fill="#FFCC66"></path>
<polygon id="矩形备份-54" fill-opacity="0" fill="#FFFFFF" transform="translate(13.000000, 3.500000) scale(1, -1) translate(-13.000000, -3.500000) " points="0 0 26 0 26 7 0 7"></polygon>
<polygon id="矩形备份-67" fill-opacity="0" fill="#FFFFFF" transform="translate(6.000000, 18.500000) scale(1, -1) translate(-6.000000, -18.500000) " points="0 15 12 15 12 22 0 22"></polygon>
</g>
<g id="编组-123" transform="translate(13.000000, 9.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<rect stroke="#055FE7" x="0.5" y="0.5" width="11" height="11" rx="2"></rect>
<path d="M5.96924486,4.24924179 C7.01418954,4.24924179 7.86030297,4.89715774 7.86138358,5.6973298 L7.86138358,8.46193668 C7.86138358,8.74741688 7.55881428,8.97911097 7.18600568,8.97911097 C6.81319708,8.97911097 6.51062778,8.74741688 6.51062778,8.46193668 L6.51062778,5.6973298 C6.50954718,5.46894564 6.26749174,5.28359037 5.96924486,5.28359037 C5.6753204,5.28359037 5.43542617,5.46398076 5.42894254,5.68905501 L5.43326496,5.77263038 C5.44839342,6.10527688 5.45703826,6.43875086 5.45919947,6.77222484 C5.45919947,7.09328664 5.44947403,7.36138979 5.42678133,7.56494959 C5.35113901,8.2418273 5.10800296,8.83181973 4.74924222,9.33492688 C4.6071901,9.5356077 4.44037631,9.72541447 4.25108349,9.9017499 C4.14194242,10.0027023 4.05117163,10.0738655 3.98849656,10.1168944 C3.71078117,10.308042 3.28394234,10.2898375 3.03432267,10.0771754 C2.78518666,9.86488934 2.80792417,9.53814823 3.08511108,9.34733906 C3.08403048,9.34816654 3.09051411,9.34320166 3.10456197,9.33161696 C3.1348189,9.30762007 3.16939825,9.27783083 3.20938062,9.24142176 C3.34370366,9.11574979 3.46202793,8.98053133 3.56273833,8.83761208 C3.8339701,8.45779928 4.01983409,8.00599582 4.07926735,7.47640935 C4.09763763,7.30843114 4.10628247,7.06597984 4.10628247,6.77222484 C4.10520186,6.45116304 4.09763763,6.13010125 4.08142856,5.80903945 L4.07710614,5.71884425 L4.07710614,5.6973298 C4.07710614,4.89715774 4.92430018,4.24924179 5.96924486,4.24924179 Z M6,2 C8.20875421,2 10,3.59525 10,5.5625 L10,7.53125 C9.9983165,7.79 9.76262626,8 9.47222222,8 C9.18181818,8 8.94612795,7.79 8.94612795,7.53125 L8.94612795,5.5625 C8.94612795,4.11275 7.62626263,2.9375 5.99915825,2.9375 C4.37205387,2.9375 3.05218855,4.11275 3.05218855,5.5625 L3.05218855,7.25 C3.05218855,7.50875 2.81649832,7.71875 2.52609428,7.71875 C2.23569024,7.71875 2,7.50875 2,7.25 L2,5.5625 C2,3.59525 3.79040404,2 6,2 Z" id="形状结合备份" fill="#055FE7" fill-rule="nonzero" mask="url(#mask-2)"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/rybj/dqxhtz.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="26px" height="23px" viewBox="0 0 26 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>编组 15备份</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-15备份">
<g id="编组-116备份-16" transform="translate(1.000000, 1.000000)" fill="#FFAA00">
<path d="M3.31918664,10 L10.25,10 C10.6642136,10 11,10.3357864 11,10.75 C11,11.1642136 10.6642136,11.5 10.25,11.5 L3.31918664,11.5 C2.90497307,11.5 2.56918664,11.1642136 2.56918664,10.75 C2.56918664,10.3357864 2.90497307,10 3.31918664,10 Z" id="矩形备份-785"></path>
<path d="M2,4.7 C3.1045695,4.7 4,3.8045695 4,2.7 C4,1.5954305 3.1045695,0.7 2,0.7 C0.8954305,0.7 0,1.5954305 0,2.7 C0,3.8045695 0.8954305,4.7 2,4.7 Z" id="椭圆形" opacity="0.6"></path>
<path d="M2,12.5018148 C3.1045695,12.5018148 4,11.6063843 4,10.5018148 C4,9.39724531 3.1045695,8.50181481 2,8.50181481 C0.8954305,8.50181481 0,9.39724531 0,10.5018148 C0,11.6063843 0.8954305,12.5018148 2,12.5018148 Z" id="椭圆形备份-37"></path>
<path d="M2,20.3 C3.1045695,20.3 4,19.4045695 4,18.3 C4,17.1954305 3.1045695,16.3 2,16.3 C0.8954305,16.3 0,17.1954305 0,18.3 C0,19.4045695 0.8954305,20.3 2,20.3 Z" id="椭圆形备份-38" opacity="0.6"></path>
</g>
<path d="M19.4992603,8 C21.5628629,8 23.4691653,9.43603703 24.9112672,11.241 C25.0140319,11.3749148 25.0286834,11.551779 24.9492172,11.6991111 L24.9098922,11.7592593 L24.8587421,11.8227778 C23.4111403,13.6064815 21.5213378,15 19.5000853,15 C17.4395076,15 15.5398052,13.5683704 14.0894534,11.7584815 C13.9859807,11.6246566 13.971097,11.4473551 14.0509533,11.2998519 L14.0905534,11.2394444 L14.1428034,11.1761852 C15.6514554,9.35074075 17.4791077,8 19.4989853,8 L19.4992603,8 Z M19.5009103,8.83403704 C17.9158082,8.83403704 16.3653563,9.8957037 15.0610296,11.3742593 L14.9535045,11.4976667 L15.0621296,11.6234074 C16.3265812,13.0581482 17.7904081,14.0837778 19.32216,14.1579259 L19.4992603,14.1623333 C21.0824373,14.1623333 22.6196892,13.1107778 23.9432659,11.6228889 L24.0524411,11.4976667 L23.9432659,11.3732222 C22.6689143,9.94081482 21.1968374,8.91259259 19.6763605,8.83818519 L19.5009103,8.83403704 Z M19.4824852,9.75492593 C19.8922671,9.75717464 20.2862901,9.90406031 20.5868866,10.1666296 L20.6847868,10.2586667 L20.7744369,10.3564074 C21.038647,10.6726209 21.1816924,11.0637624 21.180347,11.4662963 C21.180347,12.411037 20.4207864,13.1779259 19.4822102,13.1779259 C18.545009,13.1779259 17.7854581,12.411037 17.7854581,11.4662963 C17.7854581,10.5594074 18.484784,9.81662963 19.3705601,9.75855556 L19.4824852,9.75492593 L19.4824852,9.75492593 Z" id="形状备份-5" fill="#055FE7" fill-rule="nonzero" transform="translate(19.500000, 11.500000) scale(1, -1) translate(-19.500000, -11.500000) "></path>
<path d="M4.75,2.77325646 L23.7972096,2.77325646 C24.2114231,2.77325646 24.5472096,3.1090429 24.5472096,3.52325646 C24.5472096,3.93747003 24.2114231,4.27325646 23.7972096,4.27325646 L4.75,4.27325646 C4.33578644,4.27325646 4,3.93747003 4,3.52325646 C4,3.1090429 4.33578644,2.77325646 4.75,2.77325646 Z" id="矩形备份-68" fill="#FFCC66"></path>
<path d="M4.86316133,18.5316528 L24.25,18.5316528 C24.6642136,18.5316528 25,18.8674393 25,19.2816528 C25,19.6958664 24.6642136,20.0316528 24.25,20.0316528 L4.86316133,20.0316528 C4.44894776,20.0316528 4.11316133,19.6958664 4.11316133,19.2816528 C4.11316133,18.8674393 4.44894776,18.5316528 4.86316133,18.5316528 Z" id="矩形备份-789" fill="#FFCC66"></path>
<polygon id="矩形备份-53" fill-opacity="0" fill="#FFFFFF" transform="translate(13.500000, 3.500000) scale(1, -1) translate(-13.500000, -3.500000) " points="0 0 27 0 27 7 0 7"></polygon>
<polygon id="矩形备份-55" fill-opacity="0" fill="#FFFFFF" transform="translate(13.000000, 19.500000) scale(1, -1) translate(-13.000000, -19.500000) " points="0 16 26 16 26 23 0 23"></polygon>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/rybj/qbtzxh.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="20px" viewBox="0 0 24 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>编组 14备份</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-14备份">
<g id="编组-116备份-17">
<g id="编组-116备份-3" fill="#FFAA00">
<g id="编组-116备份">
<path d="M3.74464736,2 L23.25,2 C23.6642136,2 24,2.33578644 24,2.75 C24,3.16421356 23.6642136,3.5 23.25,3.5 L3.74464736,3.5 C3.3304338,3.5 2.99464736,3.16421356 2.99464736,2.75 C2.99464736,2.33578644 3.3304338,2 3.74464736,2 Z" id="矩形"></path>
<path d="M3.74464736,10 L16.1623558,10 C16.5765693,10 16.9123558,10.3357864 16.9123558,10.75 C16.9123558,11.1642136 16.5765693,11.5 16.1623558,11.5 L3.74464736,11.5 C3.3304338,11.5 2.99464736,11.1642136 2.99464736,10.75 C2.99464736,10.3357864 3.3304338,10 3.74464736,10 Z" id="矩形备份-17"></path>
<path d="M3.75,17.2866027 L10.2607221,17.2866027 C10.6749356,17.2866027 11.0107221,17.6223891 11.0107221,18.0366027 C11.0107221,18.4508162 10.6749356,18.7866027 10.2607221,18.7866027 L3.75,18.7866027 C3.33578644,18.7866027 3,18.4508162 3,18.0366027 C3,17.6223891 3.33578644,17.2866027 3.75,17.2866027 Z" id="矩形备份-788"></path>
<path d="M2,4.7 C3.1045695,4.7 4,3.8045695 4,2.7 C4,1.5954305 3.1045695,0.7 2,0.7 C0.8954305,0.7 0,1.5954305 0,2.7 C0,3.8045695 0.8954305,4.7 2,4.7 Z" id="椭圆形"></path>
<path d="M2,12.6267747 C3.1045695,12.6267747 4,11.7313442 4,10.6267747 C4,9.52220521 3.1045695,8.62677471 2,8.62677471 C0.8954305,8.62677471 0,9.52220521 0,10.6267747 C0,11.7313442 0.8954305,12.6267747 2,12.6267747 Z" id="椭圆形备份-39"></path>
<path d="M2,20 C3.1045695,20 4,19.1045695 4,18 C4,16.8954305 3.1045695,16 2,16 C0.8954305,16 0,16.8954305 0,18 C0,19.1045695 0.8954305,20 2,20 Z" id="椭圆形备份-40"></path>
</g>
</g>
<path d="M21.0295433,19.7890625 L21.0295433,7.98009023 L19.4982933,7.98009023 L19.4982933,19.7890625 L21.0295433,19.7890625 Z M23.8264183,19.7890625 L23.8264183,7.99974266 L22.2951683,7.99974266 L22.2951683,19.7890625 L23.8264183,19.7890625 Z" id="all" fill="#055FE7" fill-rule="nonzero"></path>
<path d="M15.0566406,19.9414062 C15.9316406,19.9414062 16.59375,19.5566406 17.0429687,18.7871094 L16.9989014,18.8132477 L16.9989014,19.7890625 L18.2089844,19.7890625 L18.2089844,15.6171875 C18.2089844,13.9765625 17.4277344,13.15625 15.8652344,13.15625 C15.0214844,13.15625 14.2773437,13.3574219 13.6328125,13.7597656 L13.6328125,15.1654704 C14.2734375,14.6420329 15.033261,14.2710239 15.8073593,14.3634535 C16.5622841,14.4535938 16.9094963,14.6782838 16.9989014,15.6171875 L15.1503906,15.9394531 C13.7167969,16.1386719 13,16.84375 13,18.0546875 C13,18.6328125 13.1855469,19.0917969 13.5566406,19.4316406 C13.9277344,19.7714844 14.4277344,19.9414062 15.0566406,19.9414062 Z M15.2425532,19.0213561 C14.8831782,19.0213561 14.6962545,19.0425882 14.4775045,18.8472757 C14.2587545,18.6519632 14.0666402,18.4419271 14.0666402,18.1333333 C14.0666402,17.7817708 14.2070446,17.5131268 14.4082165,17.3178143 C14.6093884,17.1225018 14.8635277,17.0234375 15.3947777,16.953125 L16.9123558,16.7480469 L16.9123558,17.3178143 C16.8215862,17.8604081 16.5883939,18.2068481 16.2493242,18.5270619 C15.9102545,18.8472757 15.7425532,19.0213561 15.2425532,19.0213561 Z" id="a" fill="#055FE7" fill-rule="nonzero"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/rybj/编组 4.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="29px" viewBox="0 0 22 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>编组 4</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#FCE4D7" offset="0%"></stop>
<stop stop-color="#FCE4D7" offset="100%"></stop>
</linearGradient>
<linearGradient x1="53.8067501%" y1="-1.42322511%" x2="48.8720636%" y2="95.9519752%" id="linearGradient-2">
<stop stop-color="#FFAA00" offset="0%"></stop>
<stop stop-color="#FCE4D7" offset="100%"></stop>
</linearGradient>
<linearGradient x1="56.7706477%" y1="0%" x2="46.2364861%" y2="93.8375919%" id="linearGradient-3">
<stop stop-color="#FFAA00" offset="0%"></stop>
<stop stop-color="#FCE4D7" offset="100%"></stop>
</linearGradient>
<linearGradient x1="45.0985319%" y1="0%" x2="52.6731926%" y2="97.0965943%" id="linearGradient-4">
<stop stop-color="#FFAB01" offset="0%"></stop>
<stop stop-color="#FCE4D7" offset="100%"></stop>
</linearGradient>
<linearGradient x1="28.6181587%" y1="0%" x2="60.7576328%" y2="88.5206718%" id="linearGradient-5">
<stop stop-color="#FFAB01" offset="0%"></stop>
<stop stop-color="#FCE4D7" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-6">
<stop stop-color="#FFAA00" offset="0%"></stop>
<stop stop-color="#FCE4D7" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-4" fill-rule="nonzero">
<g id="编组-21">
<g id="icon-test-2" fill="url(#linearGradient-1)">
<path d="M15.7023111,2.65616488 C15.5280617,3.64202495 14.2760476,12.0443879 14.2760476,12.0443879 C14.2631402,12.166815 14.2566865,12.2827985 14.2244181,12.3987821 C14.1792423,12.6629668 14.0308077,12.8562727 13.7920215,12.9722562 C13.6048647,12.8176115 13.5661426,12.6243056 13.5661426,12.3923385 C13.5855037,10.8716655 13.4112543,2.01181189 13.4112543,1.76051423 C13.4757911,-0.378737697 10.7458839,-0.655809482 10.4748293,1.41256361 C10.4748293,1.41256361 10.339302,10.9554314 10.3715704,12.2634679 C10.3973851,12.8949339 9.80364642,12.6243056 9.86818323,12.1410409 L8.44191967,4.02219322 C8.31284604,2.25666603 5.78300297,2.08269072 5.87980819,4.24127323 L6.7058794,12.7209586 C7.08664659,15.3821364 6.00888182,16.3486659 5.97015973,16.37444 C5.93789132,16.3937706 5.89916924,16.4002141 5.86044715,16.4131012 C5.52485572,16.37444 5.29897687,16.1811341 5.18281061,15.8331835 L5.15699589,15.8138529 L5.13118116,15.7494176 L5.11182012,15.7365306 C4.82140446,15.0406293 4.52453512,14.3447281 4.24057314,13.6359398 C3.85980595,12.7209586 3.58229765,11.5417926 2.82076326,10.8523349 C2.23993194,10.4012878 1.31060183,10.0597807 0.613604255,10.3690702 C0.510345354,10.4141749 0.329642278,10.5301584 0.245744421,10.6332549 C0.14248552,10.755682 0.0714950257,11.206729 0.00695821278,11.2325032 C-0.0704859628,11.2647208 0.523252716,12.4503303 0.561974804,12.5469833 C0.98791777,13.577948 0.981464088,14.6024693 1.18152821,15.6527647 C1.23961134,15.949167 1.29769447,16.2326824 1.42031442,16.5097541 C1.62683222,16.9930189 1.80753529,17.6180413 2.08504359,18.0819754 L2.51744024,19.3706814 L2.53680128,19.390012 L2.56906969,19.5446567 L2.58197705,19.5639873 C2.64006018,19.8023979 2.71750436,20.034365 2.80785589,20.2598885 L2.8401243,20.3049932 L2.82721694,20.350098 L2.85303166,20.3694285 C2.89820743,20.6142827 2.9433832,20.8462498 2.99501265,21.0846604 C3.33060408,22.6182205 3.9437038,24.0486841 4.82785814,25.3567207 C5.64102198,26.8516196 8.00306934,26.944514 7.94498621,28.8646859 L16.98014,29 C17.3092778,28.136567 17.5416103,28.4689456 18.0320901,27.8503668 C19.9294724,25.4727042 20.0972681,21.4261675 20.2263417,18.6490061 C20.3812301,16.3937706 21.7171421,8.04295587 21.9688357,6.62537929 C22.2915197,4.78252974 20.0133702,4.18328147 19.5164368,6.20654985 L17.851387,13.8356892 L17.6964986,14.0612128 L17.6706839,14.0676563 C17.5738787,14.1771963 17.4770735,14.1771963 17.3867219,14.0740998 C17.1931115,13.8550198 17.1608431,13.4941822 17.1672968,13.2751021 C17.1672968,13.2751021 17.9998217,4.61499797 18.1482563,3.15231668 C18.3483205,1.16126595 15.9991805,0.94218593 15.7023111,2.65616488 Z" id="路径"></path>
</g>
<g id="icon-test-2备份-5" transform="translate(14.000000, 1.000000)" fill="url(#linearGradient-2)">
<path d="M1.8125181,1.41844471 C1.62242785,2.36909549 0.834877506,7.34962236 0.799675608,7.46146363 C2.39658854,7.74921569 2.16857769,7.67590404 3.58029065,8 C3.58029065,8 4.01216858,3.30731947 4.17409731,1.8968768 C4.39234908,-0.0230649801 2.13637556,-0.23432071 1.8125181,1.41844471 Z" id="路径"></path>
</g>
<g id="icon-test-2备份-7" transform="translate(18.000000, 4.000000)" fill="url(#linearGradient-3)">
<path d="M3.32331231,6.43282995 C3.72599237,3.96176219 3.72208823,4.0976005 3.97950211,2.66230422 C4.3095199,0.79641905 1.97959428,0.189680167 1.47136688,2.23823941 L0.731333367,5.85822345 C1.36953804,5.96888756 2.23353102,6.16042307 3.32331231,6.43282995 Z" id="路径"></path>
</g>
<g id="icon-test-2备份-4" transform="translate(5.000000, 2.000000)" fill="url(#linearGradient-4)">
<path d="M4.36268616,7.2906189 L3.47790575,2.00880932 C3.34589863,0.306336671 0.758559133,0.138574768 0.857564472,2.22006505 L1.4381146,7.85822345 C1.50598395,7.8431543 3.71413939,7.40571729 4.36268616,7.2906189 Z" id="路径"></path>
</g>
<g id="icon-test-2备份" transform="translate(0.000000, 10.000000)" fill="url(#linearGradient-5)">
<path d="M5.6728859,6.21371671 C5.64120419,6.23206567 5.60318615,6.23818199 5.5651681,6.25041463 C5.23567833,6.21371671 5.20709992,5.89940588 5.09304577,5.56912463 L5.0677004,5.55077567 L5.04235504,5.48961248 L5.02334601,5.47737984 C4.73821064,4.81681735 4.44673892,4.15625485 4.16793989,3.48345972 C3.79409574,2.61494237 3.52163305,1.49565592 2.77394473,0.841209744 C2.20367399,0.413067387 1.29124079,0.0889024594 0.606915894,0.38248579 C0.505534428,0.425300026 0.328116862,0.535393775 0.245744421,0.633254885 C0.144362955,0.749464953 0.0746631966,1.17760731 0.0112997802,1.20207259 C-0.0647363194,1.23265418 0.518207111,2.35805695 0.556225161,2.44980174 C0.974423709,3.42841285 0.968087367,4.40090763 1.16451396,5.39786769 C1.22154103,5.67921838 1.2667594,6.09208623 1.38714989,6.35508796 C1.58991283,6.81381191 1.66386051,7.32680585 1.9363232,7.76718085 C4.45271037,6.71522791 5.69823127,6.19740653 5.6728859,6.21371671 Z" id="路径"></path>
</g>
<path d="M13.5233164,8.96988647 C13.5416539,7.51457394 13.3710982,1.92534157 13.3710982,1.68484501 C13.4322234,-0.362459052 10.7682398,-0.627621928 10.5115143,1.35184977 C10.5115143,1.35184977 10.364045,7.75067175 10.3946075,9.00248718 C11.5731852,8.99593857 12.4340382,8.96005587 13.5233164,8.96988647 Z" id="路径" fill="url(#linearGradient-6)"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/rybj/编组 6.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="28px" viewBox="0 0 20 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>编组 6</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="46.1371407%" y1="25.6919524%" x2="52.8414537%" y2="100%" id="linearGradient-1">
<stop stop-color="#FFAB01" offset="0%"></stop>
<stop stop-color="#FCE4D7" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-6" fill-rule="nonzero">
<g id="编组-19" transform="translate(9.000000, 0.000000)">
<path d="M5.49926026,0 C7.56286289,0 9.46916534,1.43603703 10.9112672,3.241 C11.0140319,3.37491478 11.0286834,3.55177902 10.9492172,3.69911111 L10.9098922,3.75925926 L10.8587421,3.82277778 C9.41114025,5.60648148 7.52133784,7 5.50008526,7 C3.43950764,7 1.53980521,5.56837037 0.0894533547,3.75848149 C-0.0140192909,3.62465656 -0.0289030128,3.44735508 0.0509533033,3.29985185 L0.0905533571,3.23944445 L0.142803422,3.17618518 C1.65145535,1.35074075 3.47910768,0 5.49898526,0 L5.49926026,0 Z" id="形状备份-6" fill="#FFFFFF" transform="translate(5.500000, 3.500000) scale(1, -1) translate(-5.500000, -3.500000) "></path>
<path d="M5.49926026,0 C7.56286289,0 9.46916534,1.43603703 10.9112672,3.241 C11.0140319,3.37491478 11.0286834,3.55177902 10.9492172,3.69911111 L10.9098922,3.75925926 L10.8587421,3.82277778 C9.41114025,5.60648148 7.52133784,7 5.50008526,7 C3.43950764,7 1.53980521,5.56837037 0.0894533547,3.75848149 C-0.0140192909,3.62465656 -0.0289030128,3.44735508 0.0509533033,3.29985185 L0.0905533571,3.23944445 L0.142803422,3.17618518 C1.65145535,1.35074075 3.47910768,0 5.49898526,0 L5.49926026,0 Z M5.50091026,0.83403704 C3.91580824,0.83403704 2.36535626,1.8957037 1.06102959,3.37425926 L0.953504457,3.49766667 L1.06212959,3.62340741 C2.32658121,5.05814815 3.79040807,6.08377778 5.32216003,6.15792593 L5.49926026,6.16233333 C7.08243729,6.16233333 8.61968925,5.11077778 9.94326594,3.62288889 L10.0524411,3.49766667 L9.94326594,3.37322222 C8.66891432,1.94081482 7.19683744,0.912592592 5.67636049,0.838185192 L5.50091026,0.83403704 Z M5.48248524,1.75492593 C5.89226709,1.75717464 6.28629013,1.90406031 6.58688665,2.16662963 L6.68478678,2.25866666 L6.77443689,2.35640741 C7.038647,2.67262093 7.18169243,3.06376243 7.18034695,3.4662963 C7.18034695,4.41103703 6.42078644,5.17792593 5.48221024,5.17792593 C4.54500904,5.17792593 3.78545807,4.41103705 3.78545807,3.4662963 C3.78545807,2.55940741 4.48478396,1.81662963 5.37056009,1.75855556 L5.48248524,1.75492593 L5.48248524,1.75492593 Z" id="形状备份-2" fill="#055FE7" transform="translate(5.500000, 3.500000) scale(1, -1) translate(-5.500000, -3.500000) "></path>
</g>
<g id="编组-22">
<g id="icon-test-2备份-2" fill="#FCE4D7">
<path d="M11.1410424,9.57776868 C10.6591128,9.78951403 10.5928019,10.2365401 10.5607431,10.3539734 C10.5158606,10.6214604 10.4883747,10.8196478 10.2511391,10.9370812 C10.0651976,10.7805034 9.83745087,10.1276706 9.83745087,9.89280389 C9.84699665,9.1287169 9.033841,8.45862547 8.23997161,8.44764543 C7.43414619,8.43650002 6.64747336,9.0951797 6.6636226,9.76232241 C6.6892697,10.4016817 6.09712923,10.3821094 6.16124698,9.89280389 L4.74424486,1.67247063 C4.61600938,-0.115125647 2.10259386,-0.291275645 2.19877048,1.89428915 L3.01947758,10.4799706 C3.39777226,13.1744131 3.00030683,13.2254174 2.96183619,13.2515137 C2.92977731,13.2710859 2.89130667,13.27761 2.85283602,13.2906581 C1.61025263,12.8723931 0.512844377,14.7899213 0.277797319,15.5168186 C0.196460627,15.7683573 0.196460627,16.3141063 0.277797319,17.1540655 C0.322679738,17.4019803 0.367562158,17.636847 0.418856353,17.8782377 C0.752268615,19.4309674 1.30112208,21.6690362 2.17953515,22.9934233 C2.98741871,24.5070084 4.2665703,26.0558259 4.20886433,28 L13.2270222,28 C13.5540227,27.1257741 13.7848466,26.4248074 14.2721414,25.7984963 C16.1572031,23.391113 16.3239092,19.2939945 16.4521447,16.4821186 C16.5547331,14.9598347 16.4835397,13.52614 16.2385645,12.1810347 C15.9270913,11.5555964 15.4831125,11.2467041 14.9066282,11.2543579 C14.6482001,11.2156969 14.3607063,11.3225867 14.0441468,11.5750272 L13.7220675,12.0913889 C13.6258908,12.2022981 13.5406538,12.2241603 13.466597,12.0913889 C13.3925402,11.9586174 13.3720725,11.1593308 13.334945,10.9370812 C13.334945,10.9370812 13.2437986,9.96611478 12.5003377,9.64359666 C11.809494,9.34390419 11.1410424,9.57776868 11.1410424,9.57776868 Z" id="路径"></path>
</g>
<g id="icon-test-2备份-3" transform="translate(2.000000, 0.000000)" fill="url(#linearGradient-1)">
<path d="M3.6427491,6.87689887 L2.72158842,1.59282917 C2.58958131,-0.109643473 0.00224180425,-0.277405376 0.101247142,1.8040849 L0.726222525,7.42876332 C0.794091869,7.41369418 2.99420233,6.99199726 3.6427491,6.87689887 Z" id="路径"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/Cascader.vue
<!--
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-11-22 16:46:14
* @LastEditTime: 2021-11-26 14:05:08
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
-->
<template>
<el-cascader
v-model="form[id]"
ref="cascader"
placeholder="请选择"
:clearable="clearable"
:options="options"
:props="props"
:show-all-levels="false"
@change="change"
filterable
>
</el-cascader>
<div :style="{ width: width + 'rem' }">
<el-cascader
v-model="form[id]"
ref="cascader"
:placeholder="placeholder"
@focus="placeholder = '请输入'"
@blur="placeholder = '请选择'"
:clearable="clearable"
:options="options"
:props="props"
:show-all-levels="false"
@change="change"
filterable
>
</el-cascader>
</div>
</template>
<script>
export default {
......@@ -26,6 +30,7 @@ export default {
return {
options: [],
casVal: null,
placeholder: "请选择",
};
},
props: {
......@@ -45,6 +50,11 @@ export default {
},
form: Object,
id: String,
width: {
type: [String, Number],
default: 16.5,
},
codeName: String,
},
methods: {
change(val) {
......@@ -52,10 +62,6 @@ export default {
if (!newVal) newVal = "";
this.$set(this.form, this.id, newVal);
this.$refs.cascader.dropDownVisible = false;
setTimeout(() => {
// this.$refs.cascader.computePresentContent();
}, 200);
console.log(this.casVal);
},
getTreeData(data) {
if (data && data.length > 0) {
......@@ -68,13 +74,21 @@ export default {
},
},
mounted() {
let unidata = this.$store.state.publicData.unitData;
let unicode = this.$store.state.publicData.unitCode;
// if (this.form[this.id]) {
// this.casVal = this.form[this.id];
// }
if (this.options.length <= 0) {
this.options = this.getTreeData(unidata.filter((i) => i.code == unicode));
let self = this;
if (!this.codeName) {
let unidata = this.$store.state.publicData.unitData;
let unicode = this.$store.state.publicData.unitCode;
if (this.options.length <= 0) {
this.options = this.getTreeData(
unidata.filter((i) => i.code == unicode)
);
}
} else {
this.$axios.get(`JsonData/${this.codeName}.json`).then((res) => {
if (res.data.code == 0 && res.data.message == "success") {
this.options = self.getTreeData(res.data.ret);
}
});
}
},
};
......@@ -82,8 +96,6 @@ export default {
<style lang="scss" scoped>
.el-cascader /deep/ {
.el-input__inner {
width: 264px;
}
width: 100% !important;
}
</style>
src/components/ImageEditor.vue
......@@ -215,8 +215,8 @@ export default {
},
methods: {
// click () {
// console.log(this.$refs.editor.editorInstance._graphics.canvasImage)
// console.log(this.$refs.editor.loadImageFromURL, 123)
// //console.log(this.$refs.editor.editorInstance._graphics.canvasImage)
// //console.log(this.$refs.editor.loadImageFromURL, 123)
// },
......
src/components/SelectCode.vue
<!--
* @Author: your name
* @Date: 2021-11-25 10:15:01
* @LastEditTime: 2021-11-25 11:31:33
* @LastEditTime: 2021-11-26 15:57:33
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\SelectCode.vue
-->
<template>
<div :style="{ width: width + 'px' }">
<div :style="{ width: width + 'rem' }">
<el-select
v-model="value"
filterable
:class="{ multiple: multiple }"
popper-class="popperClass"
:multiple="multiple"
default-first-option
......@@ -20,15 +21,23 @@
@focus="placeholder = '请输入'"
@blur="placeholder = '请选择'"
:clearable="clearable"
collapse-tags
@change="change"
>
<el-option
v-for="item in options"
:key="item.id"
:label="item.name"
:value="item.code"
>
</el-option>
<el-checkbox-group v-model="checkList" @change="checkChange">
<el-option
ref="option"
v-for="item in options"
:key="item.id"
:label="item.name"
:value="item.code"
>
<div class="options" v-if="multiple" @click.stop="() => {}">
<el-checkbox :label="item.code">{{ item.name }}</el-checkbox>
</div>
<div class="options" v-else>{{ item.name }}</div>
</el-option>
</el-checkbox-group>
</el-select>
</div>
</template>
......@@ -40,6 +49,7 @@ export default {
placeholder: "请选择",
options: [],
value: [],
checkList: [],
};
},
props: {
......@@ -62,7 +72,7 @@ export default {
//宽度设置
width: {
type: [String, Number],
default: 264,
default: 16.5,
},
},
watch: {
......@@ -81,7 +91,23 @@ export default {
change(val) {
let newVal = val;
if (!newVal && !this.multiple) newVal = "";
if (newVal.length <= 0 && this.multiple) newVal = "";
if (this.multiple) {
if (newVal.length <= 0) {
newVal = "";
this.checkList = [];
} else {
this.checkList = newVal;
}
}
this.$set(this.form, this.id, newVal);
},
checkChange(val) {
let newVal = val;
this.value = val;
if (newVal.length <= 0) {
newVal = "";
this.checkList = [];
}
this.$set(this.form, this.id, newVal);
},
getOptions() {
......@@ -100,13 +126,52 @@ export default {
<style>
</style>
<style lang="scss" scoped>
.options {
padding: 0 10px;
}
.el-select /deep/ {
width: 100% !important;
.popperClass {
.el-select-dropdown__item {
padding: 0 10px;
padding: 0px;
box-sizing: border-box;
}
}
}
</style>
\ No newline at end of file
.multiple /deep/ {
.el-tag {
max-width: 100%;
position: relative;
padding-right: 15px;
}
.el-select__tags-text {
display: inline-block;
max-width: 100%;
text-overflow: ellipsis;
overflow: hidden;
}
.el-icon-close {
position: absolute;
top: 50%;
transform: translateY(-50%);
right: 0;
width: 14px;
height: 14px !important;
&::before {
height: 14px;
width: 14px;
}
}
}
.el-checkbox-group /deep/ {
.is-checked {
.el-checkbox__inner {
background-color: #055fe7 !important;
border-color: #055fe7 !important;
}
.el-checkbox__label {
color: #055fe7 !important;
}
}
}
</style>
src/components/swiper.vue
<!--
* @Author: your name
* @Date: 2021-11-13 16:32:50
* @LastEditTime: 2021-11-24 16:14:47
* @LastEditTime: 2021-11-25 17:14:09
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\swiper.vue
......@@ -31,11 +31,28 @@
<div class="wenzi">
<p>
<span>查询ID：</span>
<span>{{ item.qqid }}</span>
<span
:class="{
looked: item.clickLog == '1',
Identification: item.affirmStatus == '1',
Bizhong:
item.affirmStatus == '2' || item.affirmStatus == '3',
}"
>{{ item.qqid }}</span
>
</p>
<p>
<span>源条码号：</span>
<span :class="{ del: souceDel }">{{ item.barcode }}</span>
<span
:class="{
del: souceDel,
looked: item.clickLog == '1',
Identification: item.affirmStatus == '1',
Bizhong:
item.affirmStatus == '2' || item.affirmStatus == '3',
}"
>{{ item.barcode }}</span
>
</p>
</div>
</div>
......@@ -99,7 +116,7 @@ export default {
this.$emit("qiehuan", index);
},
btnQiehuan(type) {
console.log(this.carIndex);
//console.log(this.carIndex);
if (type == "left") {
this.$refs.carousel.prev();
this.$emit("prev", this.carIndex);
......@@ -122,6 +139,22 @@ export default {
};
</script>
<style lang="scss" scoped>
.carItem {
.wenzi {
.Bizhong {
color: #ff0039 !important;
}
}
}
.wenzi {
.Identification {
color: #055fe7 !important;
}
}
.looked {
color: #999 !important;
}
.del {
text-decoration: none; /*没有文本装饰*/
text-decoration: underline red; /*红色下划线*/
......
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-24 17:23:34
* @LastEditTime: 2021-11-26 11:31:17
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -12,12 +12,13 @@ import Vue from "vue";
import axios from "axios";
import NProgress from "nprogress";
import "nprogress/nprogress.css";
import router from "../router";
import store from "../store";
import { Loading } from 'element-ui';
import { Loading, MessageBox } from 'element-ui';
var loadingIndex = 0;
var loadingBoo;
var timer;
var tiTimer;
// Full config: https://github.com/axios/axios#request-config
// axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
// axios.defaults.headers.common['Authorization'] = AUTH_TOKEN;
......@@ -37,20 +38,29 @@ const _axios = axios.create(config);
var loading;
_axios.interceptors.request.use(
function (config) {
if (config.url.indexOf('/login/myLoginForm') <= 0) {
if (localStorage.getItem("token")) {
config.headers.Authorization = localStorage.getItem("token");
} else {
if (tiTimer) clearTimeout(tiTimer)
tiTimer = setTimeout(() => {
MessageBox.confirm('没有登陆账号，请登录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
router.replace("/login1");
}).catch(() => {
});
}, 200);
}
}
loadingBoo = (!config.loading && typeof config.loading == 'boolean') ? config.loading : true;
// debugger;
// 进度条
if (loadingBoo) {
if (!loading) loading = Loading.service({ fullscreen: true, text: '正在加载...' });
loadingIndex++;
}
NProgress.start();
console.log('请求前' + loadingIndex)
// 在发送请求之前做些什么
// 判断是否存在token,如果存在将每个页面header添加token
if (localStorage.getItem("token")) {
config.headers["Authorization"] = localStorage.getItem("token");
}
return config;
},
function (error) {
......@@ -64,8 +74,8 @@ _axios.interceptors.request.use(
_axios.interceptors.response.use(
function (response) {
NProgress.done();
if (loadingBoo) loadingIndex--;
console.log('请求后' + loadingIndex)
loadingIndex--;
// console.log('请求后' + loadingIndex)
if (loadingIndex <= 0) {
clearTimeout(timer)
timer = setTimeout(() => {
......@@ -73,17 +83,11 @@ _axios.interceptors.response.use(
loading = null
}, 500);
}
if (response.data.code === 401) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userName”的信息。
this.$router.push("/login1");
}
return response;
},
function (error) {
NProgress.done();
if (loadingBoo) loadingIndex--;
loadingIndex--;
if (loadingIndex == 0) {
clearTimeout(timer)
setTimeout(() => {
......
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-12 17:41:04
* @LastEditTime: 2021-11-26 11:32:58
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -10,7 +10,7 @@ import leftMenu from './leftMenu'
export default [
{
path: "/",
// redirect: "/login1"
redirect: "/login1",
meta: {
title: "登录",
auth: "5"
......@@ -47,8 +47,8 @@ export default [
component: () => import("@/views/login/Login1.vue")
},
{
path: "/Home/Home",
name: "Home",
path: "/gateway",
name: "gateway",
meta: {
title: "首页",
auth: "5"
......
src/store/index.js
......@@ -15,6 +15,7 @@ import zwbj from "./modules/zwbj"
import layout from "./modules/layout"
import publicData from "./modules/publicData"
import rydaxx from "./modules/rydaxx";
import ajdaxx from "./modules/ajdaxx";
Vue.use(Vuex);
......@@ -24,7 +25,8 @@ const store = new Vuex.Store({
zwbj,
layout,
publicData,
rydaxx
rydaxx,
ajdaxx
},
getters,
plugins: [
......
src/store/modules/ajdaxx.js 0 → 100644
/*
* @Author: your name
* @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-11-11 23:22:08
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/
import { SET_AJINFO } from "./mutations-types";
const state = {
// 当前的指位
ajInfo: {}
};
const mutations = {
[SET_AJINFO] (state, content) {
state.ajInfo = content
},
};
const actions = {
};
export default {
namespaced: true,
state,
mutations,
actions
};
src/store/modules/mutations-types.js
......@@ -16,3 +16,4 @@ export const SET_AUTOZYHZ = 'setAutoZyhz'
// 人员档案信息
export const SET_RYINFO = 'setRyInfo'
export const SET_AJINFO = 'setAjInfo'
src/store/modules/publicData.js
/*
* @Author: your name
* @Date: 2021-11-02 15:41:31
* @LastEditTime: 2021-11-25 10:45:50
* @LastEditTime: 2021-11-25 17:24:01
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\store\modules\user.js
......@@ -18,7 +18,6 @@ const mutations = {
//直接修改单位所有json数据
resetUnitData(state, res) {
state.unitData = res;
console.log(state.unitData)
},
//直接修改用户所在单位code
resetUnitCode(state, res) {
......
src/utils/util.js
......@@ -57,19 +57,19 @@ export default {
* @param {Object} arr
* @param {Object} i
*/
inArray: function(elem, arr) {
inArray: function (elem, arr) {
return arr == null ? -1 : arr.indexOf(elem);
},
/**
* 获取某天日期
* @param {Object} day
*/
getDay: function(day) {
getDay: function (day) {
var today = new Date();
var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
today.setTime(targetday_milliseconds);
const doHandleMonth = function(month) {
const doHandleMonth = function (month) {
var m = month;
if (month.toString().length == 1) {
m = "0" + month;
......@@ -99,7 +99,7 @@ export default {
* @param {Object} obj
*/
deepClone(obj) {
const isObject = function(obj) {
const isObject = function (obj) {
return typeof obj == "object";
};
......@@ -114,5 +114,66 @@ export default {
cloneObj[key] = isObject(obj[key]) ? this.deepClone(obj[key]) : obj[key];
}
return cloneObj;
},
//一个数组减去另一个数组中的值
arrToValue(souceArr, targetArr, key) {
if (!key) {
return souceArr.filter((x) => targetArr.indexOf(x) < 0);
} else {
souceArr.filter((x) => {
return targetArr.findIndex(y => y[key] == x[key]) < 0
});
}
},
// 转换字符串，undefined,null等转化为""
praseStrEmpty(str) {
return !str || str === 'undefined' || str === 'null' ? '' : str
},
/**
* 构造树型结构数据
* @param {*} data 数据源
* @param {*} id id字段 默认 'id'
* @param {*} parentId 父节点字段 默认 'parentId'
* @param {*} children 孩子节点字段 默认 'children'
* @param {*} rootId 根Id 默认 0
*/
handleTree(data = [], id = 'id', parentId = 'parentId', children = 'children', rootId) {
rootId =
rootId ||
Math.min.apply(
Math,
data.map(item => {
return item[parentId]
})
) ||
0
//对源数据深度克隆
const cloneData = JSON.parse(JSON.stringify(data))
//循环所有项
const treeData = cloneData.filter(father => {
let branchArr = cloneData.filter(child => {
//返回每一项的子级数组
return father[id] === child[parentId]
})
branchArr.length > 0 && (father.children = branchArr)
//返回第一层
return father[parentId] === rootId
})
// 排序
treeData
.sort((a, b) => {
return Number(a.code) - Number(b.code)
})
.forEach(m => {
if (m.children && m.children.length) {
m.children.sort((c, d) => {
return Number(c.code) - Number(d.code)
})
}
})
return treeData !== '' ? treeData : data
}
};
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -547,7 +547,7 @@ export default {
methods: {
// 单击行抽屉
handle (row, event, column) {
console.log(row, event, column)
//console.log(row, event, column)
// this.drawer = true
// this.$bus.emit('isBlur', true)
},
......@@ -569,14 +569,14 @@ export default {
},
// 获取全部人员列表请求
search () {
// console.info("请求===>", this.reqParam);
// //console.info("请求===>", this.reqParam);
this.$axios
.post("/api/personstore/allperson", this.reqParam)
.then((response) => {
if (response.data.code === 0) {
this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total;
console.info("查询结果===>", this.tableDate);
//console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(response.data.message);
......@@ -597,7 +597,7 @@ export default {
this.isShowXzry = true;
},
closeXzry (val) {
console.log("新增人员关闭", val);
//console.log("新增人员关闭", val);
// 增加毛玻璃
this.$bus.emit('isBlur', val)
this.isShowXzry = val;
......@@ -640,15 +640,15 @@ export default {
},
// 搜索方式
searchStyle (val) {
// console.log(val, '搜索方式')
// //console.log(val, '搜索方式')
this.reqParam.page.searchOptions = val;
// console.log(this.reqParam.page.searchOptions)
// //console.log(this.reqParam.page.searchOptions)
},
//滚动平面等筛选条件
searchCheckList (val) {
console.log(val, "筛选条件");
//console.log(val, "筛选条件");
this.reqParam.page.checkboxQuery = val;
console.log(this.reqParam.page.checkboxQuery);
//console.log(this.reqParam.page.checkboxQuery);
this.search();
},
// 复制条码号 获取选中条码值
......@@ -691,7 +691,7 @@ export default {
},
// 添加到队列
isShowTjddlBtn () {
console.log("添加到队列");
//console.log("添加到队列");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！");
this.selectBoo = true;
......@@ -702,13 +702,13 @@ export default {
},
closeTjddl (val) {
this.$bus.emit('isBlur', val)
console.log("添加到队列关闭", val);
//console.log("添加到队列关闭", val);
this.isShowTjddl = val;
},
// 导出FPTX
isShowDcftpxBtn () {
// 多行
console.log("导出FPTX");
//console.log("导出FPTX");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据！");
......@@ -729,13 +729,13 @@ export default {
},
closeDcftpx (val) {
this.$bus.emit('isBlur', val)
console.log("导出FPTX关闭", val);
//console.log("导出FPTX关闭", val);
this.isShowDcftpx = val;
},
// 关注
isShowGzBtn () {
// 多行
console.log("关注");
//console.log("关注");
let newarr = [];
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要关注的数据！");
......@@ -761,7 +761,7 @@ export default {
},
isShowGzBtn1 (val) {
// 单行
console.log(val, 123);
//console.log(val, 123);
let rowVal = [];
rowVal.push(val);
this.rowData = rowVal;
......@@ -769,7 +769,7 @@ export default {
},
closeGz (val) {
this.$bus.emit('isBlur', val)
console.log("关注关闭", val);
//console.log("关注关闭", val);
this.isShowGz = val;
if (val == false) {
this.search();
......@@ -791,13 +791,13 @@ export default {
},
// 更改条码操作
isShowGgrytmBtn (val) {
console.log("更改条码", val);
//console.log("更改条码", val);
this.rowData = val;
this.isShowGgrytm = true;
},
closeGgrytm (val) {
this.$bus.emit('isBlur', val)
console.log("更改条码关闭", val);
//console.log("更改条码关闭", val);
this.isShowGgrytm = val;
if (val == false) {
this.search();
......@@ -806,13 +806,13 @@ export default {
//复制条码列表操作
isShowFztmBtn (val) {
console.log("复制条码", val);
//console.log("复制条码", val);
this.rowData = val;
this.isShowFztm = true;
},
closeFztm (val) {
this.$bus.emit('isBlur', val)
console.log("closeFztm复制条码关闭", val);
//console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val;
if (val == false) {
this.search();
......@@ -830,7 +830,7 @@ export default {
}
},
isShowFcxBtn1 (val) {
console.log("单行人员发查询数据", val);
//console.log("单行人员发查询数据", val);
let rowVal = [];
rowVal.push(val);
this.rowData = rowVal;
......@@ -838,7 +838,7 @@ export default {
},
closeFcx (val) {
this.$bus.emit('isBlur', val)
console.log("发查询关闭", val);
//console.log("发查询关闭", val);
this.isShowFcx = val;
// this.search()
},
......@@ -871,11 +871,11 @@ export default {
},
// 单选删除
delOne (val) {
console.log("删除数据");
//console.log("删除数据");
// 将传入的psns转为数组
let psns = [];
psns.push(val);
console.info("删除接口里的psns：", psns);
//console.info("删除接口里的psns：", psns);
this.doDelete(psns);
},
// 请求删除接口
......@@ -913,7 +913,7 @@ export default {
*/
handleClick (row) {
this.closeSelected();
console.log(row);
//console.log(row);
this.$store.commit('rydaxx/setRyInfo', row)
this.$router.push("/ryzwbj/" + row.id + "/" + row.ysxtAsjxgrybh);
},
......@@ -924,7 +924,7 @@ export default {
*/
handleSelectionChange (val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
// if (this.multipleSelection.length) {
// this.isShowTip = true;
// } else {
......@@ -938,7 +938,7 @@ export default {
*/
handleSizeChange (pageSize) {
this.reqParam.page.pageSize = pageSize;
console.log("每页条数", this.reqParam.page.pageSize);
//console.log("每页条数", this.reqParam.page.pageSize);
},
/**
* @description: currentPage 改变时会触发
......@@ -947,7 +947,7 @@ export default {
*/
handleCurrentChange (page) {
this.reqParam.page.currPage = page;
console.log("当前页", this.reqParam.page.currPage);
//console.log("当前页", this.reqParam.page.currPage);
this.search();
},
/**
......@@ -964,7 +964,7 @@ export default {
} else {
this.$refs.multipleTable.clearSelection();
}
// console.log(this.multipleSelection);
// //console.log(this.multipleSelection);
},
},
computed: {
......
src/views/AllPersonnelBase/dclb.vue
......@@ -743,7 +743,7 @@ export default {
watch: {
showType (newNum, oldNum) {
// ...
console.log(newNum, 123);
//console.log(newNum, 123);
this.search();
this.clear()
},
......@@ -767,7 +767,7 @@ export default {
reqParam.limit = this.pageSize;
} else if (this.showType == 2) {
// console.log('bizhong bizhong ')
// //console.log('bizhong bizhong ')
reqUrl = "/api/record/export/case";
reqParam = {
taskNumber: null,
......@@ -780,21 +780,21 @@ export default {
reqParam.offSet = this.currPage1;
reqParam.limit = this.pageSize;
}
// console.info("请求===>", this.reqParam);
// //console.info("请求===>", this.reqParam);
this.$axios.post(reqUrl, reqParam).then((response) => {
// console.info("查询结果===>", response);
// //console.info("查询结果===>", response);
if (response.data.code === 0) {
if (this.showType == 1) {
this.tableDate1 = response.data.ret.personExportRecordChildren;
this.total1 = response.data.ret.total;
console.log('total', this.total1)
//console.log('total', this.total1)
} else if (this.showType == 2) {
this.tableDate2 = response.data.ret.caseExportRecordChildren;
this.total2 = response.data.ret.total;
}
// this.reqParam.page.total1 = response.data.ret.total1;
console.info("查询结果1===>", this.tableDate1);
console.info("查询结果2===>", this.tableDate2);
//console.info("查询结果1===>", this.tableDate1);
//console.info("查询结果2===>", this.tableDate2);
} else {
this.$message.error(response.data.message);
}
......@@ -858,7 +858,7 @@ export default {
* @return {*}
*/
handleClick (row) {
console.log(row);
//console.log(row);
},
/**
* @description: 单选事件
......@@ -867,7 +867,7 @@ export default {
*/
handleSelectionChange (val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
// if (this.multipleSelection.length) {
// this.isShowTip = true;
// } else {
......@@ -881,7 +881,7 @@ export default {
*/
handleSizeChange1 (pageSize) {
this.pageSize = pageSize;
console.log("每页条数", this.pageSize);
//console.log("每页条数", this.pageSize);
},
/**
* @description: currentPage 改变时会触发
......@@ -890,7 +890,7 @@ export default {
*/
handleCurrentChange1 (page) {
this.currPage1 = page;
console.log("当前页", this.currPage1);
//console.log("当前页", this.currPage1);
this.search();
},
/**
......@@ -900,7 +900,7 @@ export default {
*/
handleSizeChange2 (pageSize) {
this.pageSize = pageSize;
console.log("每页条数", this.pageSize);
//console.log("每页条数", this.pageSize);
},
/**
* @description: currentPage 改变时会触发
......@@ -909,7 +909,7 @@ export default {
*/
handleCurrentChange2 (page) {
this.currPage1 = page;
console.log("当前页", this.currPage1);
//console.log("当前页", this.currPage1);
this.search();
},
/**
......@@ -925,7 +925,7 @@ export default {
} else {
this.$refs.multipleTable.clearSelection();
}
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
},
disabledDate (a) {
if (a.getTime() > new Date().getTime()) {
......@@ -942,7 +942,7 @@ export default {
* @return {*}
*/
Tpage1 () {
console.log(this.total1, this.pageSize, 1112223333)
//console.log(this.total1, this.pageSize, 1112223333)
return (
Math.floor(this.total1 / this.pageSize) + 1
);
......@@ -955,7 +955,7 @@ export default {
},
mounted () {
this.search();
console.log(this.$route.query.id, 'this.$route.query.id')
//console.log(this.$route.query.id, 'this.$route.query.id')
this.showType = this.$route.query.id || "1";
},
};
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -667,7 +667,7 @@ export default {
watch: {
showType (newNum, oldNum) {
// ...
console.log(newNum, 123);
//console.log(newNum, 123);
// this.search();
this.clear()
},
......@@ -696,7 +696,7 @@ export default {
reqParam.selectParam.sex = this.sex
reqParam.selectParam.idcard = this.idcard
} else if (this.showType == 2) {
// console.log('bizhong bizhong ')
// //console.log('bizhong bizhong ')
reqUrl = "/api/mycase/list";
reqParam = {
selectParam: {
......@@ -713,21 +713,21 @@ export default {
reqParam.selectParam.caseType = this.caseType
reqParam.selectParam.collectunitName = this.collectunitName
}
// console.info("请求===>", this.reqParam);
// //console.info("请求===>", this.reqParam);
this.$axios.post(reqUrl, reqParam).then((response) => {
// console.info("查询结果===>", response);
// //console.info("查询结果===>", response);
if (response.data.code === 0) {
if (this.showType == 1) {
this.tableDate1 = response.data.ret.list;
this.total1 = response.data.ret.total;
console.log('total', this.total1)
//console.log('total', this.total1)
} else if (this.showType == 2) {
this.tableDate2 = response.data.ret.list;
this.total2 = response.data.ret.total;
}
// this.reqParam.page.total1 = response.data.ret.total1;
console.info("查询结果1===>", this.tableDate1);
console.info("查询结果2===>", this.tableDate2);
//console.info("查询结果1===>", this.tableDate1);
//console.info("查询结果2===>", this.tableDate2);
} else {
this.$message.error(response.data.message);
}
......@@ -780,7 +780,7 @@ export default {
// 导出FPTX
isShowDcftpxBtn () {
// 多行
console.log("导出FPTX");
//console.log("导出FPTX");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要导出FPTX的数据！");
// this.selectBoo = true;
......@@ -800,7 +800,7 @@ export default {
},
closeDcftpx (val) {
this.$bus.emit('isBlur', val)
console.log("导出FPTX关闭", val);
//console.log("导出FPTX关闭", val);
this.isShowDcftpx = val;
},
// 导出
......@@ -817,30 +817,30 @@ export default {
},
closeDcfptx1 (val) {
this.$bus.emit('isBlur', val)
console.log('导出FPTX关闭', val)
//console.log('导出FPTX关闭', val)
this.isShowDcfptx1 = val
},
// 添加到队列
isShowTjddlBtn () {
console.log("添加到队列");
//console.log("添加到队列");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！");
this.isSelected = true;
} else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
//console.log('人员人员')
} else if (this.showType == 2) {
this.type = 'aj'
console.log('案件案件')
//console.log('案件案件')
}
this.rowData = this.multipleSelection;
console.log('添加到队列', this.rowData)
//console.log('添加到队列', this.rowData)
this.isShowTjddl = true;
}
},
closeTjddl (val) {
console.log("添加到队列关闭", val);
//console.log("添加到队列关闭", val);
this.isShowTjddl = val;
},
// 多选删除
......@@ -872,11 +872,11 @@ export default {
},
// 单选删除
delOne (val) {
console.log("删除数据");
//console.log("删除数据");
// 将传入的psns转为数组
let psns = [];
psns.push(val);
console.info("删除接口里的psns：", psns);
//console.info("删除接口里的psns：", psns);
this.doDelete(psns);
},
// 请求删除接口
......@@ -894,12 +894,12 @@ export default {
},
//复制条码列表操作
isShowFztmBtn (val) {
console.log("复制条码", val);
//console.log("复制条码", val);
this.rowData = val;
this.isShowFztm = true;
},
closeFztm (val) {
console.log("closeFztm复制条码关闭", val);
//console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val;
// this.search();
},
......@@ -912,31 +912,31 @@ export default {
} else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
//console.log('人员人员')
} else if (this.showType == 2) {
this.type = 'aj'
console.log('案件案件')
//console.log('案件案件')
}
this.rowData = this.multipleSelection;
this.isShowFcx = true;
}
},
isShowFcxBtn1 (val) {
console.log("单行人员发查询数据", val);
//console.log("单行人员发查询数据", val);
let rowVal = [];
rowVal.push(val);
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
//console.log('人员人员')
} else if (this.showType == 2) {
this.type = 'aj'
console.log('案件案件')
//console.log('案件案件')
}
this.rowData = rowVal;
this.isShowFcx = true;
},
closeFcx (val) {
console.log("发查询关闭", val);
//console.log("发查询关闭", val);
this.isShowFcx = val;
this.search();
},
......@@ -976,7 +976,7 @@ export default {
* @return {*}
*/
handleClick (row) {
console.log(row);
//console.log(row);
if (this.showType == 1) {
this.$router.push("/ryzwbj/" + row.followPerson.personId + "/" + row.followPerson.barcode);
} else if (this.showType == 2) {
......@@ -990,7 +990,7 @@ export default {
*/
handleSelectionChange (val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
// if (this.multipleSelection.length) {
// this.isShowTip = true;
// } else {
......@@ -1004,7 +1004,7 @@ export default {
*/
handleSizeChange1 (pageSize) {
this.pageSize = pageSize;
console.log("每页条数", this.pageSize);
//console.log("每页条数", this.pageSize);
},
/**
* @description: currentPage 改变时会触发
......@@ -1013,7 +1013,7 @@ export default {
*/
handleCurrentChange1 (page) {
this.currPage1 = page;
console.log("当前页", this.currPage1);
//console.log("当前页", this.currPage1);
this.search();
},
/**
......@@ -1023,7 +1023,7 @@ export default {
*/
handleSizeChange2 (pageSize) {
this.pageSize = pageSize;
console.log("每页条数", this.pageSize);
//console.log("每页条数", this.pageSize);
},
/**
* @description: currentPage 改变时会触发
......@@ -1032,7 +1032,7 @@ export default {
*/
handleCurrentChange2 (page) {
this.currPage1 = page;
console.log("当前页", this.currPage1);
//console.log("当前页", this.currPage1);
this.search();
},
/**
......@@ -1048,7 +1048,7 @@ export default {
} else {
this.$refs.multipleTable.clearSelection();
}
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
},
disabledDate (a) {
if (a.getTime() > new Date().getTime()) {
......@@ -1065,7 +1065,7 @@ export default {
* @return {*}
*/
Tpage1 () {
console.log(this.total1, this.pageSize, 1112223333)
//console.log(this.total1, this.pageSize, 1112223333)
return (
Math.floor(this.total1 / this.pageSize) + 1
);
......@@ -1078,7 +1078,7 @@ export default {
},
mounted () {
this.search();
console.log(this.$route.query.id, 'this.$route.query.id')
//console.log(this.$route.query.id, 'this.$route.query.id')
this.showType = this.$route.query.id || "1";
},
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
......@@ -156,7 +156,7 @@ export default {
}
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
//console.log(this.dialogVisible, 123)
targtOptions = [];
this.targts = targtOptions
this.$emit('closeDcfptx1', this.dialogVisible);
......@@ -181,7 +181,7 @@ export default {
this.$axios
.get("/api/export/case", { params: reqParam })
.then((response) => {
console.log(response.data)
//console.log(response.data)
// var elink = document.createElement('a');
// elink.download = "案件.fptx";
// elink.style.display = 'none';
......@@ -281,7 +281,7 @@ export default {
for (let i = 0; i < arr.length; i++) {
targtOptions.push(arr[i].hpseqno)
}
console.info("指位返回列表===>", arr);
//console.info("指位返回列表===>", arr);
} else {
this.$message.error(response.data.message);
}
......
src/views/AllPersonnelBase/modules/dcftpx.vue
......@@ -420,7 +420,7 @@ export default {
this.dialogVisible = newVal;
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
//console.log(this.dialogVisible, 123)
this.$emit('closeDcftpx', this.dialogVisible);
},
//滚动指纹右手
......@@ -445,7 +445,7 @@ export default {
},
//滚动指纹左手
gdzwzscheckAll (val) {
console.log(val, 123)
//console.log(val, 123)
if (val == true) {
if (this.gdzwyscheckAll == true) {
this.gdzwCheckAll = true
......@@ -564,7 +564,7 @@ export default {
let arr = []
for (let i = 0; i < this.checkedGdyss.length; i++) {
// console.log(this.checkedGdyss[i])
// //console.log(this.checkedGdyss[i])
if (this.checkedGdyss[i] == '拇') {
arr.push(1)
} else if (this.checkedGdyss[i] == '食') {
......@@ -578,7 +578,7 @@ export default {
}
}
for (let i = 0; i < this.checkedGdzss.length; i++) {
// console.log(this.checkedGdzss[i])
// //console.log(this.checkedGdzss[i])
if (this.checkedGdzss[i] == '拇') {
arr.push(6)
} else if (this.checkedGdzss[i] == '食') {
......@@ -592,7 +592,7 @@ export default {
}
}
for (let i = 0; i < this.checkedPmyss.length; i++) {
// console.log(this.checkedPmyss[i])
// //console.log(this.checkedPmyss[i])
if (this.checkedPmyss[i] == '拇') {
arr.push(11)
} else if (this.checkedPmyss[i] == '食') {
......@@ -606,7 +606,7 @@ export default {
}
}
for (let i = 0; i < this.checkedPmzss.length; i++) {
// console.log(this.checkedPmzss[i])
// //console.log(this.checkedPmzss[i])
if (this.checkedPmzss[i] == '拇') {
arr.push(16)
} else if (this.checkedPmzss[i] == '食') {
......@@ -619,7 +619,7 @@ export default {
arr.push(20)
}
}
console.log('导出序号', arr)
//console.log('导出序号', arr)
reqParam.barcode = barcode
reqParam.imgNo = arr.toString()
......@@ -631,7 +631,7 @@ export default {
.get("/api/export/person/", { params: reqParam })
.then((response) => {
console.log(response)
//console.log(response)
if (response.status === 200) {
if (response.data.code) {
......@@ -790,12 +790,12 @@ export default {
},
// 人像
rxhandleCheckAllChange (val) {
console.log('renxiang', val);
//console.log('renxiang', val);
this.checkedrxs = val ? rxOptions : [];
this.rxisIndeterminate = false;
},
handleCheckedrxsChange (value) {
console.log("人像", value);
//console.log("人像", value);
let checkedCount = value.length;
this.rxcheckAll = checkedCount === this.rxs.length;
this.rxisIndeterminate = checkedCount > 0 && checkedCount < this.rxs.length;
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -596,7 +596,7 @@ export default {
this.searchsytsArr()
this.bcxh = this.rowData.length;
if (this.type == 'aj') {
console.log('案件数据开始获取')
//console.log('案件数据开始获取')
this.getHpseqno()
this.fingerscountArr()
}
......@@ -722,7 +722,7 @@ export default {
this.checkedCities = cityOptions
this.checkAll = true
}
console.info("指位返回列表===>", arr);
//console.info("指位返回列表===>", arr);
} else {
this.$message.error(response.data.message);
}
......@@ -786,7 +786,7 @@ export default {
},
// 指位单选
handleCheckAllChange (val) {
console.log(val, 11111)
//console.log(val, 11111)
this.checkedCities = val ? cityOptions : [];
this.isIndeterminate = false;
},
......@@ -818,7 +818,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
// alert('submit!');
// console.log(this.ruleForm.destPsnDataType)
// //console.log(this.ruleForm.destPsnDataType)
this.search()
} else {
return false;
......@@ -981,7 +981,7 @@ export default {
this.reqParam = queryRequest
}
console.log('发请求', this.reqParam)
//console.log('发请求', this.reqParam)
this.$axios
.post(reqUrl, this.reqParam)
.then(response => {
......@@ -1016,14 +1016,14 @@ export default {
},
// 获取发查询数据(总条数)
searchZTS () {
// console.info("发查询条数请求===>", this.reqParam);
// //console.info("发查询条数请求===>", this.reqParam);
this.$axios
.get("/api/querylimit/select", { params: { userId: 1234 } })
.then(response => {
if (response.data.code === 0) {
this.byzsArr = response.data.ret
this.byzs = this.byzsArr[0].level1
console.info("111发查询总条数返回列表===>", this.byzsArr);
//console.info("111发查询总条数返回列表===>", this.byzsArr);
// this.colorDiv()
} else {
this.$message.error(response.data.message);
......@@ -1032,14 +1032,14 @@ export default {
},
// 获取发查询剩余条数
searchsytsArr () {
console.info("发查询条数请求===>", this.reqParam);
//console.info("发查询条数请求===>", this.reqParam);
this.$axios
.get("/api/querylimit/surplus", { params: { account: 22 } })
.then(response => {
if (response.data.code === 0) {
this.sytsArr = response.data.ret
this.syts = this.sytsArr[0].level1
console.info("222发查询剩余条数返回列表===>", this.sytsArr);
//console.info("222发查询剩余条数返回列表===>", this.sytsArr);
} else {
// this.$message.error(response.data.message);
this.$message.error('获取发查询剩余条数失败');
......@@ -1060,7 +1060,7 @@ export default {
this.bcxh = response.data.ret;
// this.sytsArr = response.data.ret
// this.syts = this.sytsArr[0].level1
console.info("555发查询剩余条数返回列表===>", response);
//console.info("555发查询剩余条数返回列表===>", response);
} else {
// this.$message.error(response.data.message);
this.$message.error('555获取发查询剩余条数失败');
......
src/views/AllPersonnelBase/modules/fztm.vue
......@@ -113,7 +113,7 @@ export default {
this.dialogVisible = newVal;
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
//console.log(this.dialogVisible, 123)
this.$emit('closeFztm', this.dialogVisible);
}
},
......@@ -129,7 +129,7 @@ export default {
// Object.assign(this.reqParam, this.rowData);
// delete this.reqParam.id;
// this.reqParam.ysxtAsjxgrybh = 'R' + this.ruleForm.barcode;
// console.log(this.reqParam, '人员复制数据')
// //console.log(this.reqParam, '人员复制数据')
newReqParams.id = this.rowData.id
newReqParams.barcode = 'R' + this.ruleForm.barcode
} else if (this.type == 'aj') {
......@@ -139,7 +139,7 @@ export default {
// delete caseBase.id;
// caseBase.ysxtAsjbh = 'A' + this.ruleForm.barcode
// this.reqParam.caseBase = caseBase
// console.log(this.reqParam, '案件复制数据')
// //console.log(this.reqParam, '案件复制数据')
newReqParams.id = this.rowData.id
newReqParams.barcode = 'A' + this.ruleForm.barcode
}
......@@ -155,7 +155,7 @@ export default {
}
});
} else {
console.log('error submit!!');
//console.log('error submit!!');
return false;
}
});
......
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -110,7 +110,7 @@ export default {
},
mounted () {
this.dialogVisible = this.isShowGgrytm;
// console.log('更改条码类型', this.type)
// //console.log('更改条码类型', this.type)
this.type == 'ry' ? this.title = '更改人员条码' : this.title = '更改案件条码'
},
watch: {
......@@ -118,7 +118,7 @@ export default {
this.dialogVisible = newVal;
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
//console.log(this.dialogVisible, 123)
this.$emit('closeGgrytm', this.dialogVisible);
}
},
......@@ -151,7 +151,7 @@ export default {
}
});
} else {
console.log('error submit!!');
//console.log('error submit!!');
return false;
}
});
......
src/views/AllPersonnelBase/modules/gz.vue
......@@ -150,7 +150,7 @@ export default {
this.dialogVisible = newVal;
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
//console.log(this.dialogVisible, 123)
this.$emit('closeGz', this.dialogVisible);
}
},
......@@ -179,7 +179,7 @@ export default {
personDo.xm = this.rowData[i].xm
newReqParams.personDoList.push(personDo)
}
console.log('关注人员ID', newReqParams);
//console.log('关注人员ID', newReqParams);
this.reqParam = newReqParams
} else if (this.type == 'aj') {
reqUrl = '/api/mycase/mycaseAdd'
......@@ -199,7 +199,7 @@ export default {
caseBase.ajlbdm = this.rowData[i].ajlbdm
newReqParams.caseBaseList.push(caseBase)
}
console.log('关注案件ID', newReqParams);
//console.log('关注案件ID', newReqParams);
this.reqParam = newReqParams
}
......
src/views/AllPersonnelBase/modules/ryxxk.vue
......@@ -38,9 +38,9 @@ export default {
isShowRyxxk (newVal, oldVal) {
this.drawer = newVal;
},
drawer (val) {
console.log(this.dialogVisible, 123)
this.$emit('closeRyxxk', this.drawer);
dialogVisible (val) {
//console.log(this.dialogVisible, 123)
this.$emit('closeGz', this.dialogVisible);
}
},
methods: {
......
src/views/AllPersonnelBase/modules/tjddl.vue
......@@ -159,18 +159,18 @@ export default {
},
mounted () {
this.dialogVisible = this.isShowTjddl;
// console.log('添加到队列类型', this.type)
// //console.log('添加到队列类型', this.type)
// this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
},
watch: {
isShowTjddl (newVal, oldVal) {
this.dialogVisible = newVal;
// console.log('添加到队列类型', this.type)
// //console.log('添加到队列类型', this.type)
this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
console.log('数据数据', this.rowData)
//console.log('数据数据', this.rowData)
},
dialogVisible (val) {
console.log(this.dialogVisible, 123)
//console.log(this.dialogVisible, 123)
this.$emit('closeTjddl', this.dialogVisible);
}
},
......@@ -206,7 +206,7 @@ export default {
newReqParams.replacecpr = this.ruleForm.replacecpr
newReqParams.managetype = this.ruleForm.managetype
newReqParams.manageorgCpr = this.ruleForm.manageorgCpr
console.log(this.reqParam, '人员添加到队列')
//console.log(this.reqParam, '人员添加到队列')
} else if (this.type == 'aj') {
reqUrl = "api/case/handlecaseque/add"
newReqParams = {
......@@ -232,7 +232,7 @@ export default {
newReqParams.replacecpr = this.ruleForm.replacecpr
newReqParams.managetype = this.ruleForm.managetype
newReqParams.manageorgCpr = this.ruleForm.manageorgCpr
console.log(this.reqParam, '案件添加到队列')
//console.log(this.reqParam, '案件添加到队列')
};
this.$axios
......@@ -248,7 +248,7 @@ export default {
});
} else {
console.log('error submit!!');
//console.log('error submit!!');
return false;
}
});
......
src/views/Editor/ajzwbj.vue
......@@ -10,17 +10,20 @@
<div class="ajzwbj">
<ajzwbj-left></ajzwbj-left>
<imageEDAJ></imageEDAJ>
<ajdaxx></ajdaxx>
</div>
</template>
<script>
import ajdaxx from "./modules/ajdaxx.vue";
import ajzwbjLeft from './modules/ajzwbjLeft.vue';
import imageEDAJ from './modules/imageEdAJ.vue';
export default {
name: 'ajzwbj',
components: {
ajzwbjLeft,
imageEDAJ
imageEDAJ,
ajdaxx
},
}
</script>
......@@ -31,4 +34,4 @@ import imageEDAJ from './modules/imageEdAJ.vue';
height: calc(100% - 47px);
display: flex;
}
</style>
\ No newline at end of file
</style>
src/views/Editor/modules/ImageEditor.vue
......@@ -215,8 +215,8 @@ export default {
},
methods: {
// click () {
// console.log(this.$refs.editor.editorInstance._graphics.canvasImage)
// console.log(this.$refs.editor.loadImageFromURL, 123)
// //console.log(this.$refs.editor.editorInstance._graphics.canvasImage)
// //console.log(this.$refs.editor.loadImageFromURL, 123)
// },
......@@ -245,7 +245,7 @@ export default {
// tail: 'chevron' // triangle
// }
// });
console.log(this.$refs.editor.invoke);
//console.log(this.$refs.editor.invoke);
},
// 旋转 20 度
rotate () {
......@@ -261,7 +261,7 @@ export default {
},
},
mounted () {
console.log(document.querySelector('.tie-btn-hand'));
//console.log(document.querySelector('.tie-btn-hand'));
document.querySelector('.tie-btn-hand').classList.add('on');
},
}
......
src/views/Editor/modules/ajzwbjLeft.scss
......@@ -20,11 +20,13 @@
margin-right: 10px;
}
img {
cursor: pointer;
width: 16px;
height: 16px;
margin-right: 5px;
}
.desc {
cursor: pointer;
color: #055fe7;
font-weight: normal;
font-family: MicrosoftYaHei;
......@@ -83,7 +85,7 @@
margin-top: 5px;
.lr-hand {
width: 100%;
height: 600px;
height: 640px;
overflow: auto;
:nth-child(even) {
margin-left: 8px;
......
src/views/Editor/modules/ajzwbjLeft.vue
......@@ -11,8 +11,8 @@
<div class="title">案事件编号：</div>
<div class="asjbh">
<span>{{barcode}}</span>
<img src="@/assets/img/message.png" alt="">
<div class="desc">档案信息</div>
<img src="@/assets/img/message.png" alt="" @click="daxxChange">
<div class="desc" @click="daxxChange">档案信息</div>
</div>
<div class="ryzwbj-content">
<div class="zzw">
......@@ -157,24 +157,41 @@ export default {
},
mounted () {
let self = this
console.log(this.$route);
//console.log(this.$route);
this.barcode = this.$route.params.barcode
this.id = this.$route.params.id
self.preSeq = this.activerollFinger
// 获取案件指纹
this.getCaseFinger()
if(this.id != 'xz') {
// 不是新增就查询案件指纹，进行编辑
this.getCaseFinger()
// this.changeCaseFingerPNG()
}
},
methods: {
/**
* 打开档案信息
*/
daxxChange() {
console.log(8888)
this.$bus.emit('openAjDaxx', true)
// 降低指纹编辑按钮的优先级
$(".center").css('z-index', 9)
$(".tzdDrawing").css('z-index', 9)
$(".tzdDrawing2").css('z-index', 9)
},
/**
* 切换指纹PNG图
* @param finger
*/
changeCaseFingerPNG(finger) {
console.log(finger);
//console.log(finger);
this.$store.commit('zwbj/setSeq', finger.code)
// 指纹编辑区域发送指纹数据，替换指纹图片
this.$bus.emit('ajzwbjImage', finger.image)
console.log(finger);
this.$bus.emit('ajzwbjImage', {finger_image: finger.image, finger_dealFlag: finger.dealFlag, finger_position: finger.finger_position})
this.$bus.emit('ajzwbjTDZ')
},
/**
......@@ -195,11 +212,11 @@ export default {
loading: false,
cancelToken: source.token
}).then(res => {
console.log(res);
//console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
// 指纹编辑区域发送指纹数据，替换指纹图片
self.$bus.emit('ajzwbjImage', res.data.ret.image)
self.$bus.emit('ajzwbjImage', (res.data.ret.image))
self.$bus.emit('ajzwbjTDZ')
}
}
......@@ -223,7 +240,7 @@ export default {
barcode: self.barcode
}
}).then(res => {
// console.log(res);
console.log(res);
if (res.data.code === 0) {
// self.fingers = res.data.ret
self.fingers = []
......@@ -232,11 +249,13 @@ export default {
const element = res.data.ret[key];
self.fingers.push({
code: element.seq,
image: element.image
image: element.image,
dealFlag: element.dealFlag,
finger_position: element.fingerPosition
})
}
}
// console.log(self.fingers);
// //console.log(self.fingers);
// 自动获取第一个
if (self.fingers.length > 0) {
this.activeFinger = 0
......@@ -246,7 +265,7 @@ export default {
self.$message.error(res.data.message)
}
}).catch(err => {
console.log(err);
//console.log(err);
})
},
// /**
......@@ -263,15 +282,15 @@ export default {
* @return {*}
*/
FingersChange (fingerIndex, finger) {
console.log(fingerIndex);
//console.log(fingerIndex);
this.activeFinger = fingerIndex
let self = this
if (this.preSeq) {
// 保存当前的指位特征点信息
// 直接覆盖之前的数据
console.log(this.preSeq);
console.log(self.preTzdArr);
//console.log(this.preSeq);
//console.log(self.preTzdArr);
if (self.preTzdArr && self.preTzdArr.length >= 0) {
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
sessionStorage.setItem(`auto_tzdDom${this.preSeq}`, JSON.stringify(self.autopretzdall))
......@@ -281,24 +300,24 @@ export default {
// self.$store.commit('zwbj/setTzdall', null)
// self.$store.commit('zwbj/setAutoTzdall', null)
// 重要区域的特征保存
console.log(self.zyhz);
//console.log(self.zyhz);
if (self.zyhz && self.zyhz.length >= 0) {
sessionStorage.setItem(`zyhz_${this.preSeq}`, JSON.stringify(self.zyhz))
self.$store.commit('zwbj/setZyhz', null)
}
console.log(self.yxhz);
//console.log(self.yxhz);
if (self.yxhz && self.yxhz.length >= 0) {
console.log(self.yxhz);
//console.log(self.yxhz);
sessionStorage.setItem(`yxhz_${this.preSeq}`, JSON.stringify(self.yxhz))
self.$store.commit('zwbj/setYxhz', null)
}
if (self.autoyxhz && self.autoyxhz.length >= 0) {
console.log(self.autoyxhz);
//console.log(self.autoyxhz);
sessionStorage.setItem(`auto_yxhz_${this.preSeq}`, JSON.stringify(self.autoyxhz))
self.$store.commit('zwbj/setAutoYxhz', null)
}
if (self.autozyhz && self.autozyhz.length >= 0) {
console.log(self.autozyhz);
//console.log(self.autozyhz);
sessionStorage.setItem(`auto_zyhz_${this.preSeq}`, JSON.stringify(self.autozyhz))
self.$store.commit('zwbj/setAutoZyhz', null)
}
......@@ -307,8 +326,8 @@ export default {
// 调取获取原图接口
// this.getCaseOrigin(finger.code)
// 切换指纹PNG
console.log(finger);
// 切换指纹-- 直接贴图，不再请求接口
this.changeCaseFingerPNG(finger)
},
/**
......
src/views/Editor/modules/imageEd.scss
......@@ -979,7 +979,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
//z-index: 9999;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
}
......
src/views/Editor/modules/rydaxx.scss
......@@ -98,6 +98,37 @@
align-items: center;
justify-content: space-between;
margin-bottom: 24px;
.ma-item {
/deep/.el-form-item__content {
margin-left: 10px !important;
width: 410px;
}
/deep/.el-form-item__label {
width: 50px !important;
}
/deep/.el-radio {
margin-right: 10px;
}
/deep/ .el-radio__input.is-checked + .el-radio__label {
color: #333333;
}
/deep/ .el-radio__input.is-checked .el-radio__inner {
border: 1px solid #055fe7;
background: #055fe7;
}
/deep/ .el-radio__inner {
width: 16px;
height: 16px;
&::after {
width: 8px;
height: 8px;
}
}
}
}
/deep/ .el-form-item__label {
......@@ -218,7 +249,7 @@
width: 100%;
margin-left: 0 !important;
display: flex;
align-items: center;
//align-items: center;
margin-right: 24px;
}
/deep/.el-checkbox {
......@@ -228,6 +259,7 @@
/deep/ .el-checkbox-group {
display: flex;
align-items: center;
flex-wrap: wrap;
}
.fk {
......@@ -381,3 +413,9 @@
border-color: #055fe7;
}
}
.ajdaxx-drawer {
.content {
height: 1400px;
}
}
src/views/Editor/modules/rydaxx.vue
......@@ -34,10 +34,14 @@
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="采集信息原因：" prop="cjxxyy">
<el-select v-model="ruleForm.cjxxyy" placeholder="根据代码自动匹配">
<el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option>
</el-select>
<SelectCode
codeUrl="cjxxyydm"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="cjxxyy"
></SelectCode>
</el-form-item>
<el-form-item label="指掌纹卡编号：" prop="zzwkbh">
<el-input placeholder="请输入指掌纹卡编号" v-model="ruleForm.zzwkbh" maxlength="23" show-word-limit></el-input>
......@@ -65,12 +69,15 @@
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="性别：" prop="cjxxyy">
<el-select v-model="ruleForm.xbdm" placeholder="请选择性别">
<el-option label="男" value="1"></el-option>
<el-option label="女" value="2"></el-option>
<el-option label="未知" value="3"></el-option>
</el-select>
<el-form-item label="性别：" prop="xbdm">
<SelectCode
codeUrl="sex"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="xbdm"
></SelectCode>
</el-form-item>
<el-form-item label="出生日期：" prop="csrq">
<el-date-picker type="date" placeholder="请输入出生日期" v-model="ruleForm.csrq"></el-date-picker>
......@@ -78,21 +85,45 @@
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="国籍：" prop="gjdm">
<el-select v-model="ruleForm.gjdm" placeholder="请输入国籍">
<el-option label="中国" value="中国"></el-option>
</el-select>
<!-- <el-select v-model="ruleForm.gjdm" placeholder="请输入国籍">-->
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode
codeUrl="nationality"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="gjdm"
></SelectCode>
</el-form-item>
<el-form-item label="民族：" prop="mzdm">
<el-select v-model="ruleForm.mzdm" placeholder="请选择民族类型">
<el-option label="汉" value="汉"></el-option>
</el-select>
<!-- <el-select v-model="ruleForm.mzdm" placeholder="请选择民族类型">-->
<!-- <el-option label="汉" value="汉"></el-option>-->
<!-- </el-select>-->
<SelectCode
codeUrl="nation"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="mzdm"
></SelectCode>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="证件类型：" prop="cyzjdm" class="select">
<el-select v-model="ruleForm.cyzjdm" placeholder="请选择证件类型">
<el-option label="中国" value="中国"></el-option>
</el-select>
<!-- <el-select v-model="ruleForm.cyzjdm" placeholder="请选择证件类型">-->
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode
codeUrl="certificates"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="cyzjdm"
></SelectCode>
</el-form-item>
<el-form-item label="证件号码：" prop="zjhm" class="input2">
<el-input placeholder="请输入证件号码" v-model="ruleForm.zjhm"></el-input>
......@@ -100,9 +131,17 @@
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="户籍地行政区：" prop="hjdzXzqhdm" class="select">
<el-select v-model="ruleForm.hjdzXzqhdm" placeholder="请输入户籍地行政区">
<el-option label="中国" value="中国"></el-option>
</el-select>
<!-- <el-select v-model="ruleForm.hjdzXzqhdm" placeholder="请输入户籍地行政区">-->
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode
codeUrl="administrative"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="hjdzXzqhdm"
></SelectCode>
</el-form-item>
<el-form-item label="户籍地址：" prop="hjdzDzmc" class="input2">
<el-input placeholder="请输入户籍地址" v-model="ruleForm.hjdzDzmc"></el-input>
......@@ -110,9 +149,14 @@
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="现住址行政区：" prop="xzzXzqhdm" class="select">
<el-select v-model="ruleForm.xzzXzqhdm" placeholder="请输入现住址行政区">
<el-option label="中国" value="中国"></el-option>
</el-select>
<SelectCode
codeUrl="administrative"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="xzzXzqhdm"
></SelectCode>
</el-form-item>
<el-form-item label="现地址：" prop="xzzDzmc" class="input2">
<el-input placeholder="请输入现住址" v-model="ruleForm.xzzDzmc"></el-input>
......@@ -145,8 +189,8 @@
<div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item">
<el-form-item label="捺印单位：" prop="unitCode">
<el-input placeholder="请输入捺印单位名称" v-model="ruleForm.unitCode"></el-input>
<!-- <Cascader :form="ruleForm" id="unitCode"></Cascader>-->
<!-- <el-input placeholder="请输入捺印单位名称" v-model="ruleForm.unitCode"></el-input>-->
<Cascader :form="ruleForm" id="unitCode"></Cascader>
</el-form-item>
<el-form-item label="捺印人姓名：" prop="nyryXm">
<el-input placeholder="请输入捺印人姓名" v-model="ruleForm.nyryXm"></el-input>
......@@ -225,6 +269,7 @@
</template>
<script>
import SelectCode from "../../../components/SelectCode.vue";
import Cascader from "@/components/Cascader.vue";
import {mapState} from "vuex";
import dcftpx from "../../AllPersonnelBase/modules/dcftpx.vue";
......@@ -366,7 +411,7 @@ export default {
});
// 人员档案信息
console.log(this.ryInfo);
//console.log(this.ryInfo);
this.initData()
},
methods: {
......@@ -402,12 +447,12 @@ export default {
}
},
handleCheckAllChange(val) {
console.log(val);
//console.log(val);
this.ruleForm.logicdbtype2 = val ? this.ryljfkArr : [];
this.isIndeterminate = false;
},
handleCheckedCitiesChange(value) {
console.log(value);
//console.log(value);
let checkedCount = value.length;
this.checkAll = checkedCount === this.ryljfkArr.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.ryljfkArr.length;
......@@ -440,7 +485,7 @@ export default {
// let ryljfk = this.ryInfo.logicdbtype.split('')
// this.ruleForm.logicdbtype = ryljfk
this.ruleForm.logicdbtype = this.ryInfo.logicdbtype
this.ruleForm.unitCode = this.ryInfo.nydwGajgmc
this.ruleForm.unitCode = this.ryInfo.nydwGajgjgdm
this.ruleForm.nyryXm = this.ryInfo.nyryXm
this.ruleForm.nysj = this.ryInfo.nysj
this.ruleForm.nyryGmsfhm = this.ryInfo.nyryGmsfhm
......@@ -474,10 +519,10 @@ export default {
url: '/api/personstore/person/file',
data: JSON.stringify(self.ruleForm)
}).then(res => {
console.log(res);
//console.log(res);
})
} else {
console.log('error submit!!');
//console.log('error submit!!');
return false;
}
});
......@@ -492,6 +537,7 @@ export default {
}
},
components: {
SelectCode,
Cascader,
dcftpx
}
......
src/views/Editor/modules/ryzwbjLeft.vue
......@@ -241,9 +241,9 @@ export default {
})
},
async mounted () {
console.log(this.$store);
//console.log(this.$store);
let self = this
// console.log(this.$route);
// //console.log(this.$route);
this.id = this.$route.params.id
await this.getRollFingers()
......@@ -264,7 +264,7 @@ export default {
}
// setTimeout(() => {
// console.log(this.finger);
// //console.log(this.finger);
// }, 1000);
},
methods: {
......@@ -309,7 +309,7 @@ export default {
cancelToken: source.token,
// url: `/api/org/roll/${1}/${seq}?mnt=1`
}).then(res => {
console.log(res);
//console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
// 指纹编辑区域发送指纹数据，替换指纹图片
......@@ -346,7 +346,7 @@ export default {
cancelToken: source.token,
// url: `/api/org/plain/${1}/${seq}?mnt=1`
}).then(res => {
// console.log(res);
// //console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
// 指纹编辑区域发送指纹数据，替换指纹图片
......@@ -386,7 +386,7 @@ export default {
loading: false
// url: '/api/png/roll/1?mnt=1'
})
// console.log(res);
// //console.log(res);
if (res.data.code === 0) {
for (const key in res.data.ret) {
const element = res.data.ret[key];
......@@ -432,9 +432,9 @@ export default {
loading: false
// url: '/api/png/plain/1?mnt=1'
})
// console.log(res);
// //console.log(res);
if (res.data.code === 0) {
console.log(res);
//console.log(res);
if (res.data.ret.length > 0) {
for (const key in res.data.ret) {
const element = res.data.ret[key];
......@@ -481,7 +481,7 @@ export default {
if (this.preSeq) {
// 保存当前的指位特征点信息
// 直接覆盖之前的数据
console.log(self.preTzdArr);
//console.log(self.preTzdArr);
if (self.preTzdArr && self.preTzdArr.length >= 0) {
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
sessionStorage.setItem(`auto${this.preSeq}`, JSON.stringify(self.autopretzdall))
......@@ -490,7 +490,7 @@ export default {
self.$store.commit('zwbj/setAutoTzdall', null)
}
this.preSeq = finger.code
console.log(finger);
//console.log(finger);
this.activerollFinger = finger.code
// 平面指纹原图
if (finger.code > 10) {
......@@ -568,10 +568,10 @@ export default {
* @return {*}
*/
handlePainClick (tab, event) {
// console.log(tab, event);
// //console.log(tab, event);
},
handleRollClick (tab, event) {
// console.log(tab, event);
// //console.log(tab, event);
},
},
watch: {
......
src/views/Home.vue
......@@ -198,22 +198,17 @@ export default {
*/
logout() {
// console.log('退出登录');
// this.$router.replace('/login1')
this.$axios
.post("/login/login/userLogout")
.get("/login/login/logout")
.then((res) => {
if (res.data.code === 200) {
if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userInfor”的信息。
localStorage.removeItem("userInfo"); //删除名称为“userInfor”的信息。
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
})
.catch((err) => {
console.info(err);
});
.catch((err) => {});
},
/**
* @description: 开始搜索
......@@ -223,7 +218,7 @@ export default {
goSearch() {
this.searchTxt = "";
console.log(this.searchTxt);
//console.log(this.searchTxt);
},
handleClick({ name }) {
if (name == "/Home/htzwcj") {
......@@ -272,7 +267,7 @@ export default {
this.$store.commit("layout/resetcachePageName", cachePageName);
this.$store.commit("layout/delcachePageName", "ryzwbj");
this.$store.commit("layout/delcachePageName", "ajzwbj");
console.log(1111222222211111, this.$store.state.layout.cachePageName);
//console.log(1111222222211111, this.$store.state.layout.cachePageName);
},
/**
* @description: 调回任务管理
......@@ -302,7 +297,7 @@ export default {
return item.name != pathName;
});
this.paths = res;
console.log(pathName == this.$route.meta.title);
//console.log(pathName == this.$route.meta.title);
if (pathName == this.$route.meta.title) {
this.$router.push("/Home/htzwcj");
this.$refs.menu.activeIndex = "";
......@@ -326,20 +321,20 @@ export default {
this.isCollapse = !this.isCollapse;
},
handleOpen(key, keyPath) {
console.log(key, keyPath);
//console.log(key, keyPath);
},
handleClose(key, keyPath) {
console.log(key, keyPath);
//console.log(key, keyPath);
},
},
watch: {
$route: {
handler(newValue, oldValue) {
console.log(this.routePath, 11111111111);
console.log(newValue, 11111111111);
//console.log(this.routePath, 11111111111);
//console.log(newValue, 11111111111);
this.routePath = newValue.name;
setTimeout(() => {
console.log(1);
//console.log(1);
if (newValue.path != "/Home/htzwcj") {
if (this.paths.length == 0) {
this.paths.push({
......@@ -546,15 +541,15 @@ export default {
.el-tabs__nav-prev {
font-size: 20px !important;
cursor: pointer;
&:hover{
color: #055FE7;
&:hover {
color: #055fe7;
}
}
.el-tabs__nav-next {
font-size: 20px !important;
cursor: pointer;
&:hover{
color: #055FE7;
&:hover {
color: #055fe7;
}
}
.is-active {
......@@ -606,6 +601,7 @@ export default {
cursor: pointer;
display: flex;
img {
cursor: pointer;
object-fit: contain;
}
}
......@@ -698,6 +694,7 @@ export default {
align-items: center;
margin-left: 25px;
.icon {
cursor: pointer;
width: 100%;
height: 100%;
}
......
src/views/Home/Home.vue
......@@ -4,29 +4,17 @@
<div class="header">
<!-- 头部左侧 -->
<div class="left">
<div><img
src="../../assets/img/Home/badges.png"
alt=""
/></div>
<div><img src="../../assets/img/Home/badges.png" alt="" /></div>
<span><img
src="../../assets/img/Home/logo.svg"
alt=""
/></span>
<span><img src="../../assets/img/Home/logo.svg" alt="" /></span>
</div>
<!-- 头部右侧 -->
<div class="right">
<div>
<img
src="../../assets/img/Home/setting.svg"
alt=""
/> 系统管理
<img src="../../assets/img/Home/setting.svg" alt="" /> 系统管理
</div>
<div class="role">
<img
src="../../assets/img/Home/role.svg"
alt=""
/>用户角色
<img src="../../assets/img/Home/role.svg" alt="" />用户角色
<div class="rolelist">
<ul>
<li>姓名：xxxx</li>
......@@ -36,14 +24,8 @@
</div>
</div>
<div
style="cursor:pointer"
@click="logout"
>
<img
src="../../assets/img/Home/exit.svg"
alt=""
/>安全退出
<div style="cursor: pointer" @click="logout">
<img src="../../assets/img/Home/exit.svg" alt="" />安全退出
</div>
</div>
<!-- 主体 -->
......@@ -54,10 +36,7 @@
<div class="todoview">
<div class="todo">
<div>
<img
src="../../assets/img/Home/todoview.svg"
alt=""
/>
<img src="../../assets/img/Home/todoview.svg" alt="" />
</div>
<p>待办工作</p>
</div>
......@@ -79,66 +58,36 @@
<!-- 第一列 -->
<div class="list l1">
<div class="import_images" @click="goQBAJK">
<img
src="../../assets/img/Home/import_images.svg"
alt=""
/>
<img src="../../assets/img/Home/import_images.svg" alt="" />
<div>案件图片导入</div>
</div>
<div
@click="godrFPTX"
class="import_FTP"
>
<img
src="../../assets/img/Home/import_FTP.svg"
alt=""
/>
<div @click="godrFPTX" class="import_FTP">
<img src="../../assets/img/Home/import_FTP.svg" alt="" />
<div>FPTX导入</div>
</div>
</div>
<!-- 第二列 -->
<div
class="list l2"
@click="gosjzygl"
>
<img
src="../../assets/img/Home/query.svg"
alt=""
/>
<div class="list l2" @click="gosjzygl">
<img src="../../assets/img/Home/query.svg" alt="" />
<p>发查询</p>
</div>
<!-- 第三列 -->
<div
@click="gobdrd"
class="list l2 l3"
>
<img
src="../../assets/img/Home/comparison.svg"
alt=""
/>
<div @click="gobdrd" class="list l2 l3">
<img src="../../assets/img/Home/comparison.svg" alt="" />
<p>比对认定</p>
</div>
<!-- 第四列 -->
<div
@click="gozzwcj"
class="list l1 l4"
>
<div @click="gozzwcj" class="list l1 l4">
<div class="import_images collect">
<img
src="../../assets/img/Home/collect_new.svg"
alt=""
style="width:38px; height:38px"
style="width: 38px; height: 38px"
/>
<div>活体采集</div>
</div>
<div
@click="gosjzygl"
class="import_FTP management"
>
<img
src="../../assets/img/Home/management.svg"
alt=""
/>
<div @click="gosjzygl" class="import_FTP management">
<img src="../../assets/img/Home/management.svg" alt="" />
<div>数据资源管理</div>
</div>
</div>
......@@ -153,47 +102,50 @@ import qs from "qs";
export default {
name: "Home",
data () {
data() {
return {
userInfo: { userName: "admin", passWord: "123456" }
userInfo: { userName: "admin", passWord: "123456" },
};
},
methods: {
goQBAJK () {
goQBAJK() {
this.$router.push({
path: '/qbalk',
path: "/qbalk",
query: {
xzaj: true
}
})
xzaj: true,
},
});
},
godrFPTX () {
godrFPTX() {
this.$router.push("/drFPTX");
},
gobdrd () {
gobdrd() {
this.$router.push("/cxyrd");
},
gosjzygl () {
gosjzygl() {
this.$router.push("/AllPersonnelBaseIndex/");
},
gozzwcj () {
gozzwcj() {
// this.$router.push("/AllPersonnelBaseIndex");
},
logout () {
this.$axios.post("/login/login/userLogout").then(res => {
if (res.data.code === 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor");
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
});
}
logout() {
this.$axios
.get("/login/login/logout")
.then((res) => {
if (res.data.code == 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userInfo"); //删除名称为“userInfor”的信息。
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
})
.catch((err) => {
});
},
},
created() {
sessionStorage.setItem("crumbs", []);
},
created(){
sessionStorage.setItem('crumbs',[])
}
};
</script>
......
src/views/Home2.vue
......@@ -90,7 +90,7 @@ export default {
};
},
mounted () {
console.log(this.routes);
//console.log(this.routes);
},
methods: {
/**
......@@ -121,7 +121,7 @@ export default {
return item.name != pathName
})
this.paths = res
console.log(pathName == this.$route.meta.title);
//console.log(pathName == this.$route.meta.title);
if (pathName == this.$route.meta.title) {
this.$router.push('/Home/htzwcj')
this.$refs.menu.activeIndex = '';
......@@ -145,10 +145,10 @@ export default {
this.isCollapse = !this.isCollapse
},
handleOpen (key, keyPath) {
console.log(key, keyPath);
//console.log(key, keyPath);
},
handleClose (key, keyPath) {
console.log(key, keyPath);
//console.log(key, keyPath);
}
},
computed: {
......
src/views/SystemManage/GroupManage.vue
......@@ -74,7 +74,6 @@
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link
type="primary"
:underline="false"
......@@ -533,7 +532,6 @@
<span style="color: #055fe7">{{ userMultipleSelection.length }}</span>
项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link
type="primary"
:underline="false"
......@@ -754,7 +752,7 @@ export default {
if (i.length > num) num = i.length;
});
// if (num > 3) num = 3;
console.log(num, 22222222222);
//console.log(num, 22222222222);
if (num <= 3) {
width = num * 150;
} else if (num > 3) {
......@@ -822,12 +820,12 @@ export default {
} else {
this.$refs.multipleTable.clearSelection();
}
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
},
// 选择用户组数据
handleSelectionChange(val) {
this.multipleSelection = val;
console.info(this.multipleSelection);
//console.info(this.multipleSelection);
},
// 用户设置的清除所有选项
toggleUserSelection(rows) {
......@@ -838,12 +836,12 @@ export default {
} else {
this.$refs.userMultipleTable.clearSelection();
}
console.log(this.userMultipleSelection);
//console.log(this.userMultipleSelection);
},
// 用户设置的选择用户数据
userHandleSelectionChange(val) {
this.userMultipleSelection = val;
console.info(this.userMultipleSelection);
//console.info(this.userMultipleSelection);
if (this.userMultipleSelection.length) {
this.isShowUserTip = true;
} else {
......@@ -861,7 +859,7 @@ export default {
//
// }
// if (this.userStatus=== false)
console.info(this.userStatus);
//console.info(this.userStatus);
},
// 用户设置 删除用户
delUserDatas() {},
......@@ -971,7 +969,7 @@ export default {
// 编辑用户组
submitEditForm(formName) {
this.$refs.editFormParams.validate((valid) => {
console.info(valid);
//console.info(valid);
if (valid) {
this.$axios
.put("/security/user-groups", this.editFormParams)
......@@ -1010,13 +1008,13 @@ export default {
},
// 删除
del(id) {
console.info(id);
//console.info(id);
var usergroup = new URLSearchParams();
usergroup.append("Id", id.toString());
this.$axios
.post("/login/usergroup/deleteUserGroupById", usergroup)
.then((res) => {
console.log(res);
//console.log(res);
if (res.data === "success") {
this.search();
this.$message.success("删除成功！");
......@@ -1029,7 +1027,7 @@ export default {
},
// 搜索
search() {
console.info("搜索用户列表");
//console.info("搜索用户列表");
this.$axios.get("/security/user-groups").then((res) => {
if (res.data.code == "200") {
this.tableData = res.data.detail;
......
src/views/SystemManage/GroupPermission.vue
......@@ -321,17 +321,17 @@ export default {
funAuth() {
this.funFlag = true;
this.dataFlag = false;
console.info("功能权限");
//console.info("功能权限");
},
dataAuth() {
this.funFlag = false;
this.dataFlag = true;
console.info("数据权限");
//console.info("数据权限");
},
// 保存
save() {
this.roleMenusSelection = this.roleMenus;
console.info("roleMenusSelection====", this.roleMenusSelection);
//console.info("roleMenusSelection====", this.roleMenusSelection);
}
},
mounted() {
......@@ -345,10 +345,10 @@ export default {
this.$axios
.post("/login/usergroup/queryusergroup", usergroup)
.then(res => {
console.info(res.data);
//console.info(res.data);
this.groupData = res.data.usergroup;
this.status = res.data.usergroup.status;
console.info(res.data.usergroup.status);
//console.info(res.data.usergroup.status);
})
.catch(failResponse => {});
}
......
src/views/SystemManage/PermissionManage.vue
......@@ -651,7 +651,7 @@ export default {
},
// 获取用户信息
searchUser() {
console.info("搜索用户列表");
//console.info("搜索用户列表");
this.$axios.get("/security/users").then((res) => {
if (res.data.code == 200) {
this.userTableData = res.data.detail;
......@@ -699,7 +699,7 @@ export default {
});
},
groupEdit(id) {
console.info("用户id=====>", id);
//console.info("用户id=====>", id);
this.$router.push({
name: "GroupPermission",
params: {
......@@ -728,7 +728,7 @@ export default {
this.$axios
.post("/login/permission/add", permission)
.then((res) => {
console.log(res);
//console.log(res);
this.$message.success(res.message);
})
.catch((failResponse) => {});
......@@ -740,7 +740,7 @@ export default {
this.$axios
.post("/login/permission/deletePermissionById", permission)
.then((res) => {
console.log(res);
//console.log(res);
this.$message.success(res.message);
})
.catch((failResponse) => {});
......@@ -752,7 +752,7 @@ export default {
this.$axios
.post("/login/permission/querypermissionInfo", permission)
.then((res) => {
console.log(res);
//console.log(res);
})
.catch((failResponse) => {});
// menuId;//权限id
......@@ -771,7 +771,7 @@ export default {
this.$axios
.post("/login/permission/update", permission1)
.then((res) => {
console.log(res);
//console.log(res);
})
.catch((failResponse) => {});
},
......@@ -786,7 +786,7 @@ export default {
this.$axios
.post("/login/permission/querypermissionAll", permission)
.then((res) => {
console.log(res);
//console.log(res);
this.$message.success(res.message);
})
.catch((failResponse) => {});
......
src/views/SystemManage/RoleManage.vue
......@@ -105,17 +105,18 @@
<div
v-show="!item.edit"
class="diy-edit-title"
:title="item.name"
:title="item.value"
@click="chooseDiyRoleItem(item)"
>
{{ item.name }}
{{ item.value }}
</div>
<el-input
v-if="item.edit"
size="mini"
class="diy-edit-title"
ref="edit_input"
v-model="item.name"
:placeholder="item.name"
v-model="item.value"
></el-input>
<div class="diy-edit-btn">
<img
......@@ -157,18 +158,33 @@
<div class="menus">
<div class="div3">
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[0].id);
}
"
v-if="permissionDataList[0]"
:label="permissionDataList[0].id"
>
{{ permissionDataList[0].name }}
</el-checkbox>
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[1].id);
}
"
:label="permissionDataList[1].id"
v-if="permissionDataList[1]"
>
{{ permissionDataList[1].name }}
</el-checkbox>
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[2].id);
}
"
:label="permissionDataList[2].id"
v-if="permissionDataList[2]"
>
......@@ -177,6 +193,11 @@
</div>
<div class="div3">
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[3].id);
}
"
:label="permissionDataList[3].id"
v-if="permissionDataList[3]"
>
......@@ -185,6 +206,11 @@
</div>
<div class="div1">
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[4].id);
}
"
:label="permissionDataList[4].id"
v-if="permissionDataList[4]"
>
......@@ -193,6 +219,11 @@
</div>
<div class="div1">
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[5].id);
}
"
:label="permissionDataList[5].id"
v-if="permissionDataList[5]"
>
......@@ -201,6 +232,11 @@
</div>
<div class="div1">
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[6].id);
}
"
:label="permissionDataList[6].id"
v-if="permissionDataList[6]"
>
......@@ -209,6 +245,11 @@
</div>
<div class="div2">
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[7].id);
}
"
:label="permissionDataList[7].id"
v-if="permissionDataList[7]"
>
......@@ -217,6 +258,11 @@
</div>
<div class="div3">
<el-checkbox
@change="
(val) => {
handleCheckAllChange(val, permissionDataList[8].id);
}
"
:label="permissionDataList[8].id"
v-if="permissionDataList[8]"
>
......@@ -332,7 +378,7 @@ export default {
},
watch: {
roleMenusSelection: function (val) {
console.info(val);
//console.info(val);
},
diyRoleItemIndex: {
handler(val, oldval) {
......@@ -340,7 +386,7 @@ export default {
let arr = [...this.diyRoleList, ...this.defaultRoleBtns];
let obj = arr.find((i) => i.id == val);
this.checkItem = JSON.parse(JSON.stringify(obj));
console.log(this.checkItem);
//console.log(this.checkItem);
},
},
// checkItem: null
......@@ -420,12 +466,12 @@ export default {
}
}
this.permissionDataList = arr;
console.info("权限列表=====>", this.permissionDataList);
//console.info("权限列表=====>", this.permissionDataList);
});
},
mouseenter(item) {
item.enter = true;
console.log(item);
//console.log(item);
},
copy2() {
this.fuzhi = !this.fuzhi;
......@@ -445,6 +491,7 @@ export default {
let id = this.diyRoleList.length + 20 + "copy";
var roleitem = {
name: item.name + "_copy",
value: "",
flag: false,
code: this.diyRoleList.length,
edit: true,
......@@ -467,19 +514,20 @@ export default {
this.$refs.diyRoles.scrollTop = this.$refs.diyRoles.scrollHeight;
}, 20);
}
console.info(item);
//console.info(item);
},
// 保存
save() {
let self = this;
if (this.customAddUser.length > 0) {
let name = this.customAddUser[0].name;
debugger;
let name = this.customAddUser[0].value;
let checkArr = this.checkList;
let params = {
name,
permissionIds: checkArr,
};
let index = this.diyRoleList.findIndex((i) => i.name == name);
let index = this.diyRoleList.findIndex((i) => i.value == name);
if (checkArr.length > 0) {
let diyRolePermissions = checkArr.map((i) => {
return {
......@@ -513,6 +561,16 @@ export default {
this.$message.warning("请添加用户后保存");
}
},
handleCheckAllChange(boo, id) {
let obj = this.permissionDataList.find((i) => i.id == id);
let sonArr = obj.children.map((i) => i.id);
if (boo) {
let childList = this.checkList.concat(sonArr);
this.checkList = Array.from(new Set(childList));
} else {
this.checkList = this.checkList.filter((x) => sonArr.indexOf(x) < 0);
}
},
// 获取角色列表 和 角色权限列表
search() {
this.$axios
......@@ -526,13 +584,17 @@ export default {
this.checkList = [];
}
this.defaultRoleBtns = result.filter((i) => i.defaultFlag == 1);
this.diyRoleList = result.filter((i) => i.defaultFlag == 0);
this.diyRoleList = result.filter((i) => {
i.value = i.name;
return i.defaultFlag == 0;
});
//console.log(1111111, this.diyRoleList);
let arr = [...this.diyRoleList, ...this.defaultRoleBtns];
let obj = arr.find((i) => i.id == this.diyRoleItemIndex);
this.checkItem = JSON.parse(JSON.stringify(obj));
console.info("角色权限===》", this.defaultRoleBtns);
console.info("角色权限===》", this.diyRoleList);
console.info("选中的角色信息", this.checkItem);
//console.info("角色权限===》", this.defaultRoleBtns);
//console.info("角色权限===》", this.diyRoleList);
//console.info("选中的角色信息", this.checkItem);
} else {
this.$message.error("获取角色信息失败！");
}
......@@ -541,7 +603,7 @@ export default {
},
// 删除
del(id) {
console.info("删除数据", id);
//console.info("删除数据", id);
this.diyRoleList.splice(id, 1);
this.diyRoleItemIndex = -1;
},
......@@ -554,6 +616,7 @@ export default {
this.resetEdit();
let id = this.diyRoleList.length + 20 + "l";
var roleitem = {
value: "",
name: "自定义" + (this.diyRoleList.length + 1),
flag: false,
code: this.diyRoleList.length,
......@@ -584,7 +647,7 @@ export default {
},
// 编辑
edit() {
console.info("编辑数据");
//console.info("编辑数据");
},
// 选中默认权限
chooseDefaultRoleItem(item) {
......@@ -638,12 +701,12 @@ export default {
funAuth() {
this.funFlag = true;
this.dataFlag = false;
console.info("功能权限");
//console.info("功能权限");
},
dataAuth() {
this.funFlag = false;
this.dataFlag = true;
console.info("数据权限");
//console.info("数据权限");
},
},
created() {
......
src/views/SystemManage/UserManage.vue
......@@ -29,11 +29,12 @@
</div>
<div class="search-item">
<div class="label">单位代码：</div>
<el-input
<Cascader :form="searchParams" id="unitCode" width="9.6875"></Cascader>
<!-- <el-input
class="search-info"
v-model="searchParams.unitCode"
placeholder="请输入单位代码"
/>
/> -->
</div>
<div class="search-item">
<div class="label">角色：</div>
......@@ -82,7 +83,7 @@
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
​
<el-link
type="primary"
:underline="false"
......@@ -316,10 +317,12 @@
v-model="addFormParams.okpassword"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="手机号码:" prop="phoneNumber">
<el-form-item class="info-item" label="联系电话:" prop="phoneNumber">
<el-input
placeholder="请输入手机号码"
placeholder="请输入联系电话"
class="input-info"
maxlength="18"
show-word-limit
v-model="addFormParams.phoneNumber"
></el-input>
</el-form-item>
......@@ -402,10 +405,12 @@
v-model="editFormParams.policeNumber"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="手机号码:" prop="phoneNumber">
<el-form-item class="info-item" label="联系电话:" prop="phoneNumber">
<el-input
placeholder="请输入手机号码"
placeholder="请输入联系电话"
class="input-info"
maxlength="18"
show-word-limit
v-model="editFormParams.phoneNumber"
></el-input>
</el-form-item>
......@@ -496,10 +501,13 @@ export default {
// 手机号校验
var validateTelphone = (rule, value, callback) => {
if (value === "") {
callback(new Error("请输入手机号码！"));
callback(new Error("请输入联系电话！"));
} else {
if (!/^1[345678]\d{9}$/.test(value)) {
callback(new Error("手机号码格式不正确！"));
if (
value.length > 18 ||
!/^[-+]?(([0-9]+)([.]([0-9]+))?|([.]([0-9]+))?)$/.test(value)
) {
callback(new Error("联系电话为18位的数字！"));
} else {
callback();
}
......@@ -596,7 +604,7 @@ export default {
name: "", //姓名
unitCode: "", //单位代码
policeNumber: "", //警号
phoneNumber: "", //手机号码
phoneNumber: "", //联系电话
status: "", //启用状态
userGroupId: "", // 用户组
roleId: "", // 角色
......@@ -614,9 +622,6 @@ export default {
name: [
{ validator: validateTruename, trigger: "blur", required: true },
], //用户真实姓名
policeNumber: [
{ validator: validatePolicemanid, trigger: "blur", required: true },
], //警号
phoneNumber: [
{ validator: validateTelphone, trigger: "blur", required: true },
], //用户电话
......@@ -642,9 +647,6 @@ export default {
unitCode: [
{ validator: validateUnitcode, trigger: "change", required: true },
], //单位代码
policeNumber: [
{ validator: validatePolicemanid, trigger: "blur", required: true },
], //警号
phoneNumber: [
{ validator: validateTelphone, trigger: "blur", required: true },
], //用户电话
......@@ -732,9 +734,9 @@ export default {
methods: {
// 新增
submitForm(formName) {
console.log(this.addFormParams, 22222222222);
//console.log(this.addFormParams, 22222222222);
this.$refs.addFormParams.validate((valid) => {
console.log(valid);
//console.log(valid);
if (valid) {
this.$axios
.post("/security/users", this.addFormParams)
......@@ -757,10 +759,10 @@ export default {
}
})
.catch((res) => {
console.log(res);
//console.log(res);
});
} else {
console.log("error submit!!");
//console.log("error submit!!");
return false;
}
});
......@@ -782,7 +784,7 @@ export default {
// 编辑
submitEditForm(formName) {
this.$refs.editFormParams.validate((valid) => {
console.log(valid);
//console.log(valid);
if (valid) {
this.$axios
.put("/security/users", this.editFormParams)
......@@ -805,7 +807,7 @@ export default {
}
});
} else {
console.log("error submit!!");
//console.log("error submit!!");
return false;
}
});
......@@ -815,7 +817,7 @@ export default {
this.$refs[formName].resetFields();
},
clear() {
console.log(11111111, this.searchParams);
//console.log(11111111, this.searchParams);
for (let key in this.searchParams) {
if (key != "page") {
this.$set(this.searchParams, key, "");
......@@ -827,7 +829,7 @@ export default {
this.search();
},
search() {
console.info("搜索用户列表");
//console.info("搜索用户列表");
this.$axios.get("/security/users").then((res) => {
if (res.data.code == 200) {
this.tableData = res.data.detail;
......@@ -847,12 +849,12 @@ export default {
} else {
this.$refs.multipleTable.clearSelection();
}
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
},
// 选择数据
handleSelectionChange(val) {
this.multipleSelection = val;
console.info("选择的数据", this.multipleSelection);
//console.info("选择的数据", this.multipleSelection);
},
//是否是批量操作
batch() {
......@@ -924,14 +926,14 @@ export default {
this.isShowEditUserDialogBg = false;
},
edit() {
console.info("编辑方法");
//console.info("编辑方法");
// 根据主键查询用户基本信息
var user = new URLSearchParams();
user.append("userId", "2");
this.$axios
.post("/login/user/queryuserInfo", user)
.then((res) => {
console.log("修改的返回值：", res);
//console.log("修改的返回值：", res);
})
.catch((failResponse) => {});
// 修改用户信息
......@@ -944,7 +946,7 @@ export default {
.post("/login/user/update", user1)
.then((res) => {
this.$message.success(res.data.message);
console.log("修改的返回值：", res);
//console.log("修改的返回值：", res);
})
.catch((failResponse) => {});
},
......@@ -958,13 +960,13 @@ export default {
}
},
del(id) {
console.info("删除方法", id);
//console.info("删除方法", id);
var user = new URLSearchParams();
user.append("userId", id);
this.$axios
.post("/login/user/deleteUserById", user)
.then((res) => {
console.log("删除：", res.data);
//console.log("删除：", res.data);
if (res.data === "success") {
this.$message.success(res.data);
this.search();
......
src/views/SystemManage/UserPermission.vue
......@@ -111,6 +111,11 @@
<div :class="{ div3: true }">
<el-checkbox
:class="getClass(permissionDataList[0].id).class"
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[0].id);
}
"
:disabled="getClass(permissionDataList[0].id).disable"
v-if="permissionDataList[0]"
:label="permissionDataList[0].id"
......@@ -118,6 +123,11 @@
{{ permissionDataList[0].name }}
</el-checkbox>
<el-checkbox
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[1].id);
}
"
:class="getClass(permissionDataList[1].id).class"
:disabled="getClass(permissionDataList[1].id).disable"
v-if="permissionDataList[1]"
......@@ -126,6 +136,11 @@
{{ permissionDataList[1].name }}
</el-checkbox>
<el-checkbox
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[2].id);
}
"
:class="getClass(permissionDataList[2].id).class"
:disabled="getClass(permissionDataList[2].id).disable"
v-if="permissionDataList[2]"
......@@ -136,6 +151,11 @@
</div>
<div :class="{ div3: true }">
<el-checkbox
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[3].id);
}
"
:class="getClass(permissionDataList[3].id).class"
:disabled="getClass(permissionDataList[3].id).disable"
v-if="permissionDataList[3]"
......@@ -146,6 +166,11 @@
</div>
<div class="div1">
<el-checkbox
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[4].id);
}
"
:class="getClass(permissionDataList[4].id).class"
:disabled="getClass(permissionDataList[4].id).disable"
v-if="permissionDataList[4]"
......@@ -156,6 +181,11 @@
</div>
<div class="div1">
<el-checkbox
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[5].id);
}
"
:class="getClass(permissionDataList[5].id).class"
:disabled="getClass(permissionDataList[5].id).disable"
v-if="permissionDataList[5]"
......@@ -166,6 +196,11 @@
</div>
<div class="div1">
<el-checkbox
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[6].id);
}
"
:class="getClass(permissionDataList[6].id).class"
:disabled="getClass(permissionDataList[6].id).disable"
v-if="permissionDataList[6]"
......@@ -176,6 +211,11 @@
</div>
<div class="div2">
<el-checkbox
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[7].id);
}
"
:class="getClass(permissionDataList[7].id).class"
:disabled="getClass(permissionDataList[7].id).disable"
v-if="permissionDataList[7]"
......@@ -186,6 +226,11 @@
</div>
<div class="div3">
<el-checkbox
@change="
(boo) => {
handleCheckAllChange(boo, permissionDataList[8].id);
}
"
:class="getClass(permissionDataList[8].id).class"
:disabled="getClass(permissionDataList[8].id).disable"
v-if="permissionDataList[8]"
......@@ -389,12 +434,12 @@ export default {
funAuth() {
this.funFlag = true;
this.dataFlag = false;
console.info("功能权限");
//console.info("功能权限");
},
dataAuth() {
this.funFlag = false;
this.dataFlag = true;
console.info("数据权限");
//console.info("数据权限");
},
redact() {
this.isSave = false;
......@@ -470,6 +515,16 @@ export default {
newObj["class"] = obj;
return newObj;
},
handleCheckAllChange(boo, id) {
let obj = this.permissionDataList.find((i) => i.id == id);
let sonArr = obj.children.map((i) => i.id);
if (boo) {
let childList = this.checkList.concat(sonArr);
this.checkList = Array.from(new Set(childList));
} else {
this.checkList = this.checkList.filter((x) => sonArr.indexOf(x) < 0);
}
},
controlCheckMap() {
let self = this;
// self.rolePermissions; //角色
......@@ -548,7 +603,7 @@ export default {
}
}
this.permissionDataList = arr;
console.info("权限列表=====>", this.permissionDataList);
//console.info("权限列表=====>", this.permissionDataList);
});
},
},
......@@ -563,14 +618,14 @@ export default {
// .post("/login/user/queryuserInfo", user)
// .then((res) => {
// if (res.data) {
// console.info(res.data);
// //console.info(res.data);
// this.userData = res.data.user;
// this.status = res.data.user.status;
// console.info(res.data.user.status);
// //console.info(res.data.user.status);
// }
// })
// .catch((failResponse) => {});
// console.info("chuancan", this.$route.params.id);
// //console.info("chuancan", this.$route.params.id);
},
created() {
this.userID = this.$route.query.id;
......@@ -589,12 +644,17 @@ export default {
id: this.userID,
},
});
console.log(this.$route);
//console.log(this.$route);
},
};
</script>
<style scoped lang="scss">
.role-info /deep/ {
.el-checkbox__label {
color: #666666 !important;
}
}
.editText {
margin-right: 20px;
color: #006aff;
......
src/views/SystemManage/scss/dialog_table.scss
......@@ -64,7 +64,7 @@
display: block;
width: 8px;
height: 8px;
background: #055fe7;
background: #00B47A;
border-radius: 50%;
position: absolute;
left: 6px;
......
src/views/SystemManage/scss/role.scss
.manage-page {
.manage-page /deep/ {
.role-info {
.el-checkbox__label {
color: #666666 !important;
}
}
width: 100%;
padding: 24px;
display: flex;
......@@ -7,6 +12,15 @@
div {
display: inline-block;
}
.is-disabled.is-checked {
.el-checkbox__inner {
background-color: #b1b6c2 !important;
border-color: #b1b6c2 !important;
&::after {
border-color: #fff;
}
}
}
.sider {
//border: #03A9F4 1px solid;
//width: 240px;
......@@ -257,6 +271,7 @@
padding-top: 8px;
.line {
height: 40px;
width: 190px;
}
}
.div2 {
......
src/views/confirm/QueryConfirm.vue
......@@ -295,14 +295,14 @@ export default {
del(row) {
// todo 删除确认
this.$message.success("删除成功");
console.info(row);
//console.info(row);
},
edit(row) {
console.info(row);
//console.info(row);
},
handleSelectionChange(val) {
this.selectionData = val;
console.info(this.selectionData);
//console.info(this.selectionData);
},
getBarcode() {
......
src/views/cxyrd/LT.vue
......@@ -175,7 +175,7 @@ export default {
},
created() {
this.qid = this.$route.query.rowData;
console.log("源qid====>", this.qid);
//console.log("源qid====>", this.qid);
},
watch: {
phone(newValue, oldValue) {
......@@ -228,7 +228,7 @@ export default {
}).then(response => {
// 跟新列表数据
self.$bus.emit("updateFinderSource");
console.log(response);
//console.log(response);
this.$message.success("认定完成！");
if (type == "son") {
window.close();
......@@ -260,7 +260,7 @@ export default {
*/
confirmbz() {
let self = this;
console.log("比中");
//console.log("比中");
let affirmstatus = "1";
let srcseqno = sessionStorage.getItem("srcseqno") || "";
let destseqno = sessionStorage.getItem("destseqno") || "";
......@@ -288,7 +288,7 @@ export default {
.then(response => {
// 跟新列表数据
self.$bus.emit("updateFinderSource");
console.log(response);
//console.log(response);
this.$message.success("比中成功！");
})
.catch(err => {
......@@ -303,7 +303,7 @@ export default {
telephone: self.phone
}
}).then(res => {
console.log(res);
//console.log(res);
});
this.isShowbzDialogBg = false;
......@@ -317,7 +317,7 @@ export default {
getUserInfo2() {
let self = this;
let destbarcode = sessionStorage.getItem("destbarcode") || "";
console.log(destbarcode);
//console.log(destbarcode);
this.$axios({
url: "/api/casestore/casebase",
method: "get",
......@@ -348,7 +348,7 @@ export default {
}).then(async res => {
if (res.data.code == 0) {
let data = res.data.ret[0];
console.log(data);
//console.log(data);
let dw = await self.$axios({
method: "get",
url: "/api/code/unit/one/" + data.userunit,
......@@ -385,7 +385,7 @@ export default {
* @return {*}
*/
Rdwc() {
console.log("认定完成");
//console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || "";
// 认定之前的操作
......@@ -397,7 +397,7 @@ export default {
},
loading: false
}).then(res => {
console.log(res);
//console.log(res);
if (!res.data.ret) {
this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
......@@ -413,7 +413,7 @@ export default {
* @return {*}
*/
judgeZw(code) {
console.log(code);
//console.log(code);
switch (code) {
case 1:
this.zw = "滚动-右拇";
......
src/views/cxyrd/LTz2.vue
......@@ -600,7 +600,7 @@ export default {
function applyOrRemoveFilter (applying, type, options) {
if (applying) {
imageEditor.applyFilter(type, options).then(function (result) {
console.log(result);
//console.log(result);
});
} else {
imageEditor.removeFilter(type);
......@@ -610,7 +610,7 @@ export default {
// Attach image editor custom events
imageEditor.on({
objectAdded: function (objectProps) {
console.info(objectProps);
//console.info(objectProps);
},
undoStackChanged: function (length) {
if (length) {
......@@ -639,7 +639,7 @@ export default {
position: pos.originPosition,
})
.then(function (objectProps) {
console.log(objectProps);
//console.log(objectProps);
});
},
objectActivated: function (obj) {
......@@ -741,25 +741,25 @@ export default {
$btnFlipX.on('click', function () {
imageEditor.flipX().then(function (status) {
console.log('flipX: ', status.flipX);
console.log('flipY: ', status.flipY);
console.log('angle: ', status.angle);
//console.log('flipX: ', status.flipX);
//console.log('flipY: ', status.flipY);
//console.log('angle: ', status.angle);
});
});
$btnFlipY.on('click', function () {
imageEditor.flipY().then(function (status) {
console.log('flipX: ', status.flipX);
console.log('flipY: ', status.flipY);
console.log('angle: ', status.angle);
//console.log('flipX: ', status.flipX);
//console.log('flipY: ', status.flipY);
//console.log('angle: ', status.angle);
});
});
$btnResetFlip.on('click', function () {
imageEditor.resetFlip().then(function (status) {
console.log('flipX: ', status.flipX);
console.log('flipY: ', status.flipY);
console.log('angle: ', status.angle);
//console.log('flipX: ', status.flipX);
//console.log('flipY: ', status.flipY);
//console.log('angle: ', status.angle);
});
});
......@@ -798,9 +798,9 @@ export default {
}
file = event.target.files[0];
console.log(file);
//console.log(file);
imageEditor.loadImageFromFile(file).then(function (result) {
console.log(result);
//console.log(result);
imageEditor.clearUndoStack();
});
});
......@@ -1003,7 +1003,7 @@ export default {
top: originPointer.y,
})
.then(function (objectProps) {
// console.log(objectProps);
// //console.log(objectProps);
});
});
}
......@@ -1080,7 +1080,7 @@ export default {
imageEditor.loadImageFromURL(imageEditor.toDataURL(), 'FilterImage').then(function () {
imageEditor.addImageObject(imgUrl).then(function (objectProps) {
URL.revokeObjectURL(file);
console.log(objectProps);
//console.log(objectProps);
});
});
}
......@@ -1092,7 +1092,7 @@ export default {
maskObjId: activeObjectId,
})
.then(function (result) {
console.log(result);
//console.log(result);
});
});
......@@ -1242,7 +1242,7 @@ export default {
// Load sample image
imageEditor.loadImageFromURL('img/dogsleep.jpg', 'SampleImage').then(function (sizeValue) {
console.log(sizeValue);
//console.log(sizeValue);
imageEditor.clearUndoStack();
});
......@@ -1283,7 +1283,7 @@ export default {
* @return {*}
*/
enlarge () {
console.log('放大');
//console.log('放大');
this.$refs.editor.invoke("addText", "Hello Jerry", {
styles: {
fontSize: 22,
......
src/views/cxyrd/QueryConfirm.vue
......@@ -243,7 +243,6 @@
已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link
type="primary"
:underline="false"
......@@ -277,7 +276,7 @@
height
width="auto"
></el-table-column>
<el-table-column prop="" label="任务号/查询号" :width="cxyrdWidth1">
<el-table-column prop="" label="查询ID" :width="cxyrdWidth1">
<template slot-scope="scope">
<svg-icon
style="
......@@ -585,10 +584,10 @@ export default {
this.cxyrdWidth1 = (this.cxyrdWidth1 * w2) / w1;
content.forEach((item) => {
// console.log(item);
// //console.log(item);
self.$set(item, "width", (item.width * w2) / w1);
});
console.log(content);
//console.log(content);
},
watch: {
selectBoo: {
......@@ -621,7 +620,7 @@ export default {
// 获取认定列表
search() {
this.getParam();
// console.info("请求===>", this.reqParam.contrastCustomSearchReq);
// //console.info("请求===>", this.reqParam.contrastCustomSearchReq);
this.$axios
.post("/api/queryque/standardQid", this.reqParam)
.then((response) => {
......@@ -630,7 +629,7 @@ export default {
// 请求成功有返回值
this.list = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total;
console.info("查询结果===>", this.list);
//console.info("查询结果===>", this.list);
this.userInfo = this.getUserInfo(this.list);
} else {
// 请求成功无返回值
......@@ -642,7 +641,7 @@ export default {
// 请求失败
this.$message.error(response.data.message);
}
// console.info(JSON.stringify(this.list));
// //console.info(JSON.stringify(this.list));
});
},
// 格式化参数
......@@ -659,10 +658,6 @@ export default {
// 选择用户下拉框变化时 当前页为1
selectUserInfo() {
this.reqParam.page.currPage = 1;
console.info(
"当前选中的用户为-------->",
this.reqParam.contrastCustomSearchReq.username
);
this.search();
},
// 清空用户id
......@@ -687,7 +682,7 @@ export default {
}
});
this.userOption = this.unique(userInfo);
// console.info("用户信息==>", this.userOption);
// //console.info("用户信息==>", this.userOption);
},
// 用户信息去重
unique(arr) {
......@@ -784,7 +779,7 @@ export default {
// 将传入的qqid转为数组
let qqid = [];
qqid.push(val);
// console.info("删除接口里的qqid：", qqid);
// //console.info("删除接口里的qqid：", qqid);
this.doDelete(qqid);
},
// 请求删除接口
......@@ -919,7 +914,7 @@ export default {
// }
// // ll 串查 3 lt 正查 2
// else {
// // console.info("串查/正查", row.querytype, row);
// // //console.info("串查/正查", row.querytype, row);
// // 打开新页面
// if (row.children) {
// let routeUrl = this.$router.resolve({
......@@ -949,7 +944,7 @@ export default {
// 获取下标
var i = this.list.findIndex((table) => table.queryId === row.queryId);
// var i = this.tableData.findIndex(table => table.id === row.id);
// console.log(i);
// //console.log(i);
if (expanded) {
this.list[i] = {
qid: row.qid,
......@@ -958,7 +953,7 @@ export default {
expanded: true,
};
this.$forceUpdate();
// console.info("展开时row数据", this.list[i]);
// //console.info("展开时row数据", this.list[i]);
// this.$set(this.tableData[i], "barcode", "");
// 保证临时变量中存在下标属性，方便后续折叠时取值
//row.index = i;
......@@ -972,7 +967,7 @@ export default {
// };
// this.list[i] = obj;
} else {
console.info("折叠时row数据", this.list[i]);
//console.info("折叠时row数据", this.list[i]);
this.list[i] = {
qid: row.qid,
children: row.children,
......@@ -991,9 +986,9 @@ export default {
queryTypeName: row.children[0].queryTypeName,
removeFlag: row.children[0].removeFlag,
};
console.log(this.list[i]);
//console.log(this.list[i]);
this.$forceUpdate();
// console.info("塞完数据的row", this.list[i]);
// //console.info("塞完数据的row", this.list[i]);
}
},
// table表格选中获取数据
......@@ -1014,7 +1009,7 @@ export default {
if (this.selectionData.length === 0) {
this.$message.error("请选择需要复制条码号的数据！");
} else {
console.log(this.selectionData);
//console.log(this.selectionData);
self.selectionData.forEach((item) => {
self.barcode.push(item.barcode);
});
......@@ -1023,7 +1018,7 @@ export default {
},
// 复制成功时的回调函数
onCopy(e) {
console.info(this.barcode);
//console.info(this.barcode);
if (this.barcode.length !== 0) {
this.$message({
type: "success",
......@@ -1038,9 +1033,9 @@ export default {
},
// 自定义展示列 多选框
changeCheckbox() {
// console.info("默认", this.defaultTableProps);
// console.info("table", this.tableProps);
// console.info("选中", this.checkedProps);
// //console.info("默认", this.defaultTableProps);
// //console.info("table", this.tableProps);
// //console.info("选中", this.checkedProps);
},
// 当期页发生变化
handleCurrPageChange: function (val) {
......@@ -1136,20 +1131,20 @@ export default {
this.$refs.confirmTable.clearSelection();
}
console.log(this.selectionData);
//console.log(this.selectionData);
},
},
mounted() {
console.log(this.$moment, 222222222222);
// console.log(window.innerHeight);
// console.log(window.innerWidth);
// console.log(document.querySelector('.footer').offsetTop);
// console.log(document.querySelector('.confirm_main').offsetTop);
//console.log(this.$moment, 222222222222);
// //console.log(window.innerHeight);
// //console.log(window.innerWidth);
// //console.log(document.querySelector('.footer').offsetTop);
// //console.log(document.querySelector('.confirm_main').offsetTop);
// let h1 = window.innerHeight
// let h2 = document.querySelector('.footer').offsetTop
// let h3 = document.querySelector('.confirm_main').offsetTop
// this.height = h1 -h2 -h3
// console.log(this.height);
// //console.log(this.height);
this.search();
},
};
......@@ -1162,7 +1157,7 @@ const content = [
{ colume: "候选个数", prop: "maxcandidatecnt", width: "auto" },
{ colume: "查询类型", prop: "querytype", width: "auto" },
{ colume: "状态", prop: "queryStateName", width: "auto" },
{ colume: "是否删除", prop: "removeFlag", width: "auto" },
// { colume: "是否删除", prop: "removeFlag", width: "auto" },
{ colume: "优先级", prop: "queryclass", width: "auto" },
{ colume: "认定时间", prop: "affirmtime", width: "auto" },
{ colume: "发送时间", prop: "requestdatetime", width: "auto" },
......
src/views/cxyrd/TL.vue
......@@ -220,7 +220,7 @@ export default {
}).then(response => {
// 跟新列表数据
self.$bus.emit("updateTLSourceData");
console.log(response);
//console.log(response);
this.$message.success("认定完成！");
if (type == "son") {
window.close();
......@@ -252,7 +252,7 @@ export default {
*/
confirmbz() {
let self = this;
console.log("比中");
//console.log("比中");
let affirmstatus = "1";
let srcseqno = sessionStorage.getItem("srcseqno") || "";
let destseqno = sessionStorage.getItem("destseqno") || "";
......@@ -279,7 +279,7 @@ export default {
.then(response => {
// 跟新列表数据
self.$bus.emit("updateTLSourceData");
console.log(response);
//console.log(response);
})
.catch(err => {
this.$message.error("比中失败！");
......@@ -294,7 +294,7 @@ export default {
}
})
.then(res => {
console.log(res);
//console.log(res);
})
.catch(err => {
this.$message.error("比中失败！");
......@@ -311,7 +311,7 @@ export default {
getUserInfo2() {
let self = this;
let destbarcode = sessionStorage.getItem("destbarcode") || "";
console.log(destbarcode);
//console.log(destbarcode);
this.$axios({
url: "/api/casestore/casebase",
method: "get",
......@@ -342,7 +342,7 @@ export default {
}).then(async res => {
if (res.data.code == 0) {
let data = res.data.ret[0];
console.log(data);
//console.log(data);
let dw = await self.$axios({
method: "get",
url: "/api/code/unit/one/" + data.userunit,
......@@ -364,7 +364,7 @@ export default {
* @return {*}
*/
Bz() {
console.info("比中");
//console.info("比中");
this.isShowbzDialogBg = true;
this.isShowbzDialog = true;
this.getUserInfo();
......@@ -381,8 +381,8 @@ export default {
this.userdesc = sessionStorage.getItem("userdesc");
},
Rdwc() {
console.info("认定完成");
console.log("认定完成");
//console.info("认定完成");
//console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || "";
// 认定之前的操作
......@@ -394,7 +394,7 @@ export default {
},
loading: false
}).then(res => {
console.log(res);
//console.log(res);
if (!res.data.ret) {
this.isShowrdwcDialogBg = true;
this.isShowrdwcDialog = true;
......@@ -441,7 +441,7 @@ export default {
* @return {*}
*/
judgeZw(code) {
console.log(code);
//console.log(code);
switch (code) {
case 1:
this.zw = "滚动-右拇";
......
src/views/cxyrd/TT.scss
......@@ -21,8 +21,9 @@ $phone: var(--phone, #606266); //#ff4242;
padding: 20px;
box-sizing: border-box;
position: absolute;
top: calc(50% - 300px);
left: calc(50% - 300px);
top: 30%;
left: 50%;
transform: translateX(-50%);
z-index: 1000;
width: 600px;
height: 152px;
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -344,7 +344,7 @@ export default {
});
self.$bus.on("initCandidate", tableData => {
console.log(tableData);
//console.log(tableData);
self.tableData = tableData;
if (self.tableData) {
self.total = self.tableData.length;
......@@ -354,7 +354,7 @@ export default {
if (self.tableData && self.tableData.length > 0) {
self.$refs.singleTable.setCurrentRow(self.tableData[0]);
}
// console.log(tableData);
// //console.log(tableData);
});
......@@ -383,14 +383,14 @@ export default {
* @return {*}
*/
tableRowClassName({ row, column, rowIndex, columnIndex }) {
// console.log(row);
// //console.log(row);
// 比中的行
if (row.affirmstatus == 2 || row.affirmstatus == 3) {
console.log(row);
//console.log(row);
return "Bizhong";
} else if (row.affirmstatus == 1) {
// 认定完成的行
console.log(row);
//console.log(row);
return "Identification";
}
// 浏览过的
......@@ -1174,7 +1174,7 @@ export default {
*/
search() {
let self = this;
console.info(this.select);
//console.info(this.select);
if (self.isDelete) return;
// if (self.input3 != "") {
// this.tableData = this.sourceTableData.filter(item => {
......@@ -1191,7 +1191,7 @@ export default {
destbarcode: self.input3.trim()
})
.then(response => {
console.log(response);
//console.log(response);
self.tableData = response.data.ret;
self.total = self.tableData.length;
......@@ -1217,7 +1217,7 @@ export default {
sessionStorage.setItem("destseqno", val.destseqno);
return;
} else {
console.log(val);
//console.log(val);
if (val != null) {
// 改变数据为点击状态
self.$set(val, "clickLog", "1");
......@@ -1258,14 +1258,14 @@ export default {
// this.$axios
// .get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destseqno}`)
// .then(response => {
// console.log(response);
// //console.log(response);
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// });
}
}
},
choose(val) {
console.info(val);
//console.info(val);
}
},
watch: {
......@@ -1276,7 +1276,7 @@ export default {
this.tableData = this.sourceTableData.filter(item => {
return item.affirmstatus != 1;
});
console.log(this.tableData);
//console.log(this.tableData);
}
this.total = this.tableData.length;
}
......
src/views/cxyrd/modules/LTSrc.vue
......@@ -162,7 +162,7 @@ export default {
// srcData: {
// immediate: true,
// handler (val) {
// console.info("源数据传入组件的值为===>", val);
// //console.info("源数据传入组件的值为===>", val);
// this.tableData = val;
// }
// }
......@@ -224,11 +224,11 @@ export default {
tableRowClassName({ row, column, rowIndex, columnIndex }) {
// 比中的行
if (row.affirmStatus == 2 || row.affirmStatus == 3) {
console.log(row);
//console.log(row);
return "Bizhong";
} else if (row.affirmStatus == 1) {
// 认定完成的行
console.log(row);
//console.log(row);
return "Identification";
}
// 浏览过的
......@@ -267,7 +267,7 @@ export default {
barcode: val.barcode,
qqid: self.qqid
}).then(response => {
console.log(response);
//console.log(response);
let imageInfo = response.data.ret[0]
// 默认选中第一个指纹预览图片
sessionStorage.setItem("srcseqno", imageInfo.seq);
......@@ -276,7 +276,7 @@ export default {
this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem("srcbarcode") })
.then(response => {
console.log(response);
//console.log(response);
self.$bus.emit("initCandidate", response.data.ret);
});
self.timer = setTimeout(() => {
......@@ -290,12 +290,12 @@ export default {
msg: null,
delTime: null
})
console.log(val);
//console.log(val);
if (val == null) return;
// 改变数据为点击状态
self.$set(val, "clickLog", "1");
self.currentRow = val;
console.log(val);
//console.log(val);
self.qqid = val.qqid;
self.qid = val.qid;
// 保存qqid和qid
......@@ -304,13 +304,13 @@ export default {
let barcode = val.barcode;
// 存储原条码号
sessionStorage.setItem("srcbarcode", barcode);
console.log(barcode);
//console.log(barcode);
self.$axios.post("/api/org/caseBybarcode/barcode", {
querytype: "2",
barcode: barcode,
qqid: self.qqid
}).then(response => {
console.log(response);
//console.log(response);
self.enumerate = response.data.ret;
self.fingerTotal = response.data.ret.length;
// 默认选中第一个指纹预览图片
......@@ -338,11 +338,11 @@ export default {
this.$axios
.post("/api/queryque/standardAll", { contrastCustomSearchReq: { qid: Number(self.qid) } })
.then(response => {
console.log(response);
//console.log(response);
self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList;
self.total = self.dataList.length;
console.log(self.dataList);
//console.log(self.dataList);
// 默认选中第一行
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
......@@ -352,11 +352,11 @@ export default {
this.$axios
.post("/api/queryque/standardAll", { contrastCustomSearchReq: { qqid: Number(self.qqid) } })
.then(response => {
console.log(response);
//console.log(response);
self.sourceDataList = response.data.ret;
self.dataList = self.sourceDataList;
self.total = self.dataList.length;
console.log(self.dataList);
//console.log(self.dataList);
// 默认选中第一行
self.$nextTick(() => {
self.$refs.singleTable.setCurrentRow(self.dataList[0]);
......@@ -374,11 +374,11 @@ export default {
// 选择新的指纹数据时 清空前一个指纹样式
// let self = this
// let barcode = row.barcode
// console.log(barcode);
// //console.log(barcode);
// this.$axios
// .get(`/api/png/caseBybarcode/${barcode}`)
// .then(response => {
// console.log(response);
// //console.log(response);
// self.enumerate = response.data.ret
// self.fingerTotal = response.data.ret.length
// })
......@@ -386,10 +386,10 @@ export default {
},
// 指纹部分 增加边框
changeStyle(index, imageInfo) {
console.log(imageInfo);
//console.log(imageInfo);
let self = this;
this.isActive = index;
console.log(this.isActive);
//console.log(this.isActive);
// 存储源数据序号
if (imageInfo) {
// 改变数据为点击状态
......@@ -401,7 +401,7 @@ export default {
this.loading = Loading.service({ fullscreen: true, text: "正在加载..." });
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.seq}`, { srcbarcode: sessionStorage.getItem("srcbarcode") })
.then(response => {
console.log(response);
//console.log(response);
self.$bus.emit("initCandidate", response.data.ret);
});
self.timer = setTimeout(() => {
......@@ -438,26 +438,26 @@ export default {
* @return {*}
*/
checked(newValue, oldValue) {
console.log(newValue);
//console.log(newValue);
if (newValue) {
this.dataList = this.sourceDataList;
} else {
this.dataList = this.sourceDataList.filter(item => {
return item.affirmStatus != 1;
});
console.log(this.dataList);
//console.log(this.dataList);
}
this.total = this.dataList.length;
}
},
mounted() {
console.log(this.$route);
//console.log(this.$route);
this.rwh = this.$route.query.qid;
this.qqid = this.$route.query.qqid;
this.qid = this.$route.query.qid;
this.type = this.$route.query.type;
sessionStorage.setItem("zctype", this.type);
console.log(this.rwh);
//console.log(this.rwh);
let self = this;
// 初始状态下 展示当前任务的第一条指纹信息（指纹个数）
// this.enumerate = datas[0].enumerate;
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -62,13 +62,13 @@ export default {
})
this.$bus.on("initTLCandidate", tableData => {
// console.log(tableData);
// //console.log(tableData);
self.tableData = tableData;
if (self.tableData) {
self.total = self.tableData.length;
}
self.sourceTableData = tableData;
console.log(self.tableData);
//console.log(self.tableData);
// 默认选中第一条数据
if (self.tableData && self.tableData.length > 0) {
self.$refs.singleTable.setCurrentRow(self.tableData[0]);
......@@ -96,7 +96,7 @@ export default {
destbarcode: self.input3.trim()
}, { loading: false })
.then(response => {
console.log(response);
//console.log(response);
self.tableData = response.data.ret;
self.total = self.tableData.total;
clearTimeout(self.timer);
......@@ -116,7 +116,7 @@ export default {
const CancelToken = axios.CancelToken;
const source = CancelToken.source();
let self = this;
console.info(val, old);
//console.info(val, old);
if (val != null) {
// 改变数据为点击状态
self.$set(val, "clickLog", "1");
......@@ -137,7 +137,7 @@ export default {
seqno: val.destseqno,
qqid: val.qqid
}, { loading: false, cancelToken: source.token }).then(response => {
console.log(response);
//console.log(response);
self.$bus.emit("changImageEditTarget", response.data.ret[0].image);
if (!self.isFirstMounted) {
clearTimeout(self.timer);
......@@ -150,7 +150,7 @@ export default {
// this.$axios
// .get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}`)
// .then(response => {
// console.log(response);
// //console.log(response);
// self.$bus.emit("changImageEditTarget", response.data.ret.image);
// });
}
......
src/views/cxyrd/modules/TTFingerPrint.vue
......@@ -230,20 +230,20 @@ export default {
this.qid = this.$route.query.qid;
this.currentQqid = parseInt(this.$route.query.qqid);
this.sourcebarcode = this.$route.query.barcode;
console.log("源qqid====>", this.currentQqid);
console.log("源barcode====>", this.sourcebarcode);
//console.log("源qqid====>", this.currentQqid);
//console.log("源barcode====>", this.sourcebarcode);
// this.search();
},
methods: {
// 滚动平面选择切换
handleSelect(index) {
this.activeIndex = index;
console.info(this.activeIndex);
//console.info(this.activeIndex);
if (index === 1) {
console.info("滚动指纹");
//console.info("滚动指纹");
}
if (index === 2) {
console.info("平面指纹");
//console.info("平面指纹");
}
},
// 获取源指纹图
......@@ -269,16 +269,16 @@ export default {
});
});
}
console.log(response);
//console.log(response);
})
.catch(function(error) {
console.log(error);
//console.log(error);
});
// 平面
this.$axios
.get("/api/org/plainByBarcode/" + this.sourcebarcode)
.then(function(response) {
console.info("平面", response);
//console.info("平面", response);
if (response.data.code === 0) {
response.data.ret.forEach((element, index) => {
// 源 左手 平面
......@@ -297,7 +297,7 @@ export default {
}
})
.catch(function(error) {
console.log(error);
//console.log(error);
});
},
// 获取目标指纹图
......@@ -323,16 +323,16 @@ export default {
});
});
}
console.log(response);
//console.log(response);
})
.catch(function(error) {
console.log(error);
//console.log(error);
});
// 平面 目标
this.$axios
.get("/api/org/plainByBarcode/" + barcode)
.then(function(response) {
console.info("平面", response);
//console.info("平面", response);
if (response.data.code === 0) {
response.data.ret.forEach((element, index) => {
// 目标 左手 平面
......@@ -351,14 +351,14 @@ export default {
}
})
.catch(function(error) {
console.log(error);
//console.log(error);
});
}
},
mounted() {
this.getSourceFingerPrintDetail();
this.$bus.on("ccbarcode", code => {
console.log(code);
//console.log(code);
this.getDestFingerPrintDetail(code);
});
}
......
src/views/drFPTX/Index.vue
......@@ -559,7 +559,7 @@ export default {
},
// 上传进度
uploadProcess (event, file, fileList) {
// console.log(event)
// //console.log(event)
this.dialogVisible = true;
// this.UploadPercent = Number(file.percentage.toFixed(0));
// this.UploadPercent = Number(event.percent.toFixed())
......@@ -695,7 +695,7 @@ export default {
},
// 提交前钩子函数
beforeUpload () {
// console.log('数据liebiao', this.$refs.upload.uploadFiles)
// //console.log('数据liebiao', this.$refs.upload.uploadFiles)
},
// 上传
submitUpload () {
......@@ -712,11 +712,11 @@ export default {
// 添加自定义参数，不传可删除
// formData.append('parentId', '49')
console.log('formData', formData)
// console.log('this.selectArr', this.selectArr)
// console.log('this.nowSelectRightData', this.nowSelectRightData)
//console.log('formData', formData)
// //console.log('this.selectArr', this.selectArr)
// //console.log('this.nowSelectRightData', this.nowSelectRightData)
// this.$refs.upload.uploadFiles = formData
// console.log('this.$refs.upload.uploadFiles', this.$refs.upload.uploadFiles)
// //console.log('this.$refs.upload.uploadFiles', this.$refs.upload.uploadFiles)
// this.$refs.upload.submit();
this.dialogVisible = true;
this.$axios({
......@@ -726,9 +726,9 @@ export default {
loading: false,
onUploadProgress: function (progressEvent) {
// this.dialogVisible = true;
console.log(progressEvent, 1);
//console.log(progressEvent, 1);
that.UploadPercent = (((progressEvent.loaded / 10 * 9.9) / progressEvent.total) * 100).toFixed(2)
console.log(that.UploadPercent, 123)
//console.log(that.UploadPercent, 123)
// Number(event.percent.toFixed())
},
......@@ -759,7 +759,7 @@ export default {
}
// this.$refs.upload.clearFiles()
this.showProgress = false;
console.info("查询结果===>", res);
//console.info("查询结果===>", res);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(res.data.message);
......@@ -771,11 +771,11 @@ export default {
},
// 删除文件
handleRemove (file, fileList) {
console.log(file, fileList);
//console.log(file, fileList);
},
// 点击文件列表
handlePreview (file) {
console.log('上传文件', file);
//console.log('上传文件', file);
},
// 上传成功
uploadSuccess (res) {
......@@ -798,7 +798,7 @@ export default {
},
// 上传文件夹
uploadFiles () {
// console.log(this.$refs['upload'].$children[0].$refs.input)
// //console.log(this.$refs['upload'].$children[0].$refs.input)
this.$refs['upload'].$children[0].$refs.input.webkitdirectory = true
this.$refs['upload'].$children[0].$refs.input.accept = ".fptx"
this.$refs['upload'].$children[0].$refs.input.click()
......@@ -806,9 +806,9 @@ export default {
// let fileInput = document.getElementById("filewebuploaderdirectory");//这个是文件夹加载
// var fileDic = this.$refs['upload'].$children[0].$refs.input.webkitRelativePath;
// var dicName = fileDic.split('/')[0];
// console.log(dicName, 'dicName')
// //console.log(dicName, 'dicName')
var fileDic = this.$refs['upload'].$children[0].$refs.input
console.log(fileDic, 111222)
//console.log(fileDic, 111222)
},
// 人员/案件逻辑分库
handleCheckAllChange (val) {
......@@ -849,25 +849,25 @@ export default {
this.nowSelectData = val;
},
checkRightAll (val) {
// console.log('val111', val)
// //console.log('val111', val)
this.nowSelectRightData = val;
},
// 选中
handelSelect () {
// let self = this
// console.log('重复文件过滤1', this.nowSelectData)
// console.log('重复文件过滤2', this.selectArr)
// //console.log('重复文件过滤1', this.nowSelectData)
// //console.log('重复文件过滤2', this.selectArr)
// if (this.selectArr.length > 0) {
// for (var i = 0; i <= this.selectArr.length; i++) {
// // console.log(this.selectArr[i].name);
// // console.log(9999, this.nowSelectData[i].name);
// // //console.log(this.selectArr[i].name);
// // //console.log(9999, this.nowSelectData[i].name);
// // 重复文件过滤
// console.log(this.nowSelectData);
// console.log(this.nowSelectData.slice(0, self.nowSelectData.length));
// //console.log(this.nowSelectData);
// //console.log(this.nowSelectData.slice(0, self.nowSelectData.length));
// let existFile = this.nowSelectData.slice(0, self.nowSelectData.length).find(f => f.name === self.selectArr[i].name)
// console.log('existFile', existFile)
// //console.log('existFile', existFile)
// if (existFile) {
// this.$message.error('请去除重复文件!');
// this.nowSelectData.pop()
......@@ -908,7 +908,7 @@ export default {
},
filters: {
typeNum (val) {
console.log(val);
//console.log(val);
// if (!val) return;
const data = {
'0': '查重',
......
src/views/drFPTX/RAList.vue
......@@ -760,7 +760,7 @@ export default {
watch: {
showType (newNum, oldNum) {
// ...
console.log(newNum, 123);
//console.log(newNum, 123);
this.search();
this.clear()
},
......@@ -794,7 +794,7 @@ export default {
reqParam.offSet = this.currPage1;
reqParam.limit = this.pageSize
} else if (this.showType == 2) {
// console.log('bizhong bizhong ')
// //console.log('bizhong bizhong ')
reqUrl = "/api/record/import/affirm/search";
reqParam = {
status: null, // 状态
......@@ -833,21 +833,21 @@ export default {
reqParam.offSet = this.currPage1;
reqParam.limit = this.pageSize
}
// console.info("请求===>", this.reqParam);
// //console.info("请求===>", this.reqParam);
this.$axios.post(reqUrl, reqParam).then((response) => {
// console.info("查询结果===>", response);
// //console.info("查询结果===>", response);
if (response.data.code === 0) {
if (this.showType == 1 || this.showType == 3) {
this.tableDate1 = response.data.ret.pcImportRecordChildren;
this.total1 = response.data.ret.total;
console.log('total', this.total1)
//console.log('total', this.total1)
} else if (this.showType == 2) {
this.tableDate2 = response.data.ret.affirmImportRecordChildren;
this.total2 = response.data.ret.total;
}
// this.reqParam.page.total1 = response.data.ret.total1;
console.info("查询结果1===>", this.tableDate1);
console.info("查询结果2===>", this.tableDate2);
//console.info("查询结果1===>", this.tableDate1);
//console.info("查询结果2===>", this.tableDate2);
} else {
this.$message.error(response.data.message);
}
......@@ -860,7 +860,7 @@ export default {
// // 获取下标
// var i = this.tableDate1.findIndex((table) => table.sequenceNumber === row.sequenceNumber);
// // var i = this.tableData.findIndex(table => table.id === row.id);
// // console.log(i);
// // //console.log(i);
// if (expanded) {
// this.list[i] = {
// qid: row.qid,
......@@ -870,7 +870,7 @@ export default {
// };
// this.$forceUpdate();
// } else {
// console.info("折叠时row数据", this.list[i]);
// //console.info("折叠时row数据", this.list[i]);
// this.list[i] = {
// qid: row.qid,
// children: row.children,
......@@ -889,9 +889,9 @@ export default {
// queryTypeName: row.children[0].queryTypeName,
// removeFlag: row.children[0].removeFlag,
// };
// console.log(this.list[i]);
// //console.log(this.list[i]);
// this.$forceUpdate();
// // console.info("塞完数据的row", this.list[i]);
// // //console.info("塞完数据的row", this.list[i]);
// }
// },
clear () {
......@@ -954,34 +954,34 @@ export default {
},
// 添加到队列
isShowTjddlBtn () {
console.log("添加到队列");
//console.log("添加到队列");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！");
this.isSelected = true;
} else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
//console.log('人员人员')
} else if (this.showType == 3) {
this.type = 'aj'
console.log('案件案件')
//console.log('案件案件')
}
this.rowData = this.multipleSelection;
this.isShowTjddl = true;
}
},
closeTjddl (val) {
console.log("添加到队列关闭", val);
//console.log("添加到队列关闭", val);
this.isShowTjddl = val;
},
//复制条码列表操作
isShowFztmBtn (val) {
console.log("复制条码", val);
//console.log("复制条码", val);
this.rowData = val;
this.isShowFztm = true;
},
closeFztm (val) {
console.log("closeFztm复制条码关闭", val);
//console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val;
this.search();
},
......@@ -994,10 +994,10 @@ export default {
} else {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
//console.log('人员人员')
} else if (this.showType == 3) {
this.type = 'aj'
console.log('案件案件')
//console.log('案件案件')
}
this.rowData = this.multipleSelection;
this.isShowFcx = true;
......@@ -1006,19 +1006,19 @@ export default {
isShowFcxBtn1 (val) {
if (this.showType == 1) {
this.type = "ry"
console.log('人员人员')
//console.log('人员人员')
} else if (this.showType == 3) {
this.type = 'aj'
console.log('案件案件')
//console.log('案件案件')
}
console.log("单行人员发查询数据", val);
//console.log("单行人员发查询数据", val);
let rowVal = [];
rowVal.push(val);
this.rowData = rowVal;
this.isShowFcx = true;
},
closeFcx (val) {
console.log("发查询关闭", val);
//console.log("发查询关闭", val);
this.isShowFcx = val;
this.search();
},
......@@ -1041,7 +1041,7 @@ export default {
* @return {*}
*/
handleClick (row) {
console.log(row);
//console.log(row);
if (this.showType == 1) {
this.$router.push("/ryzwbj/" + row.id + "/" + row.barcode);
} else if (this.showType == 3) {
......@@ -1055,7 +1055,7 @@ export default {
*/
handleSelectionChange (val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
// if (this.multipleSelection.length) {
// this.isShowTip = true;
// } else {
......@@ -1069,7 +1069,7 @@ export default {
*/
handleSizeChange1 (pageSize) {
this.pageSize = pageSize;
console.log("每页条数", this.pageSize);
//console.log("每页条数", this.pageSize);
},
/**
* @description: currentPage 改变时会触发
......@@ -1078,7 +1078,7 @@ export default {
*/
handleCurrentChange1 (page) {
this.currPage1 = page;
console.log("当前页", this.currPage1);
//console.log("当前页", this.currPage1);
this.search();
},
/**
......@@ -1088,7 +1088,7 @@ export default {
*/
handleSizeChange2 (pageSize) {
this.pageSize = pageSize;
console.log("每页条数", this.pageSize);
//console.log("每页条数", this.pageSize);
},
/**
* @description: currentPage 改变时会触发
......@@ -1097,7 +1097,7 @@ export default {
*/
handleCurrentChange2 (page) {
this.currPage2 = page;
console.log("当前页", this.currPage2);
//console.log("当前页", this.currPage2);
this.search();
},
/**
......@@ -1113,7 +1113,7 @@ export default {
} else {
this.$refs.multipleTable.clearSelection();
}
console.log(this.multipleSelection);
//console.log(this.multipleSelection);
},
disabledDate (a) {
if (a.getTime() > new Date().getTime()) {
......@@ -1133,7 +1133,7 @@ export default {
* @return {*}
*/
Tpage1 () {
console.log(this.total1, this.pageSize, 1112223333)
//console.log(this.total1, this.pageSize, 1112223333)
return (
Math.floor(this.total1 / this.pageSize) + 1
);
......@@ -1146,7 +1146,7 @@ export default {
},
mounted () {
this.search();
console.log(this.$route.query.id, 'this.$route.query.id')
//console.log(this.$route.query.id, 'this.$route.query.id')
this.showType = this.$route.query.id || "1";
},
......
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