Skip to content

F
founder_vue
Commit f290f2d8 by 张超军
Options

修改路由+案件档案信息+案件/人员ui

parent 35eee2ff
Showing with 2062 additions and 1028 deletions
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/SelectCode.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* @FilePath: \founder_vue\src\components\SelectCode.vue * @FilePath: \founder_vue\src\components\SelectCode.vue
--> -->
<template> <template>
<div :style="{ width: width + 'px' }"> <div :style="{ width: width + 'rem' }">
<el-select <el-select
v-model="value" v-model="value"
filterable filterable
...@@ -109,4 +109,4 @@ export default { ...@@ -109,4 +109,4 @@ export default {
} }
} }
} }
</style> </style>
\ No newline at end of file
src/router/modules/index.js
...@@ -47,8 +47,8 @@ export default [ ...@@ -47,8 +47,8 @@ export default [
component: () => import("@/views/login/Login1.vue") component: () => import("@/views/login/Login1.vue")
}, },
{ {
path: "/Home/Home", path: "/gateway",
name: "Home", name: "gateway",
meta: { meta: {
title: "首页", title: "首页",
auth: "5" auth: "5"
......
src/store/index.js
...@@ -15,6 +15,7 @@ import zwbj from "./modules/zwbj" ...@@ -15,6 +15,7 @@ import zwbj from "./modules/zwbj"
import layout from "./modules/layout" import layout from "./modules/layout"
import publicData from "./modules/publicData" import publicData from "./modules/publicData"
import rydaxx from "./modules/rydaxx"; import rydaxx from "./modules/rydaxx";
import ajdaxx from "./modules/ajdaxx";
Vue.use(Vuex); Vue.use(Vuex);
...@@ -24,7 +25,8 @@ const store = new Vuex.Store({ ...@@ -24,7 +25,8 @@ const store = new Vuex.Store({
zwbj, zwbj,
layout, layout,
publicData, publicData,
rydaxx rydaxx,
ajdaxx
}, },
getters, getters,
plugins: [ 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' ...@@ -16,3 +16,4 @@ export const SET_AUTOZYHZ = 'setAutoZyhz'
// 人员档案信息 // 人员档案信息
export const SET_RYINFO = 'setRyInfo' export const SET_RYINFO = 'setRyInfo'
export const SET_AJINFO = 'setAjInfo'
src/views/AllPersonnelBase/qbalk.vue
...@@ -477,14 +477,14 @@ export default { ...@@ -477,14 +477,14 @@ export default {
}, },
// 获取案件数据 // 获取案件数据
search () { search () {
// //console.info("案件请求===>", this.reqParam); // console.info("案件请求===>", this.reqParam);
this.$axios this.$axios
.post("/api/casestore/allcase", this.reqParam) .post("/api/casestore/allcase", this.reqParam)
.then(response => { .then(response => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.tableDate = response.data.ret.list; this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total; this.reqParam.page.total = response.data.ret.total;
//console.info("案件库返回列表===>", this.tableDate); console.info("案件库返回列表===>", this.tableDate);
} else { } else {
this.$message.error(response.data.message); this.$message.error(response.data.message);
} }
...@@ -521,11 +521,11 @@ export default { ...@@ -521,11 +521,11 @@ export default {
}, },
// 单选删除 // 单选删除
delOne (val) { delOne (val) {
//console.log("删除数据") console.log("删除数据")
// 将传入的psns转为数组 // 将传入的psns转为数组
let ids = []; let ids = [];
ids.push(val); ids.push(val);
//console.info("删除接口里的cids：", ids); console.info("删除接口里的cids：", ids);
this.doDelete(ids.toString()); this.doDelete(ids.toString());
}, },
// 请求删除接口 // 请求删除接口
...@@ -561,9 +561,9 @@ export default { ...@@ -561,9 +561,9 @@ export default {
}, },
//滚动平面等筛选条件 //滚动平面等筛选条件
searchCheckList (val) { searchCheckList (val) {
//console.log(val, '筛选条件') console.log(val, '筛选条件')
this.reqParam.page.caseCheckboxQuery = val this.reqParam.page.caseCheckboxQuery = val
//console.log(this.reqParam.page.caseCheckboxQuery) console.log(this.reqParam.page.caseCheckboxQuery)
this.search() this.search()
}, },
// 复制条码号 获取选中条码值 // 复制条码号 获取选中条码值
...@@ -599,7 +599,7 @@ export default { ...@@ -599,7 +599,7 @@ export default {
}, },
closeDcfptx1 (val) { closeDcfptx1 (val) {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
//console.log('导出FPTX关闭', val) console.log('导出FPTX关闭', val)
this.isShowDcfptx1 = val this.isShowDcfptx1 = val
}, },
// 复制成功时的回调函数 // 复制成功时的回调函数
...@@ -620,7 +620,7 @@ export default { ...@@ -620,7 +620,7 @@ export default {
}, },
// 添加到队列 // 添加到队列
isShowTjddlBtn () { isShowTjddlBtn () {
//console.log('添加到队列') console.log('添加到队列')
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！"); this.$message.error("请选择需要添加到队列的数据！");
this.selectBoo = true this.selectBoo = true
...@@ -631,12 +631,12 @@ export default { ...@@ -631,12 +631,12 @@ export default {
}, },
closeTjddl (val) { closeTjddl (val) {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
//console.log('添加到队列关闭', val) console.log('添加到队列关闭', val)
this.isShowTjddl = val this.isShowTjddl = val
}, },
// 关注 // 关注
isShowGzBtn () { // 多行 isShowGzBtn () { // 多行
//console.log('关注') console.log('关注')
let newarr = []; let newarr = [];
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要关注的数据！"); this.$message.error("请选择需要关注的数据！");
...@@ -659,7 +659,7 @@ export default { ...@@ -659,7 +659,7 @@ export default {
} }
}, },
isShowGzBtn1 (val) { // 单行 isShowGzBtn1 (val) { // 单行
//console.log(val, 123) console.log(val, 123)
let rowVal = []; let rowVal = [];
rowVal.push(val) rowVal.push(val)
this.rowData = rowVal this.rowData = rowVal
...@@ -667,7 +667,7 @@ export default { ...@@ -667,7 +667,7 @@ export default {
}, },
closeGz (val) { closeGz (val) {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
//console.log('关注关闭', val) console.log('关注关闭', val)
this.isShowGz = val this.isShowGz = val
if (val == false) { if (val == false) {
this.search(); this.search();
...@@ -690,13 +690,13 @@ export default { ...@@ -690,13 +690,13 @@ export default {
}, },
// 更改条码操作 // 更改条码操作
isShowGgrytmBtn (val) { isShowGgrytmBtn (val) {
//console.log('更改条码', val) console.log('更改条码', val)
this.rowData = val this.rowData = val
this.isShowGgrytm = true; this.isShowGgrytm = true;
}, },
closeGgrytm (val) { closeGgrytm (val) {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
//console.log('更改条码关闭', val) console.log('更改条码关闭', val)
this.isShowGgrytm = val this.isShowGgrytm = val
if (val == false) { if (val == false) {
this.search(); this.search();
...@@ -704,13 +704,13 @@ export default { ...@@ -704,13 +704,13 @@ export default {
}, },
//复制条码列表操作 //复制条码列表操作
isShowFztmBtn (val) { isShowFztmBtn (val) {
//console.log('复制条码', val) console.log('复制条码', val)
this.rowData = val this.rowData = val
this.isShowFztm = true; this.isShowFztm = true;
}, },
closeFztm (val) { closeFztm (val) {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
//console.log('closeFztm复制条码关闭', val) console.log('closeFztm复制条码关闭', val)
this.isShowFztm = val this.isShowFztm = val
if (val == false) { if (val == false) {
this.search(); this.search();
...@@ -727,7 +727,7 @@ export default { ...@@ -727,7 +727,7 @@ export default {
} }
}, },
isShowFcxBtn1 (val) { isShowFcxBtn1 (val) {
//console.log('单行案件发查询数据', val) console.log('单行案件发查询数据', val)
let rowVal = []; let rowVal = [];
rowVal.push(val) rowVal.push(val)
this.rowData = rowVal this.rowData = rowVal
...@@ -735,7 +735,7 @@ export default { ...@@ -735,7 +735,7 @@ export default {
}, },
closeFcx (val) { closeFcx (val) {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
//console.log('发查询关闭', val) console.log('发查询关闭', val)
this.isShowFcx = val this.isShowFcx = val
// this.search() // this.search()
}, },
...@@ -745,7 +745,7 @@ export default { ...@@ -745,7 +745,7 @@ export default {
}, },
closeXzaj (val) { closeXzaj (val) {
this.$bus.emit('isBlur', val) this.$bus.emit('isBlur', val)
//console.log('新增案件关闭', val) console.log('新增案件关闭', val)
this.isShowXzaj = val this.isShowXzaj = val
if (val == false) { if (val == false) {
this.search(); this.search();
...@@ -768,7 +768,7 @@ export default { ...@@ -768,7 +768,7 @@ export default {
* @return {*} * @return {*}
*/ */
handleClick (row) { handleClick (row) {
//console.log(row); console.log(row);
this.$router.push('/ajzwbj/' + row.id + '/' + row.ysxtAsjbh) this.$router.push('/ajzwbj/' + row.id + '/' + row.ysxtAsjbh)
}, },
/** /**
...@@ -778,7 +778,7 @@ export default { ...@@ -778,7 +778,7 @@ export default {
*/ */
handleSelectionChange (val) { handleSelectionChange (val) {
this.multipleSelection = val; this.multipleSelection = val;
//console.log(this.multipleSelection); console.log(this.multipleSelection);
// if (this.multipleSelection.length) { // if (this.multipleSelection.length) {
// this.isShowTip = true; // this.isShowTip = true;
// } else { // } else {
...@@ -793,7 +793,7 @@ export default { ...@@ -793,7 +793,7 @@ export default {
handleSizeChange (pageSize) { handleSizeChange (pageSize) {
this.reqParam.page.pageSize = pageSize; this.reqParam.page.pageSize = pageSize;
this.search(); this.search();
//console.log(pageSize); console.log(pageSize);
}, },
/** /**
* @description: currentPage 改变时会触发 * @description: currentPage 改变时会触发
...@@ -803,7 +803,7 @@ export default { ...@@ -803,7 +803,7 @@ export default {
handleCurrentChange (page) { handleCurrentChange (page) {
this.reqParam.page.currPage = page; this.reqParam.page.currPage = page;
this.search(); this.search();
//console.log(page); console.log(page);
}, },
/** /**
* @description: 清除所有选项 * @description: 清除所有选项
...@@ -818,11 +818,11 @@ export default { ...@@ -818,11 +818,11 @@ export default {
} else { } else {
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();
} }
//console.log(this.multipleSelection); console.log(this.multipleSelection);
} }
}, },
mounted () { mounted () {
// //console.log(this.$route); // console.log(this.$route);
this.search(); this.search();
// 从门户中进来，直接打开新增案件弹出框 // 从门户中进来，直接打开新增案件弹出框
if (this.$route.query.xzaj === 'true') { if (this.$route.query.xzaj === 'true') {
......
src/views/Editor/ajzwbj.vue
...@@ -10,17 +10,20 @@ ...@@ -10,17 +10,20 @@
<div class="ajzwbj"> <div class="ajzwbj">
<ajzwbj-left></ajzwbj-left> <ajzwbj-left></ajzwbj-left>
<imageEDAJ></imageEDAJ> <imageEDAJ></imageEDAJ>
<ajdaxx></ajdaxx>
</div> </div>
</template> </template>
<script> <script>
import ajdaxx from "./modules/ajdaxx.vue";
import ajzwbjLeft from './modules/ajzwbjLeft.vue'; import ajzwbjLeft from './modules/ajzwbjLeft.vue';
import imageEDAJ from './modules/imageEdAJ.vue'; import imageEDAJ from './modules/imageEdAJ.vue';
export default { export default {
name: 'ajzwbj', name: 'ajzwbj',
components: { components: {
ajzwbjLeft, ajzwbjLeft,
imageEDAJ imageEDAJ,
ajdaxx
}, },
} }
</script> </script>
...@@ -31,4 +34,4 @@ import imageEDAJ from './modules/imageEdAJ.vue'; ...@@ -31,4 +34,4 @@ import imageEDAJ from './modules/imageEdAJ.vue';
height: calc(100% - 47px); height: calc(100% - 47px);
display: flex; display: flex;
} }
</style> </style>
\ No newline at end of file
src/views/Editor/modules/ajdaxx.vue 0 → 100644
<template>
<el-drawer
size="50%"
class="rydaxx-drawer ajdaxx-drawer"
:modal="false"
:wrapperClosable="false"
:append-to-body="true"
:modal-append-to-body="false"
:visible.sync="drawer"
:with-header="false">
<div class="header">
<div class="header-title">案件档案信息</div>
<div class="header-close" @click="closeDrawer">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-fanhui"></use>
</svg>
</div>
</div>
<div class="content drawer-content">
<el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="10.125rem" class="demo-ruleForm" :status-icon="true">
<div class="ayzzwjbxx">
<div class="title">
<div class="line"></div>
<span class="name">案事件基本信息</span>
</div>
<div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item">
<el-form-item label="案事件编号：" prop="ysxtAsjbh">
<el-input placeholder="请输入案事件编号" v-model="ruleForm.ysxtAsjbh" maxlength="23" show-word-limit disabled></el-input>
</el-form-item>
<el-form-item label="现场勘验编号：" prop="xckybh">
<el-input placeholder="请输入现场勘验编号" v-model="ruleForm.xckybh" maxlength="23" show-word-limit></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="案事件发生地点：" prop="asjfsddDzmc">
<el-input placeholder="请输入现场掌指纹卡编号" v-model="ruleForm.asjfsddDzmc"></el-input>
</el-form-item>
<el-form-item label="现场掌指纹卡编号：" prop="xczzhwkbh">
<el-input placeholder="请输入现场掌指纹卡编号" v-model="ruleForm.xczzhwkbh" maxlength="23" show-word-limit></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="损失价值（人民币元）：" prop="ssjzrmby">
<el-input placeholder="根据代码自动匹配" v-model="ruleForm.ssjzrmby"></el-input>
</el-form-item>
<el-form-item label="命案" prop="sfmaPdbz" class="ma-item">
<el-radio-group v-model="ruleForm.sfmaPdbz">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="案件类别：" prop="ajlbdm">
<el-select v-model="ruleForm.ajlbdm" placeholder="根据代码自动匹配">
<el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option>
</el-select>
</el-form-item>
</div>
<div class="ayzzwjbxx-item ayzzwjbxx-item2">
<el-form-item label="简要案情：" prop="jyaq" class="input3">
<el-input type="textarea" :rows="2" placeholder="请输入简要案情" v-model="ruleForm.jyaq"></el-input>
</el-form-item>
</div>
</div>
<div class="horizontal-line"></div>
<div class="title">
<div class="line"></div>
<span class="name">案件逻辑分库</span>
</div>
<div class="ryljfk">
<el-form-item prop="logicdbtype2" class="fk">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
<el-checkbox-group v-model="ruleForm.logicdbtype2" @change="handleCheckedCitiesChange">
<el-checkbox v-for="(item,index) in ryljfkArr" :label="item" :key="index">{{item}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</div>
<div class="horizontal-line"></div>
<div class="title">
<div class="line"></div>
<span class="name">指掌纹提取信息</span>
</div>
<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>-->
<Cascader :form="ruleForm" id="unitCode"></Cascader>
</el-form-item>
<el-form-item label="提取人姓名：" prop="tqryXm">
<el-input placeholder="请输入提取人姓名" v-model="ruleForm.tqryXm"></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="提取时间：" prop="tqsj">
<el-date-picker type="date" placeholder="请输入提取时间" v-model="ruleForm.tqsj"></el-date-picker>
</el-form-item>
<el-form-item label="提取人身份证号：" prop="tqryGmsfhm">
<el-input placeholder="请输入提取人身份证号" v-model="ruleForm.tqryGmsfhm"></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<div></div>
<el-form-item label="提取人联系电话：" prop="tqryLxdh">
<el-input placeholder="请输入提取人联系电话" v-model="ruleForm.tqryLxdh"></el-input>
</el-form-item>
</div>
</div>
<div class="horizontal-line"></div>
<div class="title">
<div class="line"></div>
<span class="name">操作记录列表</span>
</div>
<div class="czjl-table">
<el-table
:header-cell-style="{background: '#F6F8FA',color:'#282F3C'}"
:data="tableData"
border
style="width: 100%">
<el-table-column
align="center"
:width="width1"
type="index">
</el-table-column>
<el-table-column
prop="czr"
align="center"
label="操作人"
width="auto">
</el-table-column>
<el-table-column
prop="czrq"
align="center"
label="操作日期"
width="auto">
</el-table-column>
<el-table-column
prop="czsj"
align="center"
label="操作事件"
width="auto">
</el-table-column>
</el-table>
</div>
</div>
<div class="horizontal-line"></div>
<div class="form-footer">
<div class="save" @click="submitForm('ruleForm')">保存</div>
<div class="cancel" @click="resetForm('ruleForm')">取消</div>
<div class="export" @click="isShowDcftpxBtn">FPTX导出</div>
</div>
</el-form>
</div>
<div class="arrow-down" @click="goBottom">
<img class="arrow-down-img" src="@/assets/img/jiantou.gif" alt="">
</div>
<!-- 导出FPTX弹窗 -->
<dcfptxAj
:isShowDcfptx1="isShowDcfptx1"
:rowData="rowData"
@closeDcfptx1="closeDcfptx1"
></dcfptxAj>
</el-drawer>
</template>
<script>
import dcfptxAj from "../../AllPersonnelBase/modules/dcfptxAj.vue";
import SelectCode from "../../../components/SelectCode.vue";
import Cascader from "@/components/Cascader.vue";
import {mapState} from "vuex";
export default {
name: "rydaxx",
data() {
return {
isShowDcfptx1: false, // 导出FPTX
arrow: 'bottom',
width1: 80,
drawer: false,
checkAll: false,
ryljfkArr: ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库', '协查案件库'],
isIndeterminate: true,
ruleForm: {
id: '',
ysxtAsjbh: '',
xckybh: '',
asjfsddDzmc: '',
xczzhwkbh: '',
ssjzrmby: '',
sfmaPdbz: 0,
ajlbdm: '',
jyaq: '',
logicdbtype2: ['本地案件库', '比中案件库'],
logicdbtype: "000",
unitCode: '430000000000',
tqryXm: '',
tqsj: '',
tqryGmsfhm: '',
tqryLxdh: ''
},
rules: {
ysxtAsjbh: [
{ min: 23, max: 23, message: '编号长度有误！', trigger: 'change' },
{ required: true, message: '请输入案事件编号!', trigger: 'blur' },
],
asjfsddDzmc: [
{ required: true, message: '请输入案事件发生地点!', trigger: 'blur' }
],
sfmaPdbz: [
{ required: true, message: '请选择命案!', trigger: 'change' }
],
unitCode: [
{ required: true, message: '请输入提取单位代码!', trigger: 'blur' }
],
tqryXm: [
{ required: true, message: '请输入提取人姓名!', trigger: 'blur' }
],
tqsj: [
{ required: true, message: '请输入提取时间!', trigger: 'change' }
],
tqryGmsfhm: [
{ required: true, message: '请输入提取人身份证号!', trigger: 'blur' }
],
},
tableData: [{
czr: '系统管理员',
czrq: '2021.12.10. 23:59:59',
czsj: '编辑档案信息'
}, {
czr: '系统管理员',
czrq: '2021.12.10. 23:59:59',
czsj: '编辑档案信息'
}, {
czr: '系统管理员',
czrq: '2021.12.10. 23:59:59',
czsj: '编辑档案信息'
}, {
czr: '系统管理员',
czrq: '2021.12.10. 23:59:59',
czsj: '编辑档案信息'
},{
czr: '系统管理员',
czrq: '2021.12.10. 23:59:59',
czsj: '编辑档案信息'
}],
rowData: []
};
},
computed: {
...mapState({
ajInfo: state => state.ajdaxx.ajInfo,
})
},
created() {
let self = this;
let w1 = 1920;
let w2 = window.innerWidth;
this.width1 = (this.width1 * w2) / w1;
// 打开侧边抽屉
this.$bus.on("openAjDaxx", (flag) => {
console.log(flag);
self.drawer = flag;
// 开启毛玻璃
self.$bus.emit('isBlur', true)
});
// 人员档案信息
console.log(this.ajInfo);
this.initData()
},
methods: {
/**
* 关闭FPTX
* @param val
*/
closeDcfptx1 (val) {
this.$bus.emit('isBlur', val)
this.isShowDcfptx1 = val;
},
/**
* 导出FPTX
*/
isShowDcftpxBtn() {
this.rowData = [this.ajInfo];
this.isShowDcfptx1 = true;
},
/**
* 跳到最底部
*/
goBottom() {
let rydaxxDrawer = document.querySelector('.ayzzwjbxx')
// 判断上移还是下移
if(this.arrow == 'top') {
rydaxxDrawer.scrollIntoView({block: "start"});
$('.arrow-down-img').css('transform', 'rotate(0deg)');
this.arrow = 'bottom'
} else {
rydaxxDrawer.scrollIntoView({block: "end"});
$('.arrow-down-img').css('transform', 'rotate(180deg)');
this.arrow = 'top'
}
},
handleCheckAllChange(val) {
console.log(val);
this.ruleForm.logicdbtype2 = val ? this.ryljfkArr : [];
this.isIndeterminate = false;
},
handleCheckedCitiesChange(value) {
console.log(value);
let checkedCount = value.length;
this.checkAll = checkedCount === this.ryljfkArr.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.ryljfkArr.length;
},
/**
* 初始化数据
*/
initData() {
// 赋值
this.ruleForm.id = this.ajInfo.id
this.ruleForm.ysxtAsjbh = this.ajInfo.ysxtAsjbh
this.ruleForm.xckybh = this.ajInfo.xckybh
this.ruleForm.asjfsddDzmc = this.ajInfo.asjfsddDzmc
this.ruleForm.xczzhwkbh = this.ajInfo.xczzhwkbh
this.ruleForm.ssjzrmby = this.ajInfo.ssjzrmby
this.ruleForm.sfmaPdbz = this.ajInfo.sfmaPdbz
this.ruleForm.ajlbdm = this.ajInfo.ajlbdm
this.ruleForm.jyaq = this.ajInfo.jyaq
this.ruleForm.logicdbtype = this.ajInfo.logicdbtype
this.ruleForm.unitCode = this.ajInfo.tqdwGajgjgdm
this.ruleForm.tqryXm = this.ajInfo.tqryXm
this.ruleForm.tqsj = this.ajInfo.tqsj
this.ruleForm.tqryGmsfhm = this.ajInfo.tqryGmsfhm
this.ruleForm.tqryLxdh = this.ajInfo.tqryLxdh
},
/**
* 关闭抽屉
*/
closeDrawer() {
this.drawer = false
// 关闭毛玻璃
this.$bus.emit('isBlur', false)
// 清空表单
this.resetForm('ruleForm')
},
/**
* 提交表单
* @param formName
*/
submitForm(formName) {
let self = this
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
self.$axios({
method: 'post',
headers: {
"Content-Type": "application/json;charset=UTF-8"
},
url: '/api/casestore/case/file',
data: JSON.stringify(self.ruleForm)
}).then(res => {
console.log(res);
})
} else {
console.log('error submit!!');
return false;
}
});
},
/**
* 重置表单
* @param formName
*/
resetForm(formName) {
// this.$refs[formName].resetFields();
this.closeDrawer()
}
},
components: {
SelectCode,
Cascader,
dcfptxAj
}
};
</script>
<style scoped lang="scss">
@import "./rydaxx.scss";
</style>
<style lang="scss">
// 修改下拉框样式
.el-select-dropdown__item {
padding-left: 20px;
}
</style>
src/views/Editor/modules/ajzwbjLeft.scss
...@@ -20,11 +20,13 @@ ...@@ -20,11 +20,13 @@
margin-right: 10px; margin-right: 10px;
} }
img { img {
cursor: pointer;
width: 16px; width: 16px;
height: 16px; height: 16px;
margin-right: 5px; margin-right: 5px;
} }
.desc { .desc {
cursor: pointer;
color: #055fe7; color: #055fe7;
font-weight: normal; font-weight: normal;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
...@@ -83,7 +85,7 @@ ...@@ -83,7 +85,7 @@
margin-top: 5px; margin-top: 5px;
.lr-hand { .lr-hand {
width: 100%; width: 100%;
height: 600px; height: 640px;
overflow: auto; overflow: auto;
:nth-child(even) { :nth-child(even) {
margin-left: 8px; margin-left: 8px;
......
src/views/Editor/modules/ajzwbjLeft.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<div class="title">案事件编号：</div> <div class="title">案事件编号：</div>
<div class="asjbh"> <div class="asjbh">
<span>{{barcode}}</span> <span>{{barcode}}</span>
<img src="@/assets/img/message.png" alt=""> <img src="@/assets/img/message.png" alt="" @click="daxxChange">
<div class="desc">档案信息</div> <div class="desc" @click="daxxChange">档案信息</div>
</div> </div>
<div class="ryzwbj-content"> <div class="ryzwbj-content">
<div class="zzw"> <div class="zzw">
...@@ -163,10 +163,26 @@ export default { ...@@ -163,10 +163,26 @@ export default {
self.preSeq = this.activerollFinger self.preSeq = this.activerollFinger
// 获取案件指纹 // 获取案件指纹
this.getCaseFinger() if(this.id != 'xz') {
// 不是新增就查询案件指纹，进行编辑
this.getCaseFinger()
// this.changeCaseFingerPNG()
}
}, },
methods: { 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图 * 切换指纹PNG图
* @param finger * @param finger
*/ */
...@@ -174,7 +190,8 @@ export default { ...@@ -174,7 +190,8 @@ export default {
//console.log(finger); //console.log(finger);
this.$store.commit('zwbj/setSeq', finger.code) 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') this.$bus.emit('ajzwbjTDZ')
}, },
/** /**
...@@ -199,7 +216,7 @@ export default { ...@@ -199,7 +216,7 @@ export default {
if (res.data.code === 0) { if (res.data.code === 0) {
for (const key in res.data.ret) { 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') self.$bus.emit('ajzwbjTDZ')
} }
} }
...@@ -223,7 +240,7 @@ export default { ...@@ -223,7 +240,7 @@ export default {
barcode: self.barcode barcode: self.barcode
} }
}).then(res => { }).then(res => {
// //console.log(res); console.log(res);
if (res.data.code === 0) { if (res.data.code === 0) {
// self.fingers = res.data.ret // self.fingers = res.data.ret
self.fingers = [] self.fingers = []
...@@ -232,7 +249,9 @@ export default { ...@@ -232,7 +249,9 @@ export default {
const element = res.data.ret[key]; const element = res.data.ret[key];
self.fingers.push({ self.fingers.push({
code: element.seq, code: element.seq,
image: element.image image: element.image,
dealFlag: element.dealFlag,
finger_position: element.fingerPosition
}) })
} }
} }
...@@ -307,8 +326,8 @@ export default { ...@@ -307,8 +326,8 @@ export default {
// 调取获取原图接口 // 调取获取原图接口
// this.getCaseOrigin(finger.code) // this.getCaseOrigin(finger.code)
console.log(finger);
// 切换指纹PNG // 切换指纹-- 直接贴图，不再请求接口
this.changeCaseFingerPNG(finger) this.changeCaseFingerPNG(finger)
}, },
/** /**
......
src/views/Editor/modules/imageEd.scss
...@@ -979,7 +979,7 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -979,7 +979,7 @@ $transOrigin: var(--transOrigin, 0px, 0px);
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
transform-origin: 320px 320px; transform-origin: 320px 320px;
//z-index: 9999; z-index: 9999;
// transform-origin: $transOrigin; // transform-origin: $transOrigin;
// background-color: #999; // background-color: #999;
} }
......
src/views/Editor/modules/imageEd.vue
...@@ -234,10 +234,14 @@ ...@@ -234,10 +234,14 @@
<div class="save"> <div class="save">
<div class="save-types">选择保存类型：</div> <div class="save-types">选择保存类型：</div>
<div class="dqzwtz" :class="{active: saveType==='当前指位特征'}" @click.stop="changeSaveType('当前指位特征')"> <div class="dqzwtz" :class="{active: saveType==='当前指位特征'}" @click.stop="changeSaveType('当前指位特征')">
<img src="@/assets/img/rybj/dqzw.png" alt=""> <el-tooltip class="item" effect="dark" content="保存当前指位特征" placement="top" :open-delay="500">
<img src="@/assets/img/rybj/dqzw.png" alt="">
</el-tooltip>
</div> </div>
<div class="qbzwtz" :class="{active: saveType==='全部指位特征'}" @click.stop="changeSaveType('全部指位特征')"> <div class="qbzwtz" :class="{active: saveType==='全部指位特征'}" @click.stop="changeSaveType('全部指位特征')">
<img src="@/assets/img/rybj/qbzw.png" alt=""> <el-tooltip class="item" effect="dark" content="保存全部指位特征" placement="top" :open-delay="500">
<img src="@/assets/img/rybj/qbzw.png" alt="">
</el-tooltip>
</div> </div>
<div class="save-btn" v-if="saveType==''">保存</div> <div class="save-btn" v-if="saveType==''">保存</div>
<div class="save-btn isActive" v-else @click="goSave">保存</div> <div class="save-btn isActive" v-else @click="goSave">保存</div>
...@@ -367,7 +371,7 @@ export default { ...@@ -367,7 +371,7 @@ export default {
isShowsizeOptions: false, isShowsizeOptions: false,
issize: true, issize: true,
ismoderate: false, ismoderate: false,
saveType: "选择保存类型", saveType: "当前指位特征",
isShowSaveTypeOptions: false, isShowSaveTypeOptions: false,
isZYQY: false, isZYQY: false,
isTZ: true, isTZ: true,
...@@ -1266,7 +1270,7 @@ export default { ...@@ -1266,7 +1270,7 @@ export default {
// 更新工具栏的优先级 // 更新工具栏的优先级
setTimeout(() => { setTimeout(() => {
// TODO // TODO
// $(".center").css('z-index', '99999') $(".center").css('z-index', '99999')
// 旋转下拉框 // 旋转下拉框
$(".rotateOptions").css('z-index', '99999') $(".rotateOptions").css('z-index', '99999')
}, 1200) }, 1200)
...@@ -1329,6 +1333,7 @@ export default { ...@@ -1329,6 +1333,7 @@ export default {
} }
} }
}); });
console.log(self.tzdArr);
}); });
// 监听是否选择了掌纹===展示缩略图 // 监听是否选择了掌纹===展示缩略图
...@@ -1756,9 +1761,16 @@ export default { ...@@ -1756,9 +1761,16 @@ export default {
var origin_direction_y = 0; var origin_direction_y = 0;
document.body.addEventListener("mousedown", function (e) { document.body.addEventListener("mousedown", function (e) {
if (self.isdirection) { if (self.isdirection) {
// 动态计算坐标的原始位置
let o_x = 1135
let o_y = 787
let w1 = 1920;
let w2 = window.innerWidth;
o_x = o_x * w2 / w1;
o_y = o_y * w2 / w1;
direction_flag = true; direction_flag = true;
origin_direction_x = e.clientX - 1135; origin_direction_x = e.clientX - o_x;
origin_direction_y = e.clientY - 787; origin_direction_y = e.clientY - o_y;
//console.log(origin_direction_x); //console.log(origin_direction_x);
//console.log(origin_direction_y); //console.log(origin_direction_y);
} }
...@@ -1766,8 +1778,16 @@ export default { ...@@ -1766,8 +1778,16 @@ export default {
document.body.addEventListener("mousemove", function (e) { document.body.addEventListener("mousemove", function (e) {
if (self.isdirection) { if (self.isdirection) {
if (direction_flag) { if (direction_flag) {
let direction_x = e.clientX - 1135; // 动态计算坐标的原始位置
let direction_y = e.clientY - 787; let o_x = 1135
let o_y = 787
let w1 = 1920;
let w2 = window.innerWidth;
o_x = o_x * w2 / w1;
o_y = o_y * w2 / w1;
let direction_x = e.clientX - o_x;
let direction_y = e.clientY - o_y;
//console.log(direction_x); //console.log(direction_x);
//console.log(direction_y); //console.log(direction_y);
let cos = ((origin_direction_x * direction_x) + (origin_direction_y * direction_y)) / (Math.sqrt((origin_direction_x * origin_direction_x) + (origin_direction_y * origin_direction_y)) * Math.sqrt((direction_x * direction_x) + (direction_y * direction_y))); let cos = ((origin_direction_x * direction_x) + (origin_direction_y * direction_y)) / (Math.sqrt((origin_direction_x * origin_direction_x) + (origin_direction_y * origin_direction_y)) * Math.sqrt((direction_x * direction_x) + (direction_y * direction_y)));
...@@ -2839,8 +2859,14 @@ export default { ...@@ -2839,8 +2859,14 @@ export default {
let sessionArr = []; let sessionArr = [];
let allTZData = []; let allTZData = [];
//console.log("111"); //console.log("111");
sessionStorage.setItem(self.seq, JSON.stringify(self.preTzdArr)); // 防止在保存前直接设置为null
sessionStorage.setItem(`auto${self.seq}`, JSON.stringify(self.autopretzdall)); if(self.preTzdArr != null) {
sessionStorage.setItem(self.seq, JSON.stringify(self.preTzdArr));
}
if(self.autopretzdall != null) {
sessionStorage.setItem(`auto${self.seq}`, JSON.stringify(self.autopretzdall));
}
var sessionKeys = Object.keys(sessionStorage); var sessionKeys = Object.keys(sessionStorage);
for (var i = 0; i < sessionKeys.length; i++) { for (var i = 0; i < sessionKeys.length; i++) {
...@@ -2850,16 +2876,23 @@ export default { ...@@ -2850,16 +2876,23 @@ export default {
if (sessionKeys[i][0] === "a") { if (sessionKeys[i][0] === "a") {
// 记录session保存的个数 // 记录session保存的个数
sessionArr.push(sessionStorage.getItem(sessionKeys[i])); sessionArr.push(sessionStorage.getItem(sessionKeys[i]));
for (var j = 0; j < sessionKeys.length; j++) { for (var j = 0; j < sessionKeys.length; j++) {
console.log(sessionKeys[j]);
console.log(sessionKeys[i].substring(4, sessionKeys[i].length));
console.log("=========================");
if (sessionKeys[j] == sessionKeys[i].substring(4, sessionKeys[i].length)) { if (sessionKeys[j] == sessionKeys[i].substring(4, sessionKeys[i].length)) {
//console.log(JSON.parse(sessionStorage.getItem(sessionKeys[j]))); console.log(sessionKeys[j]);
//console.log(JSON.parse(sessionStorage.getItem(sessionKeys[i]))); console.log(JSON.parse(sessionStorage.getItem(sessionKeys[j])));
console.log(JSON.parse(sessionStorage.getItem(sessionKeys[i])));
let arr; let arr;
if (JSON.parse(sessionStorage.getItem(sessionKeys[i])) == null && JSON.parse(sessionStorage.getItem(sessionKeys[j])) != null) { if (JSON.parse(sessionStorage.getItem(sessionKeys[i])) == null && JSON.parse(sessionStorage.getItem(sessionKeys[j])) != null) {
arr = JSON.parse(sessionStorage.getItem(sessionKeys[j])); arr = JSON.parse(sessionStorage.getItem(sessionKeys[j]));
} else if (JSON.parse(sessionStorage.getItem(sessionKeys[i])) != null && JSON.parse(sessionStorage.getItem(sessionKeys[j])) == null) { } else if (JSON.parse(sessionStorage.getItem(sessionKeys[i])) != null && JSON.parse(sessionStorage.getItem(sessionKeys[j])) == null) {
arr = JSON.parse(sessionStorage.getItem(sessionKeys[i])); arr = JSON.parse(sessionStorage.getItem(sessionKeys[i]));
} else { } else {
console.log(sessionStorage.getItem(sessionKeys[i]));
console.log(sessionStorage.getItem(sessionKeys[j]));
arr = JSON.parse(sessionStorage.getItem(sessionKeys[j])).concat(JSON.parse(sessionStorage.getItem(sessionKeys[i]))); arr = JSON.parse(sessionStorage.getItem(sessionKeys[j])).concat(JSON.parse(sessionStorage.getItem(sessionKeys[i])));
} }
allTZData.push({ allTZData.push({
......
src/views/Editor/modules/imageEdAJ.scss
...@@ -867,6 +867,11 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -867,6 +867,11 @@ $directionRotate: var(--directionRotate, 0deg);
display: flex; display: flex;
align-items: center; align-items: center;
// justify-content: center; // justify-content: center;
.small-drawing2 {
position: absolute;
width: 180px;
height: 180px;
}
img { img {
width: auto; width: auto;
height: 180px; height: 180px;
...@@ -1184,6 +1189,19 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1184,6 +1189,19 @@ $directionRotate: var(--directionRotate, 0deg);
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.2); box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.2);
border-radius: 4px; border-radius: 4px;
.shadow-ImageImport {
position: absolute;
height: 100%;
width: 100%;
top: 0;
left: 0;
background: #F6F8FA;
opacity: 0.5;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.2);
border-radius: 4px;
z-index: 99;
}
.top-title { .top-title {
width: 336px; width: 336px;
height: 32px; height: 32px;
...@@ -1195,6 +1213,33 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1195,6 +1213,33 @@ $directionRotate: var(--directionRotate, 0deg);
font-size: 15px; font-size: 15px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #333333; color: #333333;
.el-switch /deep/ {
z-index: 999;
width: 30px !important;
height: 16px !important;
.el-switch__core {
height: 16px !important;
width: 100% !important;
border-radius: 4px !important;
&::after {
height: 12px !important;
border-radius: 3px !important;
width: 12px;
background-color: #dcdfe9;
border-left: 5px;
border-right: 5px;
box-sizing: border-box;
border-style: solid;
border-color: #fff;
top: 1px;
}
}
}
/deep/.el-switch.is-checked {
.el-switch__core::after{
margin-left: -13px !important;
}
}
.rule_num { .rule_num {
display: flex; display: flex;
...@@ -1207,6 +1252,8 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1207,6 +1252,8 @@ $directionRotate: var(--directionRotate, 0deg);
} }
.top-content { .top-content {
position: relative;
.btn1 { .btn1 {
margin-top: 10px; margin-top: 10px;
padding: 0 16px; padding: 0 16px;
...@@ -1321,28 +1368,29 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1321,28 +1368,29 @@ $directionRotate: var(--directionRotate, 0deg);
padding: 0 16px; padding: 0 16px;
position: relative; position: relative;
.blcbtn { // 旋转
.rotate {
cursor: pointer; cursor: pointer;
margin-right: 72px;
width: 40px; width: 40px;
height: 40px; height: 40px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3), box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15); 0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px; border-radius: 4px;
margin-right: 8px;
display: flex; display: flex;
justify-content: center;
align-items: center; align-items: center;
justify-content: center;
img { img {
cursor: pointer; cursor: pointer;
width: 26px; //width: 24px;
height: 26px; height: 24px;
} }
} }
.blcbtn-d { .rotate-d {
margin-right: 8px; margin-right: 72px;
cursor: pointer; cursor: pointer;
width: 40px; width: 40px;
height: 40px; height: 40px;
...@@ -1353,111 +1401,405 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1353,111 +1401,405 @@ $directionRotate: var(--directionRotate, 0deg);
height: 40px; height: 40px;
} }
} }
.rotateOptions {
.blcbtn-options { z-index: 100;
z-index: 10;
position: absolute; position: absolute;
top: 50px; bottom: 50px;
left: 16px; right: 16px;
width: 286px; width: 240px;
height: 285px; height: 200px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25); border-radius: 4px;
border-radius: 6px; box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border: 1px solid #e6e6e8;
padding: 16px 25px;
box-sizing: border-box;
.blcbtn-head { .top {
width: 100%;
display: flex; display: flex;
align-items: center;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #e6e6e8; align-items: center;
height: 50px;
padding: 0 24px;
.head-title { .left {
font-size: 16px; width: 56px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #282f3c; color: #333333;
} }
.head-close { .right {
cursor: pointer; cursor: pointer;
color: #b1b6c2; width: 28px;
font-size: 20px; height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ff3644;
} }
} }
.blcbtn-content { .rotate_line_top {
padding: 24px; width: 192px;
height: 1px;
background: #e6e6e8;
margin-top: 16px;
margin-bottom: 10px;
}
.kd-mix { .content {
display: flex;
align-items: center;
.rotate_content {
display: flex; display: flex;
align-items: center; align-items: center;
padding-right: 25px;
border-right: 1px solid #e6e6e8;
margin-right: 22px;
.kd { .rotate_left {
font-size: 14px; margin-right: 14px;
font-family: MicrosoftYaHei; display: flex;
color: #333333; flex-direction: column;
justify-content: center;
align-items: center;
.rotate_icon {
width: 30px;
height: 30px;
img {
cursor: pointer;
width: 30px;
height: 30px;
object-fit: contain;
}
}
.num {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
} }
.kd-select { .rotate_right {
width: 188px; display: flex;
height: 40px; flex-direction: column;
background: #ffffff; justify-content: center;
border-radius: 4px; align-items: center;
.rotate_icon {
width: 30px;
height: 30px;
img {
cursor: pointer;
width: 30px;
height: 30px;
object-fit: contain;
transform: rotateY(180deg);
}
}
.num {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
} }
} }
.sz-mix { .flap_content {
margin-top: 24px;
display: flex; display: flex;
align-items: center; align-items: center;
height: 52.95px;
.sz { .flap_x {
font-size: 14px; margin-right: 20px;
font-family: MicrosoftYaHei; display: flex;
color: #333333; flex-direction: column;
} align-items: center;
.sznum { .flap_x_icon {
width: 188px; cursor: pointer;
height: 40px; width: 22px;
height: 22px;
img {
cursor: pointer;
object-fit: contain;
width: 22px;
height: 22px;
}
}
.flap_txt {
width: 24px;
// height: 19px;
margin-top: 8px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999;
}
} }
///deep/.el-input-number .el-input__inner { .flap_y {
// text-align: left !important; margin-right: 37px;
//} display: flex;
} flex-direction: column;
} align-items: center;
.blc-btns { .flap_y_icon {
display: flex; width: 22px;
align-items: center; height: 22px;
justify-content: space-between;
width: 168px;
margin-left: 60px;
.confirm { img {
display: flex; cursor: pointer;
justify-content: center; object-fit: contain;
align-items: center; width: 22px;
cursor: pointer; height: 22px;
width: 72px; }
height: 40px; }
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
&:hover { .flap_txt {
border: 1px solid #055FE7; width: 24px;
// height: 19px;
margin-top: 8px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999;
}
} }
}
}
&:active { .rotate_bottom {
border: 1px solid #044CB9; margin-top: 20px;
width: 100%;
.progress {
width: 100%;
#input-rotation-range {
width: 100%;
} }
}
/deep/ .el-slider__runway {
width: 100%;
height: 3px;
margin: 0;
background-color: #eeeeee;
}
/deep/ .el-slider__bar {
height: 3px;
background-color: #055fe7;
}
/deep/ .el-slider__button {
width: 10px;
height: 10px;
background: #ffffff;
border: 2px solid #055fe7;
margin-bottom: 2px;
}
}
.desc {
margin-top: 10px;
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
.qj_v {
text-align: center;
width: 40px;
height: 21px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #e6e9ec;
}
}
}
}
.rotate_mix {
margin-right: 40px;
position: relative;
.icon_rotate {
width: 64px;
height: 32px;
background: rgba(5, 95, 231, 0.05);
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
img {
width: 20px;
height: 20px;
object-fit: contain;
cursor: pointer;
}
.rotate {
margin-right: 15px;
cursor: pointer;
}
.arrow {
width: 10.25px;
height: 5.84px;
img {
object-fit: contain;
cursor: pointer;
}
}
}
}
.blcbtn {
cursor: pointer;
width: 40px;
height: 40px;
background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px;
margin-right: 8px;
display: flex;
justify-content: center;
align-items: center;
img {
cursor: pointer;
width: 26px;
height: 26px;
}
}
.blcbtn-d {
margin-right: 8px;
cursor: pointer;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
.blcbtn-options {
z-index: 10;
position: absolute;
top: 50px;
left: 16px;
width: 286px;
height: 285px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
.blcbtn-head {
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #e6e6e8;
height: 50px;
padding: 0 24px;
.head-title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
.head-close {
cursor: pointer;
color: #b1b6c2;
font-size: 20px;
}
}
.blcbtn-content {
padding: 24px;
.kd-mix {
display: flex;
align-items: center;
.kd {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.kd-select {
width: 188px;
height: 40px;
background: #ffffff;
border-radius: 4px;
}
}
.sz-mix {
margin-top: 24px;
display: flex;
align-items: center;
.sz {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.sznum {
width: 188px;
height: 40px;
}
///deep/.el-input-number .el-input__inner {
// text-align: left !important;
//}
}
}
.blc-btns {
display: flex;
align-items: center;
justify-content: space-between;
width: 168px;
margin-left: 60px;
.confirm {
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
&:hover {
border: 1px solid #055FE7;
}
&:active {
border: 1px solid #044CB9;
}
}
.cancel { .cancel {
display: flex; display: flex;
...@@ -1487,40 +1829,19 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1487,40 +1829,19 @@ $directionRotate: var(--directionRotate, 0deg);
.txblyz { .txblyz {
cursor: pointer; cursor: pointer;
margin-right: 28px; width: 40px;
display: flex;
align-items: center;
width: 134px;
height: 40px; height: 40px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px; border-radius: 4px;
box-sizing: border-box; margin-right: 8px;
display: flex;
.pic { justify-content: center;
width: 14px; align-items: center;
height: 14px;
margin-left: 15px;
box-sizing: border-box;
display: flex;
justify-content: center;
align-items: center;
img {
cursor: pointer;
width: 14px;
height: 14px;
}
}
span { img {
cursor: pointer; cursor: pointer;
padding: 0; width: 40px;
margin-left: 7px; height: 40px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
} }
} }
...@@ -1595,424 +1916,130 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -1595,424 +1916,130 @@ $directionRotate: var(--directionRotate, 0deg);
.line4 { .line4 {
margin: 5px 16px 5px 16px; margin: 5px 16px 5px 16px;
width: 305px; width: 305px;
height: 2px; height: 2px;
border-bottom: 1px dashed rgba(230, 230, 232, 1); border-bottom: 1px dashed rgba(230, 230, 232, 1);
} }
.btn4 {
display: flex;
align-items: center;
margin-left: 16px;
.el-input {
width: 200px;
height: 21px;
/deep/ .el-input__inner {
width: 200px;
height: 21px;
}
}
span {
width: 84px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.txt {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
.edit {
cursor: pointer;
width: 16px;
height: 16px;
display: flex;
margin-left: 8px;
img {
object-fit: contain;
}
}
}
.btn5 {
display: flex;
align-items: center;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
.stzw {
margin-left: 16px;
// 修改多选框样式
/deep/ .el-checkbox.is-checked {
.el-checkbox__label {
color: #333333;
}
.el-checkbox__input.is-checked {
.el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
}
}
}
/deep/ .el-checkbox {
color: #666;
}
.check {
margin-right: 9px;
}
}
.stbh {
margin-left: 16px;
display: flex;
align-items: center;
input {
text-align: center;
outline: none;
width: 34px;
height: 21px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #e6e9ec;
margin-left: 4px;
}
}
}
.btn6 {
display: flex;
justify-content: flex-end;
padding-right: 11px;
.bcrk {
cursor: pointer;
width: 96px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
.bcrkActive {
background: #055fe7;
color: #ffffff;
&:hover {
background: #377fec;
}
&:active {
background: #044cb9;
}
}
// 旋转
.rotate {
cursor: pointer;
margin-left: 20px;
width: 40px;
height: 40px;
background: #ffffff;
box-shadow: 0px 2px 4px 0px rgba(5, 95, 231, 0.3),
0px 0px 4px 0px rgba(5, 95, 231, 0.15);
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
img {
cursor: pointer;
//width: 24px;
height: 24px;
}
}
.rotate-d {
cursor: pointer;
margin-left: 20px;
width: 40px;
height: 40px;
img {
cursor: pointer;
width: 40px;
height: 40px;
}
}
.rotateOptions {
z-index: 100;
position: absolute;
bottom: 50px;
right: 16px;
width: 240px;
height: 200px;
background: #ffffff;
border-radius: 4px;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border: 1px solid #e6e6e8;
padding: 16px 25px;
box-sizing: border-box;
.top {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
.left {
width: 56px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.right {
cursor: pointer;
width: 28px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ff3644;
}
}
.rotate_line_top {
width: 192px;
height: 1px;
background: #e6e6e8;
margin-top: 16px;
margin-bottom: 10px;
}
.content {
display: flex;
align-items: center;
.rotate_content {
display: flex;
align-items: center;
padding-right: 25px;
border-right: 1px solid #e6e6e8;
margin-right: 22px;
.rotate_left {
margin-right: 14px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.rotate_icon {
width: 30px;
height: 30px;
img {
cursor: pointer;
width: 30px;
height: 30px;
object-fit: contain;
}
}
.num {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
}
.rotate_right {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.rotate_icon {
width: 30px;
height: 30px;
img {
cursor: pointer;
width: 30px;
height: 30px;
object-fit: contain;
transform: rotateY(180deg);
}
}
.num {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
}
}
.flap_content {
display: flex;
align-items: center;
height: 52.95px;
.flap_x {
margin-right: 20px;
display: flex;
flex-direction: column;
align-items: center;
.flap_x_icon {
cursor: pointer;
width: 22px;
height: 22px;
img {
cursor: pointer;
object-fit: contain;
width: 22px;
height: 22px;
}
}
.flap_txt {
width: 24px;
// height: 19px;
margin-top: 8px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999;
}
}
.flap_y {
margin-right: 37px;
display: flex;
flex-direction: column;
align-items: center;
.flap_y_icon { .btn4 {
width: 22px; display: flex;
height: 22px; align-items: center;
margin-left: 16px;
img { .el-input {
cursor: pointer; width: 200px;
object-fit: contain; height: 21px;
width: 22px;
height: 22px;
}
}
.flap_txt { /deep/ .el-input__inner {
width: 24px; width: 200px;
// height: 19px; height: 21px;
margin-top: 8px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999;
}
}
}
} }
}
.rotate_bottom { span {
margin-top: 20px; width: 84px;
width: 100%; font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.progress { .txt {
width: 100%; font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
#input-rotation-range { .edit {
width: 100%; cursor: pointer;
} width: 16px;
height: 16px;
display: flex;
margin-left: 8px;
/deep/ .el-slider__runway { img {
width: 100%; object-fit: contain;
height: 3px; }
margin: 0; }
background-color: #eeeeee; }
}
/deep/ .el-slider__bar { .btn5 {
height: 3px; display: flex;
background-color: #055fe7; align-items: center;
} font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
/deep/ .el-slider__button { .stzw {
width: 10px; margin-left: 16px;
height: 10px; // 修改多选框样式
background: #ffffff; /deep/ .el-checkbox.is-checked {
border: 2px solid #055fe7; .el-checkbox__label {
margin-bottom: 2px; color: #333333;
}
} }
.desc { .el-checkbox__input.is-checked {
margin-top: 10px; .el-checkbox__inner {
display: flex; background: #055fe7;
align-items: center; border-color: #055fe7;
justify-content: space-between;
width: 100%;
.qj_v {
text-align: center;
width: 40px;
height: 21px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #e6e9ec;
} }
} }
} }
/deep/ .el-checkbox {
color: #666;
}
.check {
margin-right: 9px;
}
} }
.rotate_mix {
margin-right: 40px;
position: relative;
.icon_rotate { .stbh {
width: 64px; margin-left: 16px;
height: 32px; display: flex;
background: rgba(5, 95, 231, 0.05); align-items: center;
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
img { input {
width: 20px; text-align: center;
height: 20px; outline: none;
object-fit: contain; width: 34px;
cursor: pointer; height: 21px;
} background: #ffffff;
border-radius: 2px;
border: 1px solid #e6e9ec;
margin-left: 4px;
}
}
}
.rotate { .btn6 {
margin-right: 15px; display: flex;
cursor: pointer; justify-content: flex-end;
} padding-right: 11px;
.arrow { .bcrk {
width: 10.25px; cursor: pointer;
height: 5.84px; width: 96px;
height: 32px;
background: #ecedf1;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
line-height: 32px;
text-align: center;
}
img { .bcrkActive {
object-fit: contain; background: #055fe7;
cursor: pointer; color: #ffffff;
}
} &:hover {
background: #377fec;
}
&:active {
background: #044cb9;
} }
} }
} }
...@@ -2023,7 +2050,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2023,7 +2050,7 @@ $directionRotate: var(--directionRotate, 0deg);
z-index: 1 !important; z-index: 1 !important;
margin-top: 10px; margin-top: 10px;
width: 336px; width: 336px;
height: 160px; height: 175px;
background: #f6f8fa; background: #f6f8fa;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25); box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px; border-radius: 4px;
...@@ -2043,6 +2070,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2043,6 +2070,7 @@ $directionRotate: var(--directionRotate, 0deg);
} }
.center-title { .center-title {
position: relative;
width: 336px; width: 336px;
height: 32px; height: 32px;
background: #e9f3fd; background: #e9f3fd;
...@@ -2053,6 +2081,58 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2053,6 +2081,58 @@ $directionRotate: var(--directionRotate, 0deg);
justify-content: space-between; justify-content: space-between;
padding: 0 16px; padding: 0 16px;
.clearConfirm {
z-index: 10;
position: absolute;
top: 50px;
right: 204px;
width: 300px;
height: 114px;
background: #ffffff;
box-shadow: 0px 18px 28px 10px rgba(0, 21, 51, 0.08);
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 20px 30px;
.tips {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.btn-bottom {
margin-top: 17px;
display: flex;
.btn-confirm,
.btn-cancel {
cursor: pointer;
width: 72px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
display: flex;
justify-content: center;
align-items: center;
&:hover {
background: #377fec;
color: #ffffff;
}
&:active {
background: #044cb9;
color: #ffffff;
}
}
.btn-cancel {
background: #055fe7;
color: #ffffff;
}
.btn-confirm {
margin-right: 24px;
}
}
}
.left { .left {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -2154,11 +2234,11 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2154,11 +2234,11 @@ $directionRotate: var(--directionRotate, 0deg);
.options-top { .options-top {
position: relative; position: relative;
width: 336px; width: 336px;
// height: 394px; height: 290px;
background: #f6f8fa; background: #f6f8fa;
.top-title { .top-title {
height: 40px; height: 32px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
...@@ -2937,11 +3017,41 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2937,11 +3017,41 @@ $directionRotate: var(--directionRotate, 0deg);
} }
.save { .save {
margin-top: 16px;
display: flex; display: flex;
width: 100%; width: 100%;
padding-right: 10px; padding-right: 10px;
align-items: center; align-items: center;
justify-content: flex-end; .save-txt {
margin-left: 16px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
.save-tzxh {
margin-right: 9px;
width: 32px;
height: 32px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #AEB5C2;
display: flex;
justify-content: center;
align-items: center;
img {
width: 24px;
height: 20px;
cursor: pointer;
}
&:hover {
border: 1px solid #055FE7;
}
}
.active {
border: 1px solid #055FE7;
}
.save-type { .save-type {
cursor: pointer; cursor: pointer;
...@@ -2957,7 +3067,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2957,7 +3067,7 @@ $directionRotate: var(--directionRotate, 0deg);
} }
.save-btn { .save-btn {
margin-left: 16px; margin-left: 11px;
cursor: pointer; cursor: pointer;
width: 72px; width: 72px;
height: 32px; height: 32px;
...@@ -2966,6 +3076,9 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2966,6 +3076,9 @@ $directionRotate: var(--directionRotate, 0deg);
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
&:hover {
}
} }
.save-btn.isActive { .save-btn.isActive {
...@@ -2986,7 +3099,7 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -2986,7 +3099,7 @@ $directionRotate: var(--directionRotate, 0deg);
position: relative; position: relative;
margin-top: 10px; margin-top: 10px;
width: 336px; width: 336px;
height: 250px; height: 230px;
background: #f6f8fa; background: #f6f8fa;
box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25); box-shadow: 0px -1px 2px 0px rgba(5, 95, 231, 0.25);
border-radius: 4px; border-radius: 4px;
...@@ -3012,6 +3125,9 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -3012,6 +3125,9 @@ $directionRotate: var(--directionRotate, 0deg);
box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.39); box-shadow: inset 0px 1px 3px 0px rgba(5, 95, 231, 0.39);
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
line-height: 32px; line-height: 32px;
font-size: 15px;
font-family: MicrosoftYaHei;
color: #333333;
} }
.options-bottom-btns { .options-bottom-btns {
...@@ -3033,8 +3149,11 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -3033,8 +3149,11 @@ $directionRotate: var(--directionRotate, 0deg);
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff; -4px -4px 4px 0px #ffffff;
border-radius: 4px; border-radius: 4px;
margin-right: 10px; margin-right: 16px;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
&:active { &:active {
background: #055fe7; background: #055fe7;
...@@ -3042,6 +3161,9 @@ $directionRotate: var(--directionRotate, 0deg); ...@@ -3042,6 +3161,9 @@ $directionRotate: var(--directionRotate, 0deg);
-4px -4px 4px 0px #ffffff; -4px -4px 4px 0px #ffffff;
color: #ffffff; color: #ffffff;
} }
&:nth-child(4),&:nth-child(8) {
margin-right: 0;
}
} }
.grayActive, .grayActive,
......
src/views/Editor/modules/imageEdAJ.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-25 17:21:11 * @LastEditTime: 2021-11-26 02:08:14
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -80,7 +80,9 @@ ...@@ -80,7 +80,9 @@
</div> </div>
<!-- 小操作区域 --> <!-- 小操作区域 -->
<div class="small-drawing" v-if="isTpdr_flag"> <div class="small-drawing" v-if="isTpdr_flag">
<img class="small-drawing-img" :src="smallSrc" alt="" /> <div class="small-drawing2">
<img class="small-drawing-img" :src="smallSrc" alt="" />
</div>
<div id="blc_small" class="blc_small" v-show="isSwk_flag"> <div id="blc_small" class="blc_small" v-show="isSwk_flag">
<div class="blc_inner"></div> <div class="blc_inner"></div>
<div class="blc_outter"></div> <div class="blc_outter"></div>
...@@ -141,8 +143,11 @@ ...@@ -141,8 +143,11 @@
</div> </div>
<div class="options"> <div class="options">
<div class="options-top"> <div class="options-top">
<div class="shadow-ImageImport" v-show="!isHideImageExport"></div>
<div class="top-title"> <div class="top-title">
图像导入 <span>图像导入</span>
<el-switch class="line_switch" v-model="isHideImageExport" active-color="#055FE7">
</el-switch>
<!-- <div class="rule_num"> <!-- <div class="rule_num">
<el-input size="small" @change="calcChange" v-model.number="rule_num" placeholder="请输入长度"></el-input>mm <el-input size="small" @change="calcChange" v-model.number="rule_num" placeholder="请输入长度"></el-input>mm
</div> --> </div> -->
...@@ -191,48 +196,11 @@ ...@@ -191,48 +196,11 @@
<div class="cancel" @click.stop="rule = false">取消</div> <div class="cancel" @click.stop="rule = false">取消</div>
</div> </div>
</div> </div>
<div class="txblyz"> <div class="txblyz" @click="txblyz_active=!txblyz_active">
<div class="pic"> <img v-show="txblyz_active" src="@/assets/img/rybj/txblyz_a.png" alt="" />
<img src="@/assets/img/rybj/img.png" alt="" /> <img v-show="!txblyz_active" src="@/assets/img/rybj/txblyz_d.png" alt="" />
</div>
<span>图像比例验证</span>
</div>
<div class="tjxh">
<span>推荐序号</span>
<input type="text" v-model="tjxh" />
</div> </div>
</div> <!-- 旋转 -->
<div class="line3"></div>
<div class="btn3">
<span>乳突线颜色：</span>
<el-radio-group v-model="rtxys">
<el-radio label="白色">白色</el-radio>
<el-radio label="黑色">黑色</el-radio>
<el-radio label="其他">其他</el-radio>
</el-radio-group>
</div>
<div class="line4"></div>
<div class="btn4">
<span>遗留部位：</span>
<div class="txt" v-if="ylbw_flag">{{ ylbw }}</div>
<el-input v-else v-model="ylbw" placeholder="请输入内容"></el-input>
<div class="edit" @click.stop="editylbwChange">
<img src="@/assets/img/rybj/edit.svg" alt="" />
</div>
</div>
<div class="line4"></div>
<div class="btn5">
<div class="stzw">
<el-checkbox v-model="isSelected_stzw">尸体指纹</el-checkbox>
</div>
<div class="stbh">
<span>尸体编号</span>
<input type="text" v-model="stbh" />
</div>
</div>
<div class="line4"></div>
<div class="btn6">
<!-- 旋转-->
<div class="rotate" @click.stop="rotateChange_dr" v-if="isRotateOptions_dr"> <div class="rotate" @click.stop="rotateChange_dr" v-if="isRotateOptions_dr">
<img src="@/assets/img/rybj/rotate.png" alt="" /> <img src="@/assets/img/rybj/rotate.png" alt="" />
</div> </div>
...@@ -295,7 +263,43 @@ ...@@ -295,7 +263,43 @@
</div> </div>
</div> </div>
</div> </div>
<div class="bcrk" :class="{bcrkActive: bcrkActive}" @click.stop="saveToKuChange">保存入库</div> <div class="tjxh">
<span>推荐序号</span>
<input type="text" v-model="tjxh" />
</div>
</div>
<div class="line3"></div>
<div class="btn3">
<span>乳突线颜色：</span>
<el-radio-group v-model="rtxys">
<el-radio label="白色">白色</el-radio>
<el-radio label="黑色">黑色</el-radio>
<el-radio label="其他">其他</el-radio>
</el-radio-group>
</div>
<div class="line4"></div>
<div class="btn4">
<span>遗留部位：</span>
<div class="txt" v-if="ylbw_flag">{{ ylbw }}</div>
<el-input v-else v-model="ylbw" placeholder="请输入内容"></el-input>
<div class="edit" @click.stop="editylbwChange">
<img src="@/assets/img/rybj/edit.svg" alt="" />
</div>
</div>
<div class="line4"></div>
<div class="btn5">
<div class="stzw">
<el-checkbox v-model="isSelected_stzw">尸体指纹</el-checkbox>
</div>
<div class="stbh">
<span>尸体编号</span>
<input type="text" v-model="stbh" />
</div>
</div>
<div class="line4"></div>
<div class="btn6">
<div class="bcrk bcrkActive" @click.stop="saveToKuChange" v-if="bcrkActive">保存入库</div>
<div class="bcrk" v-else>保存入库</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -303,7 +307,7 @@ ...@@ -303,7 +307,7 @@
<div class="center-title"> <div class="center-title">
<div class="left"> <div class="left">
<div class="name">图像编辑</div> <div class="name">图像编辑</div>
<span>(未处理)</span> <span>({{txbj_type}})</span>
</div> </div>
<div class="right" @click.stop="clearAllOptions"> <div class="right" @click.stop="clearAllOptions">
<div class="clear_icon"> <div class="clear_icon">
...@@ -311,6 +315,13 @@ ...@@ -311,6 +315,13 @@
</div> </div>
<div class="name">清空操作</div> <div class="name">清空操作</div>
</div> </div>
<div class="clearConfirm" v-show="isShowClearDialog">
<div class="tips">确认要清空操作吗？该操作无法撤消！</div>
<div class="btn-bottom">
<div class="btn-confirm" @click.stop="delPic">确认</div>
<div class="btn-cancel" @click.stop="cancelPic">取消</div>
</div>
</div>
</div> </div>
<div class="center-content"> <div class="center-content">
<div class="options-btns"> <div class="options-btns">
...@@ -414,7 +425,7 @@ ...@@ -414,7 +425,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 图像编辑部分比例尺--> <!--图像编辑部分比例尺-->
<div class="blcbtn" @click.stop="addRule('bj')" v-if="rule_bj"> <div class="blcbtn" @click.stop="addRule('bj')" v-if="rule_bj">
<img src="@/assets/img/rybj/rule.png" alt="" /> <img src="@/assets/img/rybj/rule.png" alt="" />
</div> </div>
...@@ -454,33 +465,29 @@ ...@@ -454,33 +465,29 @@
</div> </div>
</div> </div>
<div class="save"> <div class="save">
<div class="save-btn isActive" @click.stop="saveTypeOptionsChange"> <span class="save-txt">选择保存类型：</span>
保存<img src="@/assets/img/rybj/arrow.png" alt="" /> <div class="save-tzxh" :class="{active: saveType === '当前特征'}" @click.stop="saveType='当前特征'">
<el-tooltip class="item" effect="dark" content="保存当前序号特征" placement="top" :open-delay="500">
<img src="@/assets/img/rybj/dqxhtz.svg" alt="">
</el-tooltip>
</div> </div>
<div class="save-type-options" v-show="isShowSaveTypeOptions"> <div class="save-tzxh" :class="{active: saveType === '全部特征'}" @click.stop="saveType='全部特征'">
<div class="save-type-options-item" @click.stop="changeSaveType('当前特征')"> <el-tooltip class="item" effect="dark" content="保存全部序号特征" placement="top" :open-delay="500">
<div class="item-selected"> <img src="@/assets/img/rybj/qbtzxh.svg" alt="">
<span v-show="saveType === '当前特征'">√</span> </el-tooltip>
</div> </div>
<div class="item-name">当前序号特征</div> <div class="save-tzxh" :class="{active: saveType === '当前特征和图片'}" @click.stop="saveType='当前特征和图片'">
</div> <el-tooltip class="item" effect="dark" content="保存当前序号特征和图片" placement="top" :open-delay="500">
<div class="save-type-options-item" @click.stop="changeSaveType('全部特征')"> <img src="@/assets/img/rybj/dqtzpic.svg" alt="">
<div class="item-selected"> </el-tooltip>
<span v-show="saveType === '全部特征'">√</span> </div>
</div> <div class="save-btn isActive" @click.stop="changeSaveType">
<div class="item-name">全部序号特征</div> 保存
</div>
<div class="save-type-options-item" @click.stop="changeSaveType('当前特征和图片')">
<div class="item-selected">
<span v-show="saveType === '当前特征和图片'">√</span>
</div>
<div class="item-name">当前特征和图片</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="mask" v-show="startEditImage"></div> --> <div class="mask" v-show="startEditImage"></div>
<div class="mask" v-show="false"></div> <!-- <div class="mask" v-show="false"></div>-->
</div> </div>
<div class="options-bottom"> <div class="options-bottom">
<div class="options-bottom-title">图像调整</div> <div class="options-bottom-title">图像调整</div>
...@@ -579,8 +586,8 @@ ...@@ -579,8 +586,8 @@
<input class="qb_v" type="text" v-model.number="inputContrastRange" /> <input class="qb_v" type="text" v-model.number="inputContrastRange" />
</div> </div>
</div> </div>
<!-- <div class="mask" v-show="startEditImage"></div>--> <div class="mask" v-show="startEditImage"></div>
<div class="mask" v-show="false"></div> <!-- <div class="mask" v-show="false"></div>-->
</div> </div>
</div> </div>
</div> </div>
...@@ -598,6 +605,12 @@ import MouseGesture from "./tzd_rotate.js"; ...@@ -598,6 +605,12 @@ import MouseGesture from "./tzd_rotate.js";
export default { export default {
data () { data () {
return { return {
// 图像编辑状态，保存之后改为已处理
txbj_type: '未处理',
// 是否隐藏图像导入
isHideImageExport: false,
// 是否开启了图像比例验证
txblyz_active: false,
// 是否可以保存入库 // 是否可以保存入库
bcrkActive: false, bcrkActive: false,
// 是否点击了自动提取 // 是否点击了自动提取
...@@ -683,7 +696,7 @@ export default { ...@@ -683,7 +696,7 @@ export default {
], ],
// 指掌纹切换 // 指掌纹切换
zzwSwitch: "1", zzwSwitch: "1",
saveType: "", saveType: "当前特征",
isShowSaveTypeOptions: false, isShowSaveTypeOptions: false,
isZYQY: true, isZYQY: true,
isTZ: true, isTZ: true,
...@@ -934,6 +947,16 @@ export default { ...@@ -934,6 +947,16 @@ export default {
this.canvasHeight = (this.canvasHeight * w2) / w1; this.canvasHeight = (this.canvasHeight * w2) / w1;
// 获取barcode，seq // 获取barcode，seq
this.barcode = this.$route.params.barcode; this.barcode = this.$route.params.barcode;
// 从新增案件进入
if(this.$route.params.id == 'xz') {
this.isHideImageExport = true
this.startEditImage = true
} else {
// 从编辑案件进入
this.isHideImageExport = false
this.startEditImage = false
}
}, },
mounted () { mounted () {
let self = this; let self = this;
...@@ -944,7 +967,7 @@ export default { ...@@ -944,7 +967,7 @@ export default {
// }) // })
// $('input').RangeSlider({ min: 0, max: 100, step: 0.1}); // $('input').RangeSlider({ min: 0, max: 100, step: 0.1});
//console.log(this.$route.name); console.log(this.$route.name);
var supportingFileAPI = !!( var supportingFileAPI = !!(
window.File && window.File &&
...@@ -1000,13 +1023,14 @@ export default { ...@@ -1000,13 +1023,14 @@ export default {
this.imageEditor = imageEditor; this.imageEditor = imageEditor;
imageEditor imageEditor
.loadImageFromURL("img/finger.bmp", "SampleImage") // .loadImageFromURL("img/finger.bmp", "SampleImage")
.loadImageFromURL("xxx.bmp", "SampleImage")
.then(function (sizeValue) { .then(function (sizeValue) {
//console.log(sizeValue); console.log(sizeValue);
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
}); });
let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas'); let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
//console.log(canvas_imgSave); console.log(canvas_imgSave);
// 标记点颜色选择器 // 标记点颜色选择器
// var BJDColorpicker = tui.colorPicker.create({ // var BJDColorpicker = tui.colorPicker.create({
...@@ -1114,7 +1138,7 @@ export default { ...@@ -1114,7 +1138,7 @@ export default {
function applyOrRemoveFilter (applying, type, options) { function applyOrRemoveFilter (applying, type, options) {
if (applying) { if (applying) {
imageEditor.applyFilter(type, options).then(function (result) { imageEditor.applyFilter(type, options).then(function (result) {
//console.log(result); console.log(result);
}); });
} else { } else {
imageEditor.removeFilter(type); imageEditor.removeFilter(type);
...@@ -1124,12 +1148,12 @@ export default { ...@@ -1124,12 +1148,12 @@ export default {
// Attach image editor custom events // Attach image editor custom events
imageEditor.on({ imageEditor.on({
objectAdded: function (objectProps) { objectAdded: function (objectProps) {
//console.info(objectProps); console.info(objectProps);
if (objectProps.type == "line") { if (objectProps.type == "line") {
self.lines.push(objectProps); self.lines.push(objectProps);
} }
// self.historys.push(objectProps.type) // self.historys.push(objectProps.type)
//console.log(111); console.log(111);
}, },
undoStackChanged: function (length) { undoStackChanged: function (length) {
if (length) { if (length) {
...@@ -1148,7 +1172,7 @@ export default { ...@@ -1148,7 +1172,7 @@ export default {
resizeEditor(); resizeEditor();
}, },
objectScaled: function (obj) { objectScaled: function (obj) {
//console.log(obj); console.log(obj);
if (obj.type === "text") { if (obj.type === "text") {
$inputFontSizeRange.val(obj.fontSize); $inputFontSizeRange.val(obj.fontSize);
} }
...@@ -1159,7 +1183,7 @@ export default { ...@@ -1159,7 +1183,7 @@ export default {
position: pos.originPosition position: pos.originPosition
}) })
.then(function (objectProps) { .then(function (objectProps) {
//console.log(objectProps); console.log(objectProps);
}); });
}, },
objectActivated: function (obj) { objectActivated: function (obj) {
...@@ -1187,7 +1211,7 @@ export default { ...@@ -1187,7 +1211,7 @@ export default {
$btnUndo.on("click", function (e) { $btnUndo.on("click", function (e) {
e.stopPropagation() e.stopPropagation()
// self.initStatus() // self.initStatus()
//console.log("撤销"); console.log("撤销");
if (!$(this).hasClass("disabled")) { if (!$(this).hasClass("disabled")) {
imageEditor.discardSelection(); imageEditor.discardSelection();
imageEditor.undo(); imageEditor.undo();
...@@ -1197,7 +1221,7 @@ export default { ...@@ -1197,7 +1221,7 @@ export default {
// 恢复 // 恢复
$btnRedo.on("click", function (e) { $btnRedo.on("click", function (e) {
e.stopPropagation() e.stopPropagation()
//console.log("恢复"); console.log("恢复");
if (!$(this).hasClass("disabled")) { if (!$(this).hasClass("disabled")) {
imageEditor.discardSelection(); imageEditor.discardSelection();
imageEditor.redo(); imageEditor.redo();
...@@ -1217,7 +1241,7 @@ export default { ...@@ -1217,7 +1241,7 @@ export default {
e.stopPropagation() e.stopPropagation()
var imageName = "源数据指纹"; var imageName = "源数据指纹";
var dataURL = $("#sourceImage").attr("src"); var dataURL = $("#sourceImage").attr("src");
//console.log(dataURL); console.log(dataURL);
var blob, type, w; var blob, type, w;
if (supportingFileAPI) { if (supportingFileAPI) {
blob = base64ToBlob(dataURL); blob = base64ToBlob(dataURL);
...@@ -1239,14 +1263,14 @@ export default { ...@@ -1239,14 +1263,14 @@ export default {
// 沿X轴翻转 // 沿X轴翻转
$btnFlipX.on("click", function (e) { $btnFlipX.on("click", function (e) {
e.stopPropagation() e.stopPropagation()
//console.log(111); console.log(111);
self.isX = true; self.isX = true;
self.isY = false; self.isY = false;
self.isReset = false; self.isReset = false;
imageEditor.flipX().then(function (status) { imageEditor.flipX().then(function (status) {
//console.log("flipX: ", status.flipX); console.log("flipX: ", status.flipX);
//console.log("flipY: ", status.flipY); console.log("flipY: ", status.flipY);
//console.log("angle: ", status.angle); console.log("angle: ", status.angle);
if (status.flipX) { if (status.flipX) {
$(".tzdDrawing").css("transform", `rotateY(${-status.angle + 180}deg) rotateX(${-status.angle}deg)`); $(".tzdDrawing").css("transform", `rotateY(${-status.angle + 180}deg) rotateX(${-status.angle}deg)`);
} else { } else {
...@@ -1254,7 +1278,7 @@ export default { ...@@ -1254,7 +1278,7 @@ export default {
} }
}); });
// Fcanvas.getObjects().map(function(o) { // Fcanvas.getObjects().map(function(o) {
// // //console.log(o); // // console.log(o);
// o.set('scaleX', -1).setCoords(); // o.set('scaleX', -1).setCoords();
// }); // });
// Fcanvas.requestRenderAll(); // Fcanvas.requestRenderAll();
...@@ -1263,14 +1287,14 @@ export default { ...@@ -1263,14 +1287,14 @@ export default {
// 沿X轴翻转 // 沿X轴翻转
$btnFlipXDR.on("click", function (e) { $btnFlipXDR.on("click", function (e) {
e.stopPropagation() e.stopPropagation()
//console.log(111); console.log(111);
self.isX = true; self.isX = true;
self.isY = false; self.isY = false;
self.isReset = false; self.isReset = false;
imageEditor.flipX().then(function (status) { imageEditor.flipX().then(function (status) {
//console.log("flipX: ", status.flipX); console.log("flipX: ", status.flipX);
//console.log("flipY: ", status.flipY); console.log("flipY: ", status.flipY);
//console.log("angle: ", status.angle); console.log("angle: ", status.angle);
if (status.flipX) { if (status.flipX) {
$(".tzdDrawing").css("transform", `rotateY(${-status.angle + 180}deg) rotateX(${-status.angle}deg)`); $(".tzdDrawing").css("transform", `rotateY(${-status.angle + 180}deg) rotateX(${-status.angle}deg)`);
} else { } else {
...@@ -1286,9 +1310,9 @@ export default { ...@@ -1286,9 +1310,9 @@ export default {
self.isY = true; self.isY = true;
self.isReset = false; self.isReset = false;
imageEditor.flipY().then(function (status) { imageEditor.flipY().then(function (status) {
//console.log("flipX: ", status.flipX); console.log("flipX: ", status.flipX);
//console.log("flipY: ", status.flipY); console.log("flipY: ", status.flipY);
//console.log("angle: ", status.angle); console.log("angle: ", status.angle);
if (status.flipY) { if (status.flipY) {
$(".tzdDrawing").css("transform", `rotateX(${-status.angle + 180}deg) rotateY(${-status.angle}deg)`); $(".tzdDrawing").css("transform", `rotateX(${-status.angle + 180}deg) rotateY(${-status.angle}deg)`);
} else { } else {
...@@ -1304,9 +1328,9 @@ export default { ...@@ -1304,9 +1328,9 @@ export default {
self.isY = true; self.isY = true;
self.isReset = false; self.isReset = false;
imageEditor.flipY().then(function (status) { imageEditor.flipY().then(function (status) {
//console.log("flipX: ", status.flipX); console.log("flipX: ", status.flipX);
//console.log("flipY: ", status.flipY); console.log("flipY: ", status.flipY);
//console.log("angle: ", status.angle); console.log("angle: ", status.angle);
if (status.flipY) { if (status.flipY) {
$(".tzdDrawing").css("transform", `rotateX(${-status.angle + 180}deg) rotateY(${-status.angle}deg)`); $(".tzdDrawing").css("transform", `rotateX(${-status.angle + 180}deg) rotateY(${-status.angle}deg)`);
} else { } else {
...@@ -1327,7 +1351,7 @@ export default { ...@@ -1327,7 +1351,7 @@ export default {
self.inputRotationRange = 0; self.inputRotationRange = 0;
// 事件不能连续重复执行，需要缓存时间 // 事件不能连续重复执行，需要缓存时间
setTimeout(() => { setTimeout(() => {
//console.log(11111, -self.startPlace); console.log(11111, -self.startPlace);
imageEditor.rotate(-parseInt(self.startPlace)); imageEditor.rotate(-parseInt(self.startPlace));
imageEditor.resetZoom(); imageEditor.resetZoom();
self.startPlace = 0; self.startPlace = 0;
...@@ -1340,9 +1364,9 @@ export default { ...@@ -1340,9 +1364,9 @@ export default {
}); });
}, 200); }, 200);
imageEditor.resetFlip().then(function (status) { imageEditor.resetFlip().then(function (status) {
//console.log("flipX: ", status.flipX); console.log("flipX: ", status.flipX);
//console.log("flipY: ", status.flipY); console.log("flipY: ", status.flipY);
//console.log("angle: ", status.angle); console.log("angle: ", status.angle);
}); });
$(".tzdDrawing").css("transform", "rotateX(0)"); $(".tzdDrawing").css("transform", "rotateX(0)");
$(".tzdDrawing").css("transform", "rotateY(0)"); $(".tzdDrawing").css("transform", "rotateY(0)");
...@@ -1358,7 +1382,7 @@ export default { ...@@ -1358,7 +1382,7 @@ export default {
true true
); );
//console.log(canvasImage); console.log(canvasImage);
}); });
// 重置 // 重置
...@@ -1373,7 +1397,7 @@ export default { ...@@ -1373,7 +1397,7 @@ export default {
self.inputRotationRange = 0; self.inputRotationRange = 0;
// 事件不能连续重复执行，需要缓存时间 // 事件不能连续重复执行，需要缓存时间
setTimeout(() => { setTimeout(() => {
//console.log(11111, -self.startPlace); console.log(11111, -self.startPlace);
imageEditor.rotate(-parseInt(self.startPlace)); imageEditor.rotate(-parseInt(self.startPlace));
imageEditor.resetZoom(); imageEditor.resetZoom();
self.startPlace = 0; self.startPlace = 0;
...@@ -1386,9 +1410,9 @@ export default { ...@@ -1386,9 +1410,9 @@ export default {
}); });
}, 200); }, 200);
imageEditor.resetFlip().then(function (status) { imageEditor.resetFlip().then(function (status) {
//console.log("flipX: ", status.flipX); console.log("flipX: ", status.flipX);
//console.log("flipY: ", status.flipY); console.log("flipY: ", status.flipY);
//console.log("angle: ", status.angle); console.log("angle: ", status.angle);
}); });
$(".tzdDrawing").css("transform", "rotateX(0)"); $(".tzdDrawing").css("transform", "rotateX(0)");
$(".tzdDrawing").css("transform", "rotateY(0)"); $(".tzdDrawing").css("transform", "rotateY(0)");
...@@ -1404,7 +1428,7 @@ export default { ...@@ -1404,7 +1428,7 @@ export default {
true true
); );
//console.log(canvasImage); console.log(canvasImage);
}); });
// 向左旋转30° // 向左旋转30°
...@@ -1417,25 +1441,25 @@ export default { ...@@ -1417,25 +1441,25 @@ export default {
imageEditor.rotate(-30); imageEditor.rotate(-30);
self.historys.push("旋转"); self.historys.push("旋转");
let canvasImage = imageEditor._graphics.getCanvasImage(); let canvasImage = imageEditor._graphics.getCanvasImage();
//console.log(canvasImage); console.log(canvasImage);
$(".tzdDrawing").css( $(".tzdDrawing").css(
"transform", "transform",
`rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})` `rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})`
); );
//console.log(self.move_left); console.log(self.move_left);
//console.log(self.move_top); console.log(self.move_top);
// 不规则图形的旋转 // 不规则图形的旋转
// Fcanvas.getObjects().map(function(o) { // Fcanvas.getObjects().map(function(o) {
// // //console.log(o); // // console.log(o);
// //console.log(canvasImage.angle); // console.log(canvasImage.angle);
// o.rotate(canvasImage.angle) // o.rotate(canvasImage.angle)
// // o.set('rotate', -30).setCoords(); // // o.set('rotate', -30).setCoords();
// }); // });
// Fcanvas.requestRenderAll(); // Fcanvas.requestRenderAll();
// Fcanvas.getActiveObject().set('scale', -30).setCoords(); // Fcanvas.getActiveObject().set('scale', -30).setCoords();
//console.log($(".irregular")); console.log($(".irregular"));
$(".irregular").css( $(".irregular").css(
"transform", "transform",
`rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})` `rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})`
...@@ -1456,7 +1480,7 @@ export default { ...@@ -1456,7 +1480,7 @@ export default {
// 小区域旋转 // 小区域旋转
if (self.isTpdr_flag) { if (self.isTpdr_flag) {
$(".small-drawing-img").css("transform", `rotate(${30}deg)`); $(".small-drawing-img").css("transform", `rotate(${canvasImage.angle}deg)`);
} }
}); });
...@@ -1470,7 +1494,7 @@ export default { ...@@ -1470,7 +1494,7 @@ export default {
imageEditor.rotate(-30); imageEditor.rotate(-30);
self.historys.push("旋转"); self.historys.push("旋转");
let canvasImage = imageEditor._graphics.getCanvasImage(); let canvasImage = imageEditor._graphics.getCanvasImage();
//console.log(canvasImage); console.log(canvasImage);
$(".tzdDrawing").css( $(".tzdDrawing").css(
"transform", "transform",
`rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})` `rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})`
...@@ -1495,7 +1519,9 @@ export default { ...@@ -1495,7 +1519,9 @@ export default {
// 小区域旋转 // 小区域旋转
if (self.isTpdr_flag) { if (self.isTpdr_flag) {
$(".small-drawing-img").css("transform", `rotate(${30}deg)`); console.log(canvasImage.angle);
console.log(self.startPlace);
$(".small-drawing-img").css("transform", `rotate(${canvasImage.angle}deg)`);
} }
}); });
...@@ -1507,11 +1533,11 @@ export default { ...@@ -1507,11 +1533,11 @@ export default {
self.isLeftRotate = false; self.isLeftRotate = false;
self.isRightRotate = true; self.isRightRotate = true;
imageEditor.rotate(+30).then((res) => { imageEditor.rotate(+30).then((res) => {
//console.log(res); console.log(res);
}); });
self.historys.push("旋转"); self.historys.push("旋转");
let canvasImage = imageEditor._graphics.getCanvasImage(); let canvasImage = imageEditor._graphics.getCanvasImage();
//console.log(canvasImage); console.log(canvasImage);
$(".tzdDrawing").css( $(".tzdDrawing").css(
"transform", "transform",
`rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})` `rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})`
...@@ -1519,8 +1545,8 @@ export default { ...@@ -1519,8 +1545,8 @@ export default {
// 不规则图形的旋转 // 不规则图形的旋转
// Fcanvas.getObjects().map(function(o) { // Fcanvas.getObjects().map(function(o) {
// // //console.log(o); // // console.log(o);
// //console.log(canvasImage.angle); // console.log(canvasImage.angle);
// o.rotatePoint(self.newWidth/2, self.newHeight/2) // o.rotatePoint(self.newWidth/2, self.newHeight/2)
// o.rotate(canvasImage.angle) // o.rotate(canvasImage.angle)
// // o.set('rotate', -30).setCoords(); // // o.set('rotate', -30).setCoords();
...@@ -1549,7 +1575,9 @@ export default { ...@@ -1549,7 +1575,9 @@ export default {
// 小区域旋转 // 小区域旋转
if (self.isTpdr_flag) { if (self.isTpdr_flag) {
$(".small-drawing-img").css("transform", `rotate(${-30}deg)`); console.log(canvasImage.angle);
console.log(self.startPlace);
$(".small-drawing-img").css("transform", `rotate(${canvasImage.angle}deg)`);
} }
}); });
...@@ -1561,11 +1589,11 @@ export default { ...@@ -1561,11 +1589,11 @@ export default {
self.isLeftRotate = false; self.isLeftRotate = false;
self.isRightRotate = true; self.isRightRotate = true;
imageEditor.rotate(+30).then((res) => { imageEditor.rotate(+30).then((res) => {
//console.log(res); console.log(res);
}); });
self.historys.push("旋转"); self.historys.push("旋转");
let canvasImage = imageEditor._graphics.getCanvasImage(); let canvasImage = imageEditor._graphics.getCanvasImage();
//console.log(canvasImage); console.log(canvasImage);
$(".tzdDrawing").css( $(".tzdDrawing").css(
"transform", "transform",
`rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})` `rotate(${canvasImage.angle}deg) translate(${self.move_left}px,${self.move_top}px) scale(${self.zoomLevel})`
...@@ -1590,7 +1618,9 @@ export default { ...@@ -1590,7 +1618,9 @@ export default {
// 小区域旋转 // 小区域旋转
if (self.isTpdr_flag) { if (self.isTpdr_flag) {
$(".small-drawing-img").css("transform", `rotate(${-30}deg)`); console.log(canvasImage.angle);
console.log(self.startPlace);
$(".small-drawing-img").css("transform", `rotate(${canvasImage.angle}deg)`);
} }
}); });
// 滑动旋转事件 // 滑动旋转事件
...@@ -1604,9 +1634,10 @@ export default { ...@@ -1604,9 +1634,10 @@ export default {
); );
// 小区域旋转 // 小区域旋转
if (self.isTpdr_flag) { if (self.isTpdr_flag) {
console.warn(222222,self.inputRotationRange);
$(".small-drawing-img").css( $(".small-drawing-img").css(
"transform", "transform",
`rotate(${parseInt($inputRotationRange.val(), 10) - self.startPlace `rotate(${self.inputRotationRange
}deg)` }deg)`
); );
} }
...@@ -1639,16 +1670,16 @@ export default { ...@@ -1639,16 +1670,16 @@ export default {
// 滑动旋转事件 // 滑动旋转事件
$inputRotationRange.on("change", function (e) { $inputRotationRange.on("change", function (e) {
e.stopPropagation() e.stopPropagation()
self.inputRotationRange = parseInt($inputRotationRange.val(), 10);
imageEditor.rotate( imageEditor.rotate(
parseInt($inputRotationRange.val(), 10) - self.startPlace parseInt(self.inputRotationRange - self.startPlace
); ))
// 小区域旋转 // 小区域旋转
if (self.isTpdr_flag) { if (self.isTpdr_flag) {
console.warn(222222,self.inputRotationRange);
$(".small-drawing-img").css( $(".small-drawing-img").css(
"transform", "transform",
`rotate(${parseInt($inputRotationRange.val(), 10) - self.startPlace `rotate(${self.inputRotationRange}deg)`
}deg)`
); );
} }
// 特征点的图层也要跟着转 // 特征点的图层也要跟着转
...@@ -1723,7 +1754,6 @@ export default { ...@@ -1723,7 +1754,6 @@ export default {
// 滑动条去除白色 // 滑动条去除白色
$inputRangeRemoveWhiteDistance.on("change", function (e) { $inputRangeRemoveWhiteDistance.on("change", function (e) {
e.stopPropagation()
self.inputRemoveWhiteRange = this.value; self.inputRemoveWhiteRange = this.value;
applyOrRemoveFilter(true, "removeColor", { applyOrRemoveFilter(true, "removeColor", {
distance: parseInt(this.value, 10) / 255 distance: parseInt(this.value, 10) / 255
...@@ -1732,7 +1762,6 @@ export default { ...@@ -1732,7 +1762,6 @@ export default {
// 滑动条滤色 // 滑动条滤色
$inputRangeColorFilterValue.on("change", function (e) { $inputRangeColorFilterValue.on("change", function (e) {
e.stopPropagation()
self.inputColorFilterRange = this.value; self.inputColorFilterRange = this.value;
applyOrRemoveFilter(true, "removeColor", { applyOrRemoveFilter(true, "removeColor", {
distance: this.value / 255 distance: this.value / 255
...@@ -1741,22 +1770,20 @@ export default { ...@@ -1741,22 +1770,20 @@ export default {
// 标记点颜色改变 // 标记点颜色改变
// BJDColorpicker.on('selectColor', function (e) { // BJDColorpicker.on('selectColor', function (e) {
// //console.log(e); // console.log(e);
// document.getElementsByTagName('body')[0].style.setProperty('--BJDcolor', e.color); // document.getElementsByTagName('body')[0].style.setProperty('--BJDcolor', e.color);
// self.sourceBJDColor = e.color // self.sourceBJDColor = e.color
// //console.log(self.sourceBJDColor); // console.log(self.sourceBJDColor);
// }) // })
// 正片叠底 // 正片叠底
multiplyColorpicker.on("selectColor", function (e) { multiplyColorpicker.on("selectColor", function (e) {
e.stopPropagation()
applyOrRemoveFilter(true, "blendColor", { applyOrRemoveFilter(true, "blendColor", {
color: e.color color: e.color
}); });
}); });
$inputCheckBlend.on("change", function (e) { $inputCheckBlend.on("change", function (e) {
e.stopPropagation()
applyOrRemoveFilter(this.checked, "blendColor", { applyOrRemoveFilter(this.checked, "blendColor", {
mode: $selectBlendType.val(), mode: $selectBlendType.val(),
color: blendColorpicker.getColor() color: blendColorpicker.getColor()
...@@ -1765,7 +1792,6 @@ export default { ...@@ -1765,7 +1792,6 @@ export default {
// 差异化 // 差异化
blendColorpicker.on("selectColor", function (e) { blendColorpicker.on("selectColor", function (e) {
e.stopPropagation()
applyOrRemoveFilter(true, "blendColor", { applyOrRemoveFilter(true, "blendColor", {
color: e.color color: e.color
}); });
...@@ -1773,7 +1799,6 @@ export default { ...@@ -1773,7 +1799,6 @@ export default {
// 亮度 // 亮度
$inputRangeBrightnessValue.on("change", function (e) { $inputRangeBrightnessValue.on("change", function (e) {
e.stopPropagation()
self.inputBrightnessRange = this.value; self.inputBrightnessRange = this.value;
applyOrRemoveFilter(true, "brightness", { applyOrRemoveFilter(true, "brightness", {
brightness: parseInt(this.value, 10) / 255 brightness: parseInt(this.value, 10) / 255
...@@ -1782,7 +1807,6 @@ export default { ...@@ -1782,7 +1807,6 @@ export default {
// 对比度 // 对比度
$inputRangeContrastValue.on("change", function (e) { $inputRangeContrastValue.on("change", function (e) {
e.stopPropagation()
self.inputContrastRange = this.value; self.inputContrastRange = this.value;
applyOrRemoveFilter(true, "contrast", { applyOrRemoveFilter(true, "contrast", {
contrast: this.value / 255 contrast: this.value / 255
...@@ -1795,7 +1819,7 @@ export default { ...@@ -1795,7 +1819,7 @@ export default {
imageEditor.resetZoom() imageEditor.resetZoom()
self.sourceImage = sourceImage self.sourceImage = sourceImage
imageEditor.loadImageFromURL('data:image/jpeg;base64,' + sourceImage, 'SampleImage').then(function (sizeValue) { imageEditor.loadImageFromURL('data:image/jpeg;base64,' + sourceImage, 'SampleImage').then(function (sizeValue) {
//console.log(sizeValue); console.log(sizeValue);
// 更新newHeight和newWidth // 更新newHeight和newWidth
self.newHeight = sizeValue.newHeight self.newHeight = sizeValue.newHeight
self.newWidth = sizeValue.newWidth self.newWidth = sizeValue.newWidth
...@@ -1808,7 +1832,7 @@ export default { ...@@ -1808,7 +1832,7 @@ export default {
Fcanvas.clear() Fcanvas.clear()
self.Fcanvas = [] self.Fcanvas = []
self.autoFcanvas = [] self.autoFcanvas = []
// //console.log(sizeValue); // console.log(sizeValue);
// 切换指纹图片时，清空特征点数组 // 切换指纹图片时，清空特征点数组
self.tzdnumber = 0 self.tzdnumber = 0
self.tzdArr = [] self.tzdArr = []
...@@ -1824,7 +1848,7 @@ export default { ...@@ -1824,7 +1848,7 @@ export default {
// 如果之前保留了特征点，则展示出来 // 如果之前保留了特征点，则展示出来
if (sessionStorage.getItem(self.seq) != 'undefined' && sessionStorage.getItem(self.seq) != null) { if (sessionStorage.getItem(self.seq) != 'undefined' && sessionStorage.getItem(self.seq) != null) {
//console.log(sessionStorage.getItem(self.seq)); console.log(sessionStorage.getItem(self.seq));
let preTzd = JSON.parse(sessionStorage.getItem(self.seq)) let preTzd = JSON.parse(sessionStorage.getItem(self.seq))
if (preTzd && preTzd.length > 0) { if (preTzd && preTzd.length > 0) {
preTzd.forEach((item, index) => { preTzd.forEach((item, index) => {
...@@ -1841,7 +1865,33 @@ export default { ...@@ -1841,7 +1865,33 @@ export default {
}) })
*/ */
this.$bus.on("ajzwbjImage", (sourceImage) => { this.$bus.on("ajzwbjImage", (ajzwbjImage) => {
let sourceImage = ajzwbjImage.finger_image
let dealFlag = ajzwbjImage.finger_dealFlag
let fingerPosition = ajzwbjImage.finger_position.split(',')
self.rightFinger.forEach(item => {
item.isSelected = false
})
self.leftFinger.forEach(item => {
item.isSelected = false
})
fingerPosition.forEach((item) => {
self.rightFinger.forEach(item2 => {
if(item2.code == item) {
item2.isSelected = true
}
})
self.leftFinger.forEach(item3 => {
if(item3.code == item) {
item3.isSelected = true
}
})
})
if(dealFlag==1) {
self.txbj_type = '已处理'
} else {
self.txbj_type = '未处理'
}
// 缩放为1 // 缩放为1
self.zoomLevel = 1; self.zoomLevel = 1;
imageEditor.resetZoom(); imageEditor.resetZoom();
...@@ -1869,7 +1919,7 @@ export default { ...@@ -1869,7 +1919,7 @@ export default {
Fcanvas.clear(); Fcanvas.clear();
self.Fcanvas = []; self.Fcanvas = [];
self.autoFcanvas = []; self.autoFcanvas = [];
// //console.log(sizeValue); // console.log(sizeValue);
// 切换指纹图片时，清空特征点数组 // 切换指纹图片时，清空特征点数组
self.tzdnumber = 0; self.tzdnumber = 0;
self.tzdArr = []; self.tzdArr = [];
...@@ -1885,8 +1935,8 @@ export default { ...@@ -1885,8 +1935,8 @@ export default {
self.getAutoTzd(false); self.getAutoTzd(false);
// 如果之前保留了特征点，则展示出来 // 如果之前保留了特征点，则展示出来
//console.log(self.seq); console.log(self.seq);
//console.log(sessionStorage.getItem(self.seq)); console.log(sessionStorage.getItem(self.seq));
if ( if (
sessionStorage.getItem(self.seq) != "undefined" && sessionStorage.getItem(self.seq) != "undefined" &&
sessionStorage.getItem(self.seq) != null sessionStorage.getItem(self.seq) != null
...@@ -1938,17 +1988,17 @@ export default { ...@@ -1938,17 +1988,17 @@ export default {
} }
} }
// 如果之前画了了重要区域，则展示出来---圆形 // 如果之前画了了重要区域，则展示出来---圆形
// //console.log('yxhz_'+self.seq); // console.log('yxhz_'+self.seq);
// //console.log(sessionStorage.getItem('yxhz_'+self.seq)); // console.log(sessionStorage.getItem('yxhz_'+self.seq));
if ( if (
sessionStorage.getItem("yxhz_" + self.seq) != "undefined" && sessionStorage.getItem("yxhz_" + self.seq) != "undefined" &&
sessionStorage.getItem("yxhz_" + self.seq) != null sessionStorage.getItem("yxhz_" + self.seq) != null
) { ) {
//console.log(sessionStorage.getItem("yxhz_" + self.seq)); console.log(sessionStorage.getItem("yxhz_" + self.seq));
let yxhzArr = JSON.parse( let yxhzArr = JSON.parse(
sessionStorage.getItem("yxhz_" + self.seq) sessionStorage.getItem("yxhz_" + self.seq)
); );
//console.log(yxhzArr); console.log(yxhzArr);
yxhzArr.forEach((item) => { yxhzArr.forEach((item) => {
self.circleArr_hand.push({ self.circleArr_hand.push({
id: item.id, id: item.id,
...@@ -1982,12 +2032,12 @@ export default { ...@@ -1982,12 +2032,12 @@ export default {
sessionStorage.getItem("zyhz_" + self.seq) != "undefined" && sessionStorage.getItem("zyhz_" + self.seq) != "undefined" &&
sessionStorage.getItem("zyhz_" + self.seq) != null sessionStorage.getItem("zyhz_" + self.seq) != null
) { ) {
//console.log(sessionStorage.getItem("zyhz_" + self.seq)); console.log(sessionStorage.getItem("zyhz_" + self.seq));
let zyhzArr = JSON.parse( let zyhzArr = JSON.parse(
sessionStorage.getItem("zyhz_" + self.seq) sessionStorage.getItem("zyhz_" + self.seq)
); );
self.Fcanvas = zyhzArr; self.Fcanvas = zyhzArr;
//console.log(zyhzArr); console.log(zyhzArr);
if (zyhzArr.length > 0) { if (zyhzArr.length > 0) {
zyhzArr.forEach((item) => { zyhzArr.forEach((item) => {
var polygon = new fabric.Polygon(item, { var polygon = new fabric.Polygon(item, {
...@@ -2041,7 +2091,7 @@ export default { ...@@ -2041,7 +2091,7 @@ export default {
$inputImage.on("change", function (event) { $inputImage.on("change", function (event) {
event.stopPropagation() event.stopPropagation()
var file; var file;
//console.log(event); console.log(event);
if (!supportingFileAPI) { if (!supportingFileAPI) {
alert("This browser does not support file-api"); alert("This browser does not support file-api");
...@@ -2051,14 +2101,14 @@ export default { ...@@ -2051,14 +2101,14 @@ export default {
self.isTpdr_flag = true; self.isTpdr_flag = true;
file = event.target.files[0]; file = event.target.files[0];
//console.log(file, 222222222); console.log(file, 222222222);
imageEditor.loadImageFromFile(file).then(function (result) { imageEditor.loadImageFromFile(file).then(function (result) {
// 导入图片成功，可以保存入库 // 导入图片成功，可以保存入库
self.bcrkActive = true self.bcrkActive = true
//console.log(result); console.log(result);
self.newHeight = result.newHeight; self.newHeight = result.newHeight;
self.newWidth = result.newWidth; self.newWidth = result.newWidth;
//console.log((512 * 640) / self.newHeight); console.log((512 * 640) / self.newHeight);
$(".blc").css( $(".blc").css(
"width", "width",
...@@ -2104,7 +2154,7 @@ export default { ...@@ -2104,7 +2154,7 @@ export default {
var ins = null; var ins = null;
var originPointer = {}; var originPointer = {};
//console.log(document.querySelector(".tzdDrawing")); console.log(document.querySelector(".tzdDrawing"));
document.querySelector(".tzdDrawing").addEventListener("mousedown", function (e) { document.querySelector(".tzdDrawing").addEventListener("mousedown", function (e) {
e.stopPropagation() e.stopPropagation()
// 特征点--开启 // 特征点--开启
...@@ -2131,7 +2181,7 @@ export default { ...@@ -2131,7 +2181,7 @@ export default {
// 鼠标左击 // 鼠标左击
if (e.which === 1) { if (e.which === 1) {
self.tzdFlag = true; self.tzdFlag = true;
//console.log("down", e, 11111111111); console.log("down", e, 11111111111);
this.originX = e.clientX; this.originX = e.clientX;
this.originY = e.clientY; this.originY = e.clientY;
ins.setStart({ ins.setStart({
...@@ -2177,13 +2227,13 @@ export default { ...@@ -2177,13 +2227,13 @@ export default {
// "px" // "px"
// ); // );
// //console.log($(".tzdDrawing_2").offset().left); // console.log($(".tzdDrawing_2").offset().left);
// //console.log($(".tzdDrawing_2").offset().top); // console.log($(".tzdDrawing_2").offset().top);
let src = { let src = {
x: (e.pageX - $(".tzdDrawing_2").offset().left) / self.zoomLevel, x: (e.pageX - $(".tzdDrawing_2").offset().left) / self.zoomLevel,
y: (e.pageY - $(".tzdDrawing_2").offset().top) / self.zoomLevel y: (e.pageY - $(".tzdDrawing_2").offset().top) / self.zoomLevel
}; };
//console.log(src); console.log(src);
let det = { let det = {
x: Number($(".tzdDrawing_2").width()) / 2, x: Number($(".tzdDrawing_2").width()) / 2,
y: Number($(".tzdDrawing_2").height()) / 2 y: Number($(".tzdDrawing_2").height()) / 2
...@@ -2192,7 +2242,7 @@ export default { ...@@ -2192,7 +2242,7 @@ export default {
const point = { x: src.x, y: src.y }; const point = { x: src.x, y: src.y };
// const angle = -Math.PI / 2; // const angle = -Math.PI / 2;
// 角度超出360°范围了 // 角度超出360°范围了
//console.log(self.startPlace); console.log(self.startPlace);
if (self.startPlace <= -360) { if (self.startPlace <= -360) {
self.startPlace = 0; self.startPlace = 0;
} }
...@@ -2200,7 +2250,7 @@ export default { ...@@ -2200,7 +2250,7 @@ export default {
self.startPlace = 0; self.startPlace = 0;
} }
const angle = -self.startPlace * Math.PI / 180.00; const angle = -self.startPlace * Math.PI / 180.00;
//console.log(angle); console.log(angle);
// 角度 * Math.PI / 180 // 角度 * Math.PI / 180
const [x, y] = reverse( const [x, y] = reverse(
point.x, point.x,
...@@ -2209,7 +2259,7 @@ export default { ...@@ -2209,7 +2259,7 @@ export default {
det.y, det.y,
-angle -angle
); );
//console.log(x, y); console.log(x, y);
$(`#tzd${self.tzdId}`).css( $(`#tzd${self.tzdId}`).css(
"left", "left",
...@@ -2232,7 +2282,7 @@ export default { ...@@ -2232,7 +2282,7 @@ export default {
} }
// 鼠标右击 // 鼠标右击
if (e.which === 3) { if (e.which === 3) {
//console.log(e); console.log(e);
if ( if (
e.target.className == "head" || e.target.className == "head" ||
e.target.className == "direction" || e.target.className == "direction" ||
...@@ -2271,15 +2321,15 @@ export default { ...@@ -2271,15 +2321,15 @@ export default {
self.$store.commit("zwbj/setTzdall", tzdall_shou); self.$store.commit("zwbj/setTzdall", tzdall_shou);
} }
self.tzdnumber = self.tzdArr.length; self.tzdnumber = self.tzdArr.length;
// //console.log(self.tzdArr); // console.log(self.tzdArr);
// 删除自动提取的特征点 // 删除自动提取的特征点
//console.log(self.autoTzdArr); console.log(self.autoTzdArr);
if (e.target.className == "auto_tzdDom") { if (e.target.className == "auto_tzdDom") {
let auto_tzdindex = self.autoTzdArr.findIndex((item) => { let auto_tzdindex = self.autoTzdArr.findIndex((item) => {
return item.id == e.target.id; return item.id == e.target.id;
}); });
//console.log(auto_tzdindex); console.log(auto_tzdindex);
if (auto_tzdindex != -1) { if (auto_tzdindex != -1) {
self.autoTzdArr.splice(auto_tzdindex, 1); self.autoTzdArr.splice(auto_tzdindex, 1);
$(e.target).css("border", "2px solid red"); $(e.target).css("border", "2px solid red");
...@@ -2293,7 +2343,7 @@ export default { ...@@ -2293,7 +2343,7 @@ export default {
let auto_tzdindex = self.autoTzdArr.findIndex((item) => { let auto_tzdindex = self.autoTzdArr.findIndex((item) => {
return item.id == e.target.parentNode.id; return item.id == e.target.parentNode.id;
}); });
//console.log(auto_tzdindex); console.log(auto_tzdindex);
if (auto_tzdindex != -1) { if (auto_tzdindex != -1) {
self.autoTzdArr.splice(auto_tzdindex, 1); self.autoTzdArr.splice(auto_tzdindex, 1);
$(e.target.parentNode).css("border", "2px solid red"); $(e.target.parentNode).css("border", "2px solid red");
...@@ -2318,7 +2368,7 @@ export default { ...@@ -2318,7 +2368,7 @@ export default {
x: (e.pageX - $(".tzdDrawing_2").offset().left) / self.zoomLevel, x: (e.pageX - $(".tzdDrawing_2").offset().left) / self.zoomLevel,
y: (e.pageY - $(".tzdDrawing_2").offset().top) / self.zoomLevel y: (e.pageY - $(".tzdDrawing_2").offset().top) / self.zoomLevel
}; };
//console.log(src); console.log(src);
let det = { let det = {
x: Number($(".tzdDrawing_2").width()) / 2, x: Number($(".tzdDrawing_2").width()) / 2,
y: Number($(".tzdDrawing_2").height()) / 2 y: Number($(".tzdDrawing_2").height()) / 2
...@@ -2327,7 +2377,7 @@ export default { ...@@ -2327,7 +2377,7 @@ export default {
const point = { x: src.x, y: src.y }; const point = { x: src.x, y: src.y };
// const angle = -Math.PI / 2; // const angle = -Math.PI / 2;
// 角度超出360°范围了 // 角度超出360°范围了
//console.log(self.startPlace); console.log(self.startPlace);
if (self.startPlace <= -360) { if (self.startPlace <= -360) {
self.startPlace = 0; self.startPlace = 0;
} }
...@@ -2335,7 +2385,7 @@ export default { ...@@ -2335,7 +2385,7 @@ export default {
self.startPlace = 0; self.startPlace = 0;
} }
const angle = -self.startPlace * Math.PI / 180.00; const angle = -self.startPlace * Math.PI / 180.00;
//console.log(angle); console.log(angle);
// 角度 * Math.PI / 180 // 角度 * Math.PI / 180
const [x, y] = reverse( const [x, y] = reverse(
point.x, point.x,
...@@ -2344,7 +2394,7 @@ export default { ...@@ -2344,7 +2394,7 @@ export default {
det.y, det.y,
-angle -angle
); );
//console.log(x, y); console.log(x, y);
$circle = $( $circle = $(
`<div id="circle${self.circleId}" class="td_circle"></div>` `<div id="circle${self.circleId}" class="td_circle"></div>`
...@@ -2367,45 +2417,37 @@ export default { ...@@ -2367,45 +2417,37 @@ export default {
} }
} }
// 删除圆 // 删除圆
if (e.target.className == "td_circle") { if(e.which === 3) {
//console.log(e); if (e.target.className == "td_circle") {
$(".td_circle").unbind("click").click(function (event) { let circleid = e.target.id.substring(
//console.log(event);
//console.log(1111);
let circleid = event.target.id.substring(
6, 6,
event.target.id.length e.target.id.length
); );
let circleIndex = self.circleArr_hand.findIndex((item) => { let circleIndex = self.circleArr_hand.findIndex((item) => {
return item.id == circleid; return item.id == circleid;
}); });
//console.log(circleIndex); console.log(circleIndex);
if (circleIndex != -1) self.circleArr_hand.splice(circleIndex, 1); if (circleIndex != -1) self.circleArr_hand.splice(circleIndex, 1);
$(this).remove(); $(e.target).remove();
//console.log(self.circleArr_hand); console.log(self.circleArr_hand);
event.stopPropagation(); // 阻止事件冒泡
// 更新vuex数据--圆形绘制 // 更新vuex数据--圆形绘制
self.$store.commit("zwbj/setYxhz", self.circleArr_hand); self.$store.commit("zwbj/setYxhz", self.circleArr_hand);
}); }
} // 删除圆---自动提取
// 删除圆---自动提取 if (e.target.className == "auto_td_circle") {
if (e.target.className == "auto_td_circle") { let circleid = e.target.id;
$(".auto_td_circle").unbind("click").click(function (event) {
//console.log(event);
//console.log(2222);
let circleid = event.target.id;
let circleIndex = self.autoCircleArr_hand.findIndex((item) => { let circleIndex = self.autoCircleArr_hand.findIndex((item) => {
return item.id == circleid; return item.id == circleid;
}); });
//console.log(circleIndex); console.log(circleIndex);
if (circleIndex != -1) self.autoCircleArr_hand.splice(circleIndex, 1); if (circleIndex != -1) self.autoCircleArr_hand.splice(circleIndex, 1);
$(this).remove(); $(e.target).remove();
//console.log(self.autoCircleArr_hand); console.log(self.autoCircleArr_hand);
event.stopPropagation(); // 阻止事件冒泡
// 更新vuex数据--圆形绘制 // 更新vuex数据--圆形绘制
self.$store.commit("zwbj/setAutoYxhz", self.autoCircleArr_hand); self.$store.commit("zwbj/setAutoYxhz", self.autoCircleArr_hand);
}); }
} }
}); });
// 去掉鼠标默认事件 // 去掉鼠标默认事件
$(".tzdDrawing").bind("contextmenu", function (e) { $(".tzdDrawing").bind("contextmenu", function (e) {
...@@ -2425,16 +2467,16 @@ export default { ...@@ -2425,16 +2467,16 @@ export default {
// let canvasImage = imageEditor._graphics.getCanvasImage() // let canvasImage = imageEditor._graphics.getCanvasImage()
let originleft = self.originleft || 0; let originleft = self.originleft || 0;
let origintop = self.origintop || 0; let origintop = self.origintop || 0;
// //console.log(canvasImage); // console.log(canvasImage);
// //console.log(originleft + (x2 - x1)); // console.log(originleft + (x2 - x1));
// //console.log(origintop + (y2 - y1)); // console.log(origintop + (y2 - y1));
// let originleft = $('.tzdDrawing').css('left') // let originleft = $('.tzdDrawing').css('left')
// originleft = Number(originleft.substring(0, originleft.length - 2)) // originleft = Number(originleft.substring(0, originleft.length - 2))
// let origintop = $('.tzdDrawing').css('top') // let origintop = $('.tzdDrawing').css('top')
// origintop = Number(origintop.substring(0, origintop.length - 2)) // origintop = Number(origintop.substring(0, origintop.length - 2))
// //console.log(originleft); // console.log(originleft);
// //console.log(origintop); // console.log(origintop);
// 移动图片 // 移动图片
// imageEditor._graphics.setImageProperties({ // imageEditor._graphics.setImageProperties({
...@@ -2443,8 +2485,8 @@ export default { ...@@ -2443,8 +2485,8 @@ export default {
// originX: 'left', // originX: 'left',
// originY: 'top' // originY: 'top'
// }, true) // }, true)
//console.log("left:", originleft + ((x2 - x1) * self.newWidth) / 640); console.log("left:", originleft + ((x2 - x1) * self.newWidth) / 640);
//console.log("top:", origintop + ((y2 - y1) * self.newHeight) / 640); console.log("top:", origintop + ((y2 - y1) * self.newHeight) / 640);
imageEditor._graphics.setImageProperties( imageEditor._graphics.setImageProperties(
{ {
left: left:
...@@ -2480,13 +2522,13 @@ export default { ...@@ -2480,13 +2522,13 @@ export default {
) )
}); });
// //console.log(imageEditor._graphics.getImageProperties()); // console.log(imageEditor._graphics.getImageProperties());
// //console.log(imageEditor._graphics.getCanvasImage()); // console.log(imageEditor._graphics.getCanvasImage());
// $('.tzdDrawing').css('left', `${originleft + (x2 - x1)}px`) // $('.tzdDrawing').css('left', `${originleft + (x2 - x1)}px`)
// $('.tzdDrawing').css('top', `${origintop + (y2 - y1)}px`) // $('.tzdDrawing').css('top', `${origintop + (y2 - y1)}px`)
// $('.tzdDrawing').css('transform', `translate(${x2 - x1}px,${y2 - y1}px)`) // $('.tzdDrawing').css('transform', `translate(${x2 - x1}px,${y2 - y1}px)`)
//console.log(Number(self.tzdDrawingLeft) + (x2 - x1)); console.log(Number(self.tzdDrawingLeft) + (x2 - x1));
$(".tzdDrawing").css( $(".tzdDrawing").css(
"transform", "transform",
`translate(${Number(self.tzdDrawingLeft) + (x2 - x1)}px,${Number(self.tzdDrawingTop) + (y2 - y1) `translate(${Number(self.tzdDrawingLeft) + (x2 - x1)}px,${Number(self.tzdDrawingTop) + (y2 - y1)
...@@ -2504,7 +2546,7 @@ export default { ...@@ -2504,7 +2546,7 @@ export default {
// $('.tzdDrawing').css('transform', `translate(${(originleft + (x2 - x1))/16}rem,${(origintop + (y2 - y1))/16}rem) scale(${self.zoomLevel})`) // $('.tzdDrawing').css('transform', `translate(${(originleft + (x2 - x1))/16}rem,${(origintop + (y2 - y1))/16}rem) scale(${self.zoomLevel})`)
} }
// //console.log(self.mouseEnlarge); // console.log(self.mouseEnlarge);
if (self.mouseEnlarge) { if (self.mouseEnlarge) {
// imageEditor._graphics.setImageProperties({ // imageEditor._graphics.setImageProperties({
// left: 0, // left: 0,
...@@ -2518,8 +2560,8 @@ export default { ...@@ -2518,8 +2560,8 @@ export default {
if (self.zoomLevel >= 2) { if (self.zoomLevel >= 2) {
self.zoomLevel = 2; self.zoomLevel = 2;
} }
//console.log(self.newWidth); console.log(self.newWidth);
//console.log(self.newHeight); console.log(self.newHeight);
imageEditor.zoom({ imageEditor.zoom({
x: self.newWidth / 2, x: self.newWidth / 2,
y: self.newHeight / 2, y: self.newHeight / 2,
...@@ -2535,7 +2577,7 @@ export default { ...@@ -2535,7 +2577,7 @@ export default {
); );
//开始缩放 //开始缩放
Fcanvas.zoomToPoint(zoomPoint, self.zoomLevel); Fcanvas.zoomToPoint(zoomPoint, self.zoomLevel);
//console.log(Fcanvas); console.log(Fcanvas);
// $(".canvas-container").css('transform', `scale(${self.zoomLevel})`) // $(".canvas-container").css('transform', `scale(${self.zoomLevel})`)
// Fcanvas.setZoom(self.zoomLevel); // Fcanvas.setZoom(self.zoomLevel);
...@@ -2544,14 +2586,14 @@ export default { ...@@ -2544,14 +2586,14 @@ export default {
// document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.x}px ${originPointer.y}px`; // document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.x}px ${originPointer.y}px`;
let canvasImage = imageEditor._graphics.getCanvasImage(); let canvasImage = imageEditor._graphics.getCanvasImage();
//console.log(canvasImage); console.log(canvasImage);
// $(".tzdDrawing").css('transform-origin', `${Number($(".tzdDrawing").width())/2-Number(self.tzdDrawing_left)}px ${Number($(".tzdDrawing").height())/2-Number(self.tzdDrawing_top)}px`) // $(".tzdDrawing").css('transform-origin', `${Number($(".tzdDrawing").width())/2-Number(self.tzdDrawing_left)}px ${Number($(".tzdDrawing").height())/2-Number(self.tzdDrawing_top)}px`)
$(".tzdDrawing").css("transform", `rotate(${canvasImage.angle}deg) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) scale(${self.zoomLevel})`); $(".tzdDrawing").css("transform", `rotate(${canvasImage.angle}deg) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px) scale(${self.zoomLevel})`);
$(".tzdDrawing").css("transform-origin", `${Number($(".tzdDrawing").width()) / 2 - Number(self.tzdDrawing_left)}px ${Number($(".tzdDrawing").height()) / 2 - Number(self.tzdDrawing_top)}px`); $(".tzdDrawing").css("transform-origin", `${Number($(".tzdDrawing").width()) / 2 - Number(self.tzdDrawing_left)}px ${Number($(".tzdDrawing").height()) / 2 - Number(self.tzdDrawing_top)}px`);
$(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel}) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px)`); $(".tzdDrawing_2").css("transform", `scale(${self.zoomLevel}) translate(${Number(self.tzdDrawing_left)}px,${Number(self.tzdDrawing_top)}px)`);
// document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px"; // document.querySelector('.tzdDrawing').style.transformOrigin = "260px 260px";
// //console.log(`${originPointer.y}px,${originPointer.x}px`); // console.log(`${originPointer.y}px,${originPointer.x}px`);
// document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.y}px ${originPointer.x}px`; // document.querySelector('.tzdDrawing').style.transformOrigin = `${originPointer.y}px ${originPointer.x}px`;
$(".tzdDom").css("z-index", `99999`); $(".tzdDom").css("z-index", `99999`);
} else { } else {
...@@ -2603,12 +2645,12 @@ export default { ...@@ -2603,12 +2645,12 @@ export default {
} }
if (self.isHandTZD) { if (self.isHandTZD) {
if (self.tzdFlag) { if (self.tzdFlag) {
// //console.log(e); // console.log(e);
if (!ins.startPoint) { if (!ins.startPoint) {
return; return;
} }
//console.log($("#tzd" + self.tzdId).width()); console.log($("#tzd" + self.tzdId).width());
// //console.log(this.originX,this.originY,e.clientX,e.clientY) // console.log(this.originX,this.originY,e.clientX,e.clientY)
obj = ins.getDegInfo({ obj = ins.getDegInfo({
x: e.clientX, x: e.clientX,
y: e.clientY, y: e.clientY,
...@@ -2644,12 +2686,12 @@ export default { ...@@ -2644,12 +2686,12 @@ export default {
deg = 0; deg = 0;
} }
// //console.log(self.startPlace, "原点 "); // console.log(self.startPlace, "原点 ");
if (deg) { if (deg) {
$("#tzd" + self.tzdId).css("transform", `rotate(${deg - self.startPlace}deg)`); $("#tzd" + self.tzdId).css("transform", `rotate(${deg - self.startPlace}deg)`);
// obj.deg = deg - self.startPlace; // obj.deg = deg - self.startPlace;
} else { } else {
// //console.log("无效的移动"); // console.log("无效的移动");
} }
} }
} }
...@@ -2668,7 +2710,7 @@ export default { ...@@ -2668,7 +2710,7 @@ export default {
const point = { x: src.x, y: src.y }; const point = { x: src.x, y: src.y };
// 角度超出360°范围了 // 角度超出360°范围了
//console.log(self.startPlace); console.log(self.startPlace);
if (self.startPlace <= -360) { if (self.startPlace <= -360) {
self.startPlace = 0; self.startPlace = 0;
} }
...@@ -2687,8 +2729,8 @@ export default { ...@@ -2687,8 +2729,8 @@ export default {
// var radiusX = Math.abs(e.pageX - $drawing.offset().left - centerX); // var radiusX = Math.abs(e.pageX - $drawing.offset().left - centerX);
// var radiusY = Math.abs(e.pageY - $drawing.offset().top - centerY); // var radiusY = Math.abs(e.pageY - $drawing.offset().top - centerY);
//console.log(x); console.log(x);
//console.log(centerX); console.log(centerX);
var radiusX = x - centerX; var radiusX = x - centerX;
var radiusY = y - centerY; var radiusY = y - centerY;
radius = Math.sqrt(radiusX * radiusX + radiusY * radiusY); // 半径，勾股定理 radius = Math.sqrt(radiusX * radiusX + radiusY * radiusY); // 半径，勾股定理
...@@ -2713,7 +2755,7 @@ export default { ...@@ -2713,7 +2755,7 @@ export default {
$circle.css("height", 2 * radius + "px"); $circle.css("height", 2 * radius + "px");
$circle.css("border-radius", "50%"); $circle.css("border-radius", "50%");
$circle.css("background", "rgba(0,0,0,0)"); $circle.css("background", "rgba(0,0,0,0)");
// //console.log(self.circleId); // console.log(self.circleId);
// self.circleArr_hand[self.circleId].radius = radius; // self.circleArr_hand[self.circleId].radius = radius;
} }
} }
...@@ -2721,10 +2763,10 @@ export default { ...@@ -2721,10 +2763,10 @@ export default {
document.querySelector(".tzdDrawing").addEventListener("mouseup", function (e) { document.querySelector(".tzdDrawing").addEventListener("mouseup", function (e) {
e.stopPropagation() e.stopPropagation()
let canvasImage = imageEditor._graphics.getCanvasImage(); let canvasImage = imageEditor._graphics.getCanvasImage();
//console.log(canvasImage); console.log(canvasImage);
self.originleft = canvasImage.left; self.originleft = canvasImage.left;
self.origintop = canvasImage.top; self.origintop = canvasImage.top;
// //console.log($('.tzdDrawing').css("transform").replace(/[^0-9\-,]/g,'').split(',')); // console.log($('.tzdDrawing').css("transform").replace(/[^0-9\-,]/g,'').split(','));
if ( if (
$(".tzdDrawing") $(".tzdDrawing")
.css("transform") .css("transform")
...@@ -2740,11 +2782,11 @@ export default { ...@@ -2740,11 +2782,11 @@ export default {
.replace(/[^0-9\-,]/g, "") .replace(/[^0-9\-,]/g, "")
.split(",")[5]; .split(",")[5];
} }
// //console.log(self.originleft); // console.log(self.originleft);
// //console.log(self.origintop); // console.log(self.origintop);
self.startHand = false; self.startHand = false;
self.mouseEnlarge = false; self.mouseEnlarge = false;
// //console.log(e); // console.log(e);
if (self.isHandTZD) { if (self.isHandTZD) {
if (e.which === 1) { if (e.which === 1) {
if (obj.deg) { if (obj.deg) {
...@@ -2754,8 +2796,8 @@ export default { ...@@ -2754,8 +2796,8 @@ export default {
// self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg) // self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
self.tzdArr[objindex].angle = obj.deg; self.tzdArr[objindex].angle = obj.deg;
} else { } else {
//console.log(self.tzdArr); console.log(self.tzdArr);
//console.log(self.tzdId); console.log(self.tzdId);
let objindex = self.tzdArr.findIndex((item) => { let objindex = self.tzdArr.findIndex((item) => {
return item.id == self.tzdId; return item.id == self.tzdId;
}); });
...@@ -2778,10 +2820,10 @@ export default { ...@@ -2778,10 +2820,10 @@ export default {
}); });
}); });
} }
//console.log(self.pretzdall); console.log(self.pretzdall);
// 全部数据保存 // 全部数据保存
self.$store.commit("zwbj/setTzdall", self.pretzdall); self.$store.commit("zwbj/setTzdall", self.pretzdall);
//console.log(self.preTzdArr); console.log(self.preTzdArr);
self.pretzdall = []; self.pretzdall = [];
} }
} }
...@@ -2790,9 +2832,9 @@ export default { ...@@ -2790,9 +2832,9 @@ export default {
// 开启圆形绘制 // 开启圆形绘制
if (e.which === 1) { if (e.which === 1) {
if (self.isSelectedCirclePaint) { if (self.isSelectedCirclePaint) {
/*//console.log(e); /*console.log(e);
let circleid = e.target.id.substring(6, e.target.id.length); let circleid = e.target.id.substring(6, e.target.id.length);
//console.log(circleid);*/ console.log(circleid);*/
/*if (self.circleArr_hand[self.circleId-1]) { /*if (self.circleArr_hand[self.circleId-1]) {
self.circleArr_hand[self.circleId-1].radius = radius; self.circleArr_hand[self.circleId-1].radius = radius;
}*/ }*/
...@@ -2800,14 +2842,14 @@ export default { ...@@ -2800,14 +2842,14 @@ export default {
for (let index = 0; index < self.circleArr_hand.length; index++) { for (let index = 0; index < self.circleArr_hand.length; index++) {
const element = self.circleArr_hand[index]; const element = self.circleArr_hand[index];
if (element.id == self.circleId) { if (element.id == self.circleId) {
//console.log(element.id); // console.log(element.id);
//console.log(radius); // console.log(radius);
// element.radius = radius; // element.radius = radius;
self.$set(self.circleArr_hand[index], 'radius', radius) self.$set(self.circleArr_hand[index], 'radius', radius)
} }
} }
//console.log(self.circleArr_hand); console.log(self.circleArr_hand);
// 更新vuex数据--圆形绘制 // 更新vuex数据--圆形绘制
self.$store.commit("zwbj/setYxhz", self.circleArr_hand); self.$store.commit("zwbj/setYxhz", self.circleArr_hand);
self.circleId++; self.circleId++;
...@@ -2816,11 +2858,33 @@ export default { ...@@ -2816,11 +2858,33 @@ export default {
} }
} }
if (e.which === 3) { if (e.which === 3) {
//console.log("删除"); console.log("删除");
ins.setEnd(); ins.setEnd();
} }
}); });
$("#circle0").mousedown(function (event) {
event.stopPropagation()
if(event.which === 3) {
console.log(1111);
let circleid = event.target.id.substring(
6,
event.target.id.length
);
let circleIndex = self.circleArr_hand.findIndex((item) => {
return item.id == circleid;
});
console.log(circleIndex);
if (circleIndex != -1) self.circleArr_hand.splice(circleIndex, 1);
$(this).remove();
console.log(self.circleArr_hand);
event.stopPropagation(); // 阻止事件冒泡
// 更新vuex数据--圆形绘制
self.$store.commit("zwbj/setYxhz", self.circleArr_hand);
}
console.log(event);
});
var Fcanvas = new fabric_irregular.Canvas("irregular"); var Fcanvas = new fabric_irregular.Canvas("irregular");
self.Fcanvas_canvas = Fcanvas; self.Fcanvas_canvas = Fcanvas;
// selectable // selectable
...@@ -2839,7 +2903,7 @@ export default { ...@@ -2839,7 +2903,7 @@ export default {
// }); // });
// fabric_irregular.Image.fromURL("qwe.jpg", function (img) { // fabric_irregular.Image.fromURL("qwe.jpg", function (img) {
// //console.log(img); // console.log(img);
// Fcanvas.setBackgroundImage(img, Fcanvas.renderAll.bind(Fcanvas), { // Fcanvas.setBackgroundImage(img, Fcanvas.renderAll.bind(Fcanvas), {
// scaleX: Fcanvas.width / img.width, // scaleX: Fcanvas.width / img.width,
// scaleY: Fcanvas.height / img.height // scaleY: Fcanvas.height / img.height
...@@ -2855,7 +2919,7 @@ export default { ...@@ -2855,7 +2919,7 @@ export default {
$(".canvas-container").mousedown(function (e) { $(".canvas-container").mousedown(function (e) {
e.stopPropagation() e.stopPropagation()
if (self.isSelectedFreePaint) { if (self.isSelectedFreePaint) {
// //console.log(e); // console.log(e);
// 鼠标左击 // 鼠标左击
if (e.which === 1) { if (e.which === 1) {
var object = Fcanvas.getActiveObject(); var object = Fcanvas.getActiveObject();
...@@ -2869,13 +2933,13 @@ export default { ...@@ -2869,13 +2933,13 @@ export default {
} }
if (findIndex != -1) { if (findIndex != -1) {
Fcanvasarr.splice(findIndex, 1); Fcanvasarr.splice(findIndex, 1);
//console.log(Fcanvasarr); console.log(Fcanvasarr);
self.Fcanvasarr = Fcanvasarr || []; self.Fcanvasarr = Fcanvasarr || [];
// //console.log(object); // console.log(object);
Fcanvas.remove(object); Fcanvas.remove(object);
// 更新vuex数据--自由绘制 // 更新vuex数据--自由绘制
self.$store.commit("zwbj/setZyhz", self.Fcanvasarr); self.$store.commit("zwbj/setZyhz", self.Fcanvasarr);
//console.log(self.zyhz); console.log(self.zyhz);
} }
// 自动提取的自有绘制的删除 // 自动提取的自有绘制的删除
...@@ -2885,11 +2949,11 @@ export default { ...@@ -2885,11 +2949,11 @@ export default {
} }
} }
if (autofindIndex != -1) { if (autofindIndex != -1) {
//console.log(autofindIndex); console.log(autofindIndex);
//console.log(self.autoFcanvas); console.log(self.autoFcanvas);
self.autoFcanvas.splice(autofindIndex, 1); self.autoFcanvas.splice(autofindIndex, 1);
// //console.log(object); // console.log(object);
Fcanvas.remove(object); Fcanvas.remove(object);
// 更新vuex数据--自由绘制 // 更新vuex数据--自由绘制
self.$store.commit("zwbj/setAutoZyhz", self.autoFcanvas); self.$store.commit("zwbj/setAutoZyhz", self.autoFcanvas);
...@@ -2903,7 +2967,7 @@ export default { ...@@ -2903,7 +2967,7 @@ export default {
} }
// 鼠标右击 // 鼠标右击
if (e.which === 3) { if (e.which === 3) {
//console.log(Fcanvasline1); console.log(Fcanvasline1);
var polygon = new fabric.Polygon(Fcanvasline1, { var polygon = new fabric.Polygon(Fcanvasline1, {
// left: 100, // left: 100,
// top: 0, // top: 0,
...@@ -2921,7 +2985,7 @@ export default { ...@@ -2921,7 +2985,7 @@ export default {
// Fcanvas.viewportTransform = [0.7, 0, 0, 0.7, -50, 50]; // Fcanvas.viewportTransform = [0.7, 0, 0, 0.7, -50, 50];
Fcanvas.add(polygon); Fcanvas.add(polygon);
Fcanvasarr.push(Fcanvasline1); Fcanvasarr.push(Fcanvasline1);
//console.log(Fcanvasarr); console.log(Fcanvasarr);
self.Fcanvasarr = Fcanvasarr || []; self.Fcanvasarr = Fcanvasarr || [];
Fcanvasline1 = []; Fcanvasline1 = [];
// 更新vuex数据--自由绘制 // 更新vuex数据--自由绘制
...@@ -3045,7 +3109,7 @@ export default { ...@@ -3045,7 +3109,7 @@ export default {
restoreDrawingSurface(); restoreDrawingSurface();
updateRubberband(loc); updateRubberband(loc);
line1.push(loc); line1.push(loc);
//console.log(line1); console.log(line1);
//鼠标抬起，拖动标记设为否 //鼠标抬起，拖动标记设为否
dragging = false; dragging = false;
// 计算两点之间的距离 // 计算两点之间的距离
...@@ -3053,7 +3117,7 @@ export default { ...@@ -3053,7 +3117,7 @@ export default {
Math.pow(line1[0].x - line1[1].x, 2) + Math.pow(line1[0].x - line1[1].x, 2) +
Math.pow(line1[0].y - line1[1].y, 2) Math.pow(line1[0].y - line1[1].y, 2)
); );
//console.log(self.line_distance); console.log(self.line_distance);
} }
} }
}; };
...@@ -3067,7 +3131,7 @@ export default { ...@@ -3067,7 +3131,7 @@ export default {
"SampleImage" "SampleImage"
) )
.then(function (sizeValue) { .then(function (sizeValue) {
//console.log(sizeValue); console.log(sizeValue);
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
}); });
}); });
...@@ -3077,7 +3141,7 @@ export default { ...@@ -3077,7 +3141,7 @@ export default {
*/ */
document.addEventListener('click', function (e) { document.addEventListener('click', function (e) {
e.stopPropagation() e.stopPropagation()
// //console.log('documentElement'); // console.log('documentElement');
// 原尺寸显示下拉框 // 原尺寸显示下拉框
self.isActive = false self.isActive = false
$(".icon_size").css("background", "rgba(5, 95, 231, 0.05)"); $(".icon_size").css("background", "rgba(5, 95, 231, 0.05)");
...@@ -3094,6 +3158,7 @@ export default { ...@@ -3094,6 +3158,7 @@ export default {
}); });
}, },
methods: { methods: {
clearDialog() {},
/** /**
* 清空所有操作 * 清空所有操作
*/ */
...@@ -3161,7 +3226,7 @@ export default { ...@@ -3161,7 +3226,7 @@ export default {
*/ */
async getAutoTzd (flag) { async getAutoTzd (flag) {
let self = this; let self = this;
//console.log(this.seq); console.log(this.seq);
if (!sessionStorage.getItem(`auto_tzdDom${this.seq}`)) { if (!sessionStorage.getItem(`auto_tzdDom${this.seq}`)) {
flag = true; flag = true;
} }
...@@ -3173,7 +3238,7 @@ export default { ...@@ -3173,7 +3238,7 @@ export default {
url: "/api/export/trait/xml/case/" + this.barcode + "/" + this.seq, url: "/api/export/trait/xml/case/" + this.barcode + "/" + this.seq,
loading: false loading: false
}); });
//console.log(res); console.log(res);
// 自动提取特征数组 // 自动提取特征数组
if (res.data.code === 0) { if (res.data.code === 0) {
...@@ -3198,9 +3263,9 @@ export default { ...@@ -3198,9 +3263,9 @@ export default {
$(".auto_tzdDom .direction").css("height", "2px"); $(".auto_tzdDom .direction").css("height", "2px");
$(".auto_tzdDom .direction").css("background-color", "#FFFD0F"); $(".auto_tzdDom .direction").css("background-color", "#FFFD0F");
// //console.log(item.xczw_zwtzd_tzxzb); // console.log(item.xczw_zwtzd_tzxzb);
// //console.log(item.xczw_zwtzd_tzyzb); // console.log(item.xczw_zwtzd_tzyzb);
// //console.log(item.xczw_zwtzd_tzfx); // console.log(item.xczw_zwtzd_tzfx);
$(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb - 4) / self.zoomLevel + "px"); $(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb - 4) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("top", (item.xczw_zwtzd_tzyzb - 4) / self.zoomLevel + "px"); $(`#auto_tzdDom${self.tzdId}`).css("top", (item.xczw_zwtzd_tzyzb - 4) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box"); $(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
...@@ -3220,10 +3285,10 @@ export default { ...@@ -3220,10 +3285,10 @@ export default {
// 自动提取重要区域--圆形绘制 // 自动提取重要区域--圆形绘制
let xczw_zdyxx = res.data.ret.minutiaSet.xczw_zdyxx.zddxx_yxhz; let xczw_zdyxx = res.data.ret.minutiaSet.xczw_zdyxx.zddxx_yxhz;
//console.log(xczw_zdyxx); console.log(xczw_zdyxx);
self.autoCircleArr_hand = []; self.autoCircleArr_hand = [];
if (xczw_zdyxx && xczw_zdyxx.length > 0) { if (xczw_zdyxx && xczw_zdyxx.length > 0) {
//console.log(xczw_zdyxx); console.log(xczw_zdyxx);
xczw_zdyxx.forEach((item) => { xczw_zdyxx.forEach((item) => {
self.autoCircleArr_hand.push({ self.autoCircleArr_hand.push({
id: self.circleId, id: self.circleId,
...@@ -3257,7 +3322,7 @@ export default { ...@@ -3257,7 +3322,7 @@ export default {
// 如果之前画了了重要区域，则展示出来---自由绘制 // 如果之前画了了重要区域，则展示出来---自由绘制
let zddxx_zyhz = res.data.ret.minutiaSet.xczw_zdyxx.zddxx_zyhz; let zddxx_zyhz = res.data.ret.minutiaSet.xczw_zdyxx.zddxx_zyhz;
//console.log(zddxx_zyhz); console.log(zddxx_zyhz);
if (zddxx_zyhz && zddxx_zyhz.length > 0) { if (zddxx_zyhz && zddxx_zyhz.length > 0) {
// self.Fcanvas = zddxx_zyhz // self.Fcanvas = zddxx_zyhz
if (zddxx_zyhz.length > 0) { if (zddxx_zyhz.length > 0) {
...@@ -3270,6 +3335,7 @@ export default { ...@@ -3270,6 +3335,7 @@ export default {
}); });
}); });
self.autoFcanvas.push(arr); self.autoFcanvas.push(arr);
var polygon = new fabric.Polygon(arr, { var polygon = new fabric.Polygon(arr, {
fill: "rgba(0,0,0,0)", fill: "rgba(0,0,0,0)",
strokeWidth: 4, strokeWidth: 4,
...@@ -3286,6 +3352,7 @@ export default { ...@@ -3286,6 +3352,7 @@ export default {
} else { } else {
self.autoFcanvas = []; self.autoFcanvas = [];
} }
console.log(self.autoFcanvas);
self.$store.commit("zwbj/setAutoZyhz", self.autoFcanvas); self.$store.commit("zwbj/setAutoZyhz", self.autoFcanvas);
// 将自动提取的特征点存入session中 // 将自动提取的特征点存入session中
sessionStorage.setItem(`auto_zyhz_${self.seq}`, JSON.stringify(self.autoFcanvas)); sessionStorage.setItem(`auto_zyhz_${self.seq}`, JSON.stringify(self.autoFcanvas));
...@@ -3420,13 +3487,13 @@ export default { ...@@ -3420,13 +3487,13 @@ export default {
*/ */
cutImage () { cutImage () {
let self = this; let self = this;
// //console.log(self.crop_left * (self.newHeight / self.canvasHeight)); // console.log(self.crop_left * (self.newHeight / self.canvasHeight));
// //console.log(self.crop_top * (self.newHeight / self.canvasHeight)); // console.log(self.crop_top * (self.newHeight / self.canvasHeight));
// //console.log(self.Hand_frame * (self.newHeight / self.canvasHeight)); // console.log(self.Hand_frame * (self.newHeight / self.canvasHeight));
//console.log(self.crop_left); console.log(self.crop_left);
//console.log(self.bb); console.log(self.bb);
//console.log(self.newHeight); console.log(self.newHeight);
//console.log((self.crop_left * self.bb * self.newHeight) / 180); console.log((self.crop_left * self.bb * self.newHeight) / 180);
// Number($('#blc_small').css('left').substring(0, $('#blc_small').css('left').length-2)) // Number($('#blc_small').css('left').substring(0, $('#blc_small').css('left').length-2))
let w = Number( let w = Number(
...@@ -3439,8 +3506,8 @@ export default { ...@@ -3439,8 +3506,8 @@ export default {
.css("height") .css("height")
.substring(0, $("#blc_small").css("height").length - 2) .substring(0, $("#blc_small").css("height").length - 2)
); );
//console.log((w * self.newHeight) / 180); console.log((w * self.newHeight) / 180);
//console.log((h * self.newHeight) / 180); console.log((h * self.newHeight) / 180);
this.imageEditor.zoom({ this.imageEditor.zoom({
x: 0, x: 0,
...@@ -3448,16 +3515,16 @@ export default { ...@@ -3448,16 +3515,16 @@ export default {
zoomLevel: 1 zoomLevel: 1
}); });
//console.log(self.newHeight); console.log(self.newHeight);
let canvasImage = self.imageEditor._graphics.getCanvasImage(); let canvasImage = self.imageEditor._graphics.getCanvasImage();
//console.log(canvasImage); console.log(canvasImage);
// console.log( console.log(
// Number( Number(
// $("#blc") $("#blc")
// .css("left") .css("left")
// .substring(0, $("#blc").css("left").length - 2) .substring(0, $("#blc").css("left").length - 2)
// ) )
// ); );
self.left = self.left =
(Math.ceil( (Math.ceil(
$("#blc") $("#blc")
...@@ -3475,8 +3542,8 @@ export default { ...@@ -3475,8 +3542,8 @@ export default {
(self.newHeight / self.canvasHeight)) / (self.newHeight / self.canvasHeight)) /
self.bb; self.bb;
//console.log(self.left); console.log(self.left);
//console.log(self.top); console.log(self.top);
// self.left = 50 * (self.newHeight / self.canvasHeight)/self.bb // self.left = 50 * (self.newHeight / self.canvasHeight)/self.bb
// self.top = 50 * (self.newHeight / self.canvasHeight)/self.bb // self.top = 50 * (self.newHeight / self.canvasHeight)/self.bb
...@@ -3508,7 +3575,7 @@ export default { ...@@ -3508,7 +3575,7 @@ export default {
self.bb = 1; self.bb = 1;
// 裁剪之后，小框框就不拖拽背景图，拖着大框移动 // 裁剪之后，小框框就不拖拽背景图，拖着大框移动
self.isCrop = true; self.isCrop = true;
//console.log(res); console.log(res);
self.newHeight = res.newHeight; self.newHeight = res.newHeight;
self.newWidth = res.newWidth; self.newWidth = res.newWidth;
// 切换小图的图片路径 // 切换小图的图片路径
...@@ -3542,7 +3609,7 @@ export default { ...@@ -3542,7 +3609,7 @@ export default {
// self.newWidth = w * self.newHeight / 180 // self.newWidth = w * self.newHeight / 180
// self.newHeight = h * self.newHeight / 180 // self.newHeight = h * self.newHeight / 180
//console.log(self.newWidth); console.log(self.newWidth);
}, },
/** /**
* @description: 比例尺数值变化 * @description: 比例尺数值变化
...@@ -3550,7 +3617,7 @@ export default { ...@@ -3550,7 +3617,7 @@ export default {
* @return {*} * @return {*}
*/ */
handleChangeSZ (value) { handleChangeSZ (value) {
//console.log(value); console.log(value);
this.rule_num = value; this.rule_num = value;
}, },
/** /**
...@@ -3580,8 +3647,8 @@ export default { ...@@ -3580,8 +3647,8 @@ export default {
this.line1 = []; this.line1 = [];
let self = this; let self = this;
//console.log(this.rule_num); console.log(this.rule_num);
//console.log(this.line_distance); console.log(this.line_distance);
if (this.kdvalue == "毫米/mm") { if (this.kdvalue == "毫米/mm") {
this.rule_num = this.rule_num; this.rule_num = this.rule_num;
} else if (this.kdvalue == "厘米/cm") { } else if (this.kdvalue == "厘米/cm") {
...@@ -3674,7 +3741,7 @@ export default { ...@@ -3674,7 +3741,7 @@ export default {
let self = this; let self = this;
this.isHandTZD = !this.isHandTZD; this.isHandTZD = !this.isHandTZD;
if (this.isHandTZD) { if (this.isHandTZD) {
//console.log(111); console.log(111);
$(".tzdDrawing").css("z-index", "9999"); $(".tzdDrawing").css("z-index", "9999");
$(".canvas-container").css("z-index", "1"); $(".canvas-container").css("z-index", "1");
// 关闭放大/移动状态 // 关闭放大/移动状态
...@@ -3699,6 +3766,7 @@ export default { ...@@ -3699,6 +3766,7 @@ export default {
* @return {*} * @return {*}
*/ */
saveToKuChange () { saveToKuChange () {
let self = this
if(this.bcrkActive) { if(this.bcrkActive) {
this.isSwk_flag = false; this.isSwk_flag = false;
this.isTpdr_flag = false; this.isTpdr_flag = false;
...@@ -3706,6 +3774,16 @@ export default { ...@@ -3706,6 +3774,16 @@ export default {
// 裁剪 // 裁剪
this.cutImage(); this.cutImage();
// 修改层级
$(".rule_line").css("z-index", "9");
$(".blc").css("z-index", "9");
$(".small-drawing").css("z-index", "9");
$(".tzdDrawing").css("z-index", "99999");
let canvasImage = self.imageEditor._graphics.getCanvasImage();
self.newHeight = canvasImage.height
self.newWidth = canvasImage.width
} }
}, },
/** /**
...@@ -3719,23 +3797,25 @@ export default { ...@@ -3719,23 +3797,25 @@ export default {
self.big_y = 0; self.big_y = 0;
self.small_x = 0; self.small_x = 0;
self.small_y = 0; self.small_y = 0;
//console.log("添加手纹框"); console.log("添加手纹框");
this.isSwk_flag = !this.isSwk_flag; this.isSwk_flag = !this.isSwk_flag;
let isMove = false; let isMove = false;
if (this.isSwk_flag) { if (this.isSwk_flag) {
// 手纹框层级提升 // 手纹框层级提升
$(".blc").css("z-index", "999999"); $(".blc").css("z-index", "999999");
$(".small-drawing").css("z-index", "9999999");
$(".tzdDrawing").css("z-index", "1"); $(".tzdDrawing").css("z-index", "1");
// ********** 平行移动
// document.querySelector('.blc_small').addEventListener('mousedown', function (e) { // document.querySelector('.blc_small').addEventListener('mousedown', function (e) {
// //console.log($('.small-drawing').offset().left); // console.log($('.small-drawing').offset().left);
// // //console.log(e); // // console.log(e);
// isMove = true // isMove = true
// }) // })
// document.querySelector('.small-drawing').addEventListener('mousemove', function (e) { // document.querySelector('.small-drawing').addEventListener('mousemove', function (e) {
// if (isMove) { // if (isMove) {
// // //console.log(e); // // console.log(e);
// // $('.blc_small').css('transform', `translate(${e.pageX - $('.small-drawing').offset().left + 'px'}, ${e.pageY - $('.small-drawing').offset().top + 'px'})`) // // $('.blc_small').css('transform', `translate(${e.pageX - $('.small-drawing').offset().left + 'px'}, ${e.pageY - $('.small-drawing').offset().top + 'px'})`)
// $('.blc_small').css('left', e.pageX - $('.small-drawing').offset().left + 'px') // $('.blc_small').css('left', e.pageX - $('.small-drawing').offset().left + 'px')
// $('.blc_small').css('top', e.pageY - $('.small-drawing').offset().top + 'px') // $('.blc_small').css('top', e.pageY - $('.small-drawing').offset().top + 'px')
...@@ -3748,9 +3828,9 @@ export default { ...@@ -3748,9 +3828,9 @@ export default {
// isMove = false // isMove = false
// }) // })
let blc_isMove = false; // let blc_isMove = false;
// document.querySelector('.blc').addEventListener('mousedown', function (e) { // document.querySelector('.blc').addEventListener('mousedown', function (e) {
// //console.log(e); // console.log(e);
// blc_isMove = true // blc_isMove = true
// var dx = e.clientX - e.offsetLeft; // var dx = e.clientX - e.offsetLeft;
// var dy = e.clientY - e.offsetTop; // var dy = e.clientY - e.offsetTop;
...@@ -3779,6 +3859,8 @@ export default { ...@@ -3779,6 +3859,8 @@ export default {
e = e || event; e = e || event;
x = e.clientX - o.offsetLeft; x = e.clientX - o.offsetLeft;
y = e.clientY - o.offsetTop; y = e.clientY - o.offsetTop;
self.x = x
self.y = y
o[p] = function (e) { o[p] = function (e) {
e = e || event; e = e || event;
s.left = e.clientX - x + "px"; s.left = e.clientX - x + "px";
...@@ -3802,45 +3884,96 @@ export default { ...@@ -3802,45 +3884,96 @@ export default {
"px" "px"
); );
} else { } else {
let canvasImage = self.imageEditor._graphics.getCanvasImage();
// x在这里是NAN，所以加了self.x
let src = {
x: ((e.clientX - self.x) / Number($(".small-drawing").width()) *
self.newHeight),
y: ((e.clientY - self.y) / Number($(".small-drawing").width()) *
self.newHeight)
};
// let src = {
// x: e.clientX - self.x,
// y: e.clientY - self.y
// };
console.log(src);
let det = {
x: Number($(".small-drawing-img").width()) / 2,
y: Number($(".small-drawing-img").height()) / 2
};
console.log(det);
const point = { x: src.x, y: src.y };
// const angle = -Math.PI / 2;
// 角度超出360°范围了
console.log(self.startPlace);
if (self.startPlace <= -360) {
self.startPlace = 0;
}
if (self.startPlace >= 360) {
self.startPlace = 0;
}
const angle = -canvasImage.angle * Math.PI / 180.00;
console.log(angle);
// 角度 * Math.PI / 180
const [x, y] = reverse(
point.x,
point.y,
det.x,
det.y,
-angle
);
console.log(x, y);
console.log(canvasImage);
// self.imageEditor._graphics.setImageProperties(
// {
// left: -x,
// top: -y,
// // left: -(x / Number($(".small-drawing").width()) *
// // self.newHeight),
// // top:-(y / Number($(".small-drawing").width()) *
// // self.newHeight),
// originX: "left",
// originY: "top"
// },
// true
// );
self.imageEditor._graphics.setImageProperties( self.imageEditor._graphics.setImageProperties(
{ {
left: left: -x,
(-(e.clientX - x) / $(".small-drawing").width()) * top: -y,
self.newHeight -
self.big_x,
top:
(-(e.clientY - y) / $(".small-drawing").width()) *
self.newHeight -
self.big_y,
originX: "left", originX: "left",
originY: "top" originY: "top"
}, },
true true
); );
let canvasImage = self.imageEditor._graphics.getCanvasImage(); // let canvasImage = self.imageEditor._graphics.getCanvasImage();
self.move_left = canvasImage.left; self.move_left = canvasImage.left;
self.move_top = canvasImage.top; self.move_top = canvasImage.top;
// //console.log(self.move_left); // console.log(self.move_left);
// //console.log(self.move_top); // console.log(self.move_top);
} }
}; };
o.onmouseup = function (e) { o.onmouseup = function (e) {
if (e.which === 1) { if (e.which === 1) {
o[p] = null; o[p] = null;
// console.log( console.log(
// "x:" + (e.clientX - x), "x:" + (e.clientX - x),
// "---- y:" + (e.clientY - y) "---- y:" + (e.clientY - y)
// ); );
// console.log( console.log(
// "x:" + "x:" +
// ((e.clientX - x) / $(".small-drawing").width()) * ((e.clientX - x) / $(".small-drawing").width()) *
// $(".body-container").width(), $(".body-container").width(),
// "---- y:" + "---- y:" +
// ((e.clientY - y) / $(".small-drawing").width()) * ((e.clientY - y) / $(".small-drawing").width()) *
// $(".body-container").width() $(".body-container").width()
// ); );
self.crop_left = Number( self.crop_left = Number(
$("#blc_small") $("#blc_small")
.css("left") .css("left")
...@@ -3851,8 +3984,8 @@ export default { ...@@ -3851,8 +3984,8 @@ export default {
.css("top") .css("top")
.substring(0, $("#blc_small").css("top").length - 2) .substring(0, $("#blc_small").css("top").length - 2)
); );
//console.log(self.crop_left); console.log(self.crop_left);
//console.log(self.crop_top); console.log(self.crop_top);
} }
}; };
}; };
...@@ -3861,14 +3994,14 @@ export default { ...@@ -3861,14 +3994,14 @@ export default {
dragable("blc_small"); dragable("blc_small");
function dragable_blc (id) { function dragable_blc (id) {
//console.log(id); console.log(id);
var d = document, var d = document,
o = d.getElementById(id), o = d.getElementById(id),
s = o.style, s = o.style,
x, x,
y, y,
p = "onmousemove"; p = "onmousemove";
//console.log(o); console.log(o);
o.onmousedown = function (e) { o.onmousedown = function (e) {
e = e || event; e = e || event;
x = e.clientX - o.offsetLeft; x = e.clientX - o.offsetLeft;
...@@ -3916,16 +4049,16 @@ export default { ...@@ -3916,16 +4049,16 @@ export default {
o.onmouseup = function (e) { o.onmouseup = function (e) {
if (e.which === 1) { if (e.which === 1) {
o[p] = null; o[p] = null;
// //console.log('x:' + (e.clientX - x), '---- y:' + (e.clientY - y)); // console.log('x:' + (e.clientX - x), '---- y:' + (e.clientY - y));
// //console.log('x:' + (e.clientX - x) / $('.body-container').width() * $('.small-drawing').width(), '---- y:' + (e.clientY - y) / $('.body-container').width() * $('.small-drawing').width()); // console.log('x:' + (e.clientX - x) / $('.body-container').width() * $('.small-drawing').width(), '---- y:' + (e.clientY - y) / $('.body-container').width() * $('.small-drawing').width());
// self.crop_left = e.clientX - x // self.crop_left = e.clientX - x
// self.crop_top = e.clientY - y // self.crop_top = e.clientY - y
//console.log( console.log(
// $("#blc_small") $("#blc_small")
// .css("left") .css("left")
// .substring(0, $("#blc_small").css("left").length - 2) .substring(0, $("#blc_small").css("left").length - 2)
// ); );
self.crop_left = Number( self.crop_left = Number(
$("#blc_small") $("#blc_small")
...@@ -3938,8 +4071,8 @@ export default { ...@@ -3938,8 +4071,8 @@ export default {
.substring(0, $("#blc_small").css("top").length - 2) .substring(0, $("#blc_small").css("top").length - 2)
); );
//console.log(self.crop_left); console.log(self.crop_left);
//console.log(self.crop_top); console.log(self.crop_top);
} }
}; };
}; };
...@@ -4123,7 +4256,7 @@ export default { ...@@ -4123,7 +4256,7 @@ export default {
distance: self.inputColorFilterRange / 255 distance: self.inputColorFilterRange / 255
}) })
.then(function (result) { .then(function (result) {
//console.log(result); console.log(result);
}); });
self.historys.push("滤色器"); self.historys.push("滤色器");
} else { } else {
...@@ -4174,7 +4307,7 @@ export default { ...@@ -4174,7 +4307,7 @@ export default {
color: self.multiplyColorpicker.getColor() color: self.multiplyColorpicker.getColor()
}) })
.then(function (result) { .then(function (result) {
//console.log(result); console.log(result);
}); });
self.historys.push("正片叠底"); self.historys.push("正片叠底");
} else { } else {
...@@ -4228,7 +4361,7 @@ export default { ...@@ -4228,7 +4361,7 @@ export default {
distance: parseInt(self.inputRemoveWhiteRange, 10) / 255 distance: parseInt(self.inputRemoveWhiteRange, 10) / 255
}) })
.then(function (result) { .then(function (result) {
//console.log(result); console.log(result);
}); });
self.historys.push("去白"); self.historys.push("去白");
} else { } else {
...@@ -4281,7 +4414,7 @@ export default { ...@@ -4281,7 +4414,7 @@ export default {
color: self.blendColorpicker.getColor() color: self.blendColorpicker.getColor()
}) })
.then(function (result) { .then(function (result) {
//console.log(result); console.log(result);
}); });
self.historys.push("差异化"); self.historys.push("差异化");
} else { } else {
...@@ -4328,7 +4461,7 @@ export default { ...@@ -4328,7 +4461,7 @@ export default {
this.isInvertActive = !this.isInvertActive; this.isInvertActive = !this.isInvertActive;
if (this.isInvertActive) { if (this.isInvertActive) {
this.imageEditor.applyFilter("Invert", null).then(function (result) { this.imageEditor.applyFilter("Invert", null).then(function (result) {
//console.log(result); console.log(result);
}); });
self.historys.push("反相"); self.historys.push("反相");
} else { } else {
...@@ -4374,7 +4507,7 @@ export default { ...@@ -4374,7 +4507,7 @@ export default {
this.isEmbossActive = !this.isEmbossActive; this.isEmbossActive = !this.isEmbossActive;
if (this.isEmbossActive) { if (this.isEmbossActive) {
this.imageEditor.applyFilter("Emboss", null).then(function (result) { this.imageEditor.applyFilter("Emboss", null).then(function (result) {
//console.log(result); console.log(result);
}); });
self.historys.push("浮雕"); self.historys.push("浮雕");
} else { } else {
...@@ -4420,7 +4553,7 @@ export default { ...@@ -4420,7 +4553,7 @@ export default {
this.isSharpenActive = !this.isSharpenActive; this.isSharpenActive = !this.isSharpenActive;
if (this.isSharpenActive) { if (this.isSharpenActive) {
this.imageEditor.applyFilter("Sharpen", null).then(function (result) { this.imageEditor.applyFilter("Sharpen", null).then(function (result) {
//console.log(result); console.log(result);
}); });
} else { } else {
this.imageEditor.removeFilter("Sharpen"); this.imageEditor.removeFilter("Sharpen");
...@@ -4499,7 +4632,7 @@ export default { ...@@ -4499,7 +4632,7 @@ export default {
this.isHorseshoeMirrorActive = !this.isHorseshoeMirrorActive; this.isHorseshoeMirrorActive = !this.isHorseshoeMirrorActive;
// if (this.isHorseshoeMirrorActive) { // if (this.isHorseshoeMirrorActive) {
// this.imageEditor.applyFilter('vintage', null).then(function (result) { // this.imageEditor.applyFilter('vintage', null).then(function (result) {
// //console.log(result); // console.log(result);
// }); // });
// } else { // } else {
// this.imageEditor.removeFilter('vintage'); // this.imageEditor.removeFilter('vintage');
...@@ -4542,7 +4675,7 @@ export default { ...@@ -4542,7 +4675,7 @@ export default {
this.isVintageActive = !this.isVintageActive; this.isVintageActive = !this.isVintageActive;
if (this.isVintageActive) { if (this.isVintageActive) {
this.imageEditor.applyFilter("vintage", null).then(function (result) { this.imageEditor.applyFilter("vintage", null).then(function (result) {
//console.log(result); console.log(result);
}); });
self.historys.push("棕褐色"); self.historys.push("棕褐色");
} else { } else {
...@@ -4588,7 +4721,7 @@ export default { ...@@ -4588,7 +4721,7 @@ export default {
this.isGrayActive = !this.isGrayActive; this.isGrayActive = !this.isGrayActive;
if (this.isGrayActive) { if (this.isGrayActive) {
this.imageEditor.applyFilter("Grayscale", null).then(function (result) { this.imageEditor.applyFilter("Grayscale", null).then(function (result) {
//console.log(result); console.log(result);
}); });
self.historys.push("灰度"); self.historys.push("灰度");
} else { } else {
...@@ -4603,23 +4736,22 @@ export default { ...@@ -4603,23 +4736,22 @@ export default {
* @return {*} * @return {*}
*/ */
goSave () { goSave () {
//console.log("保存"); console.log("保存");
}, },
/** /**
* @description: 改变选择保存类型 * @description: 改变选择保存类型
* @param {*} saveType * @param {*} saveType
* @return {*} * @return {*}
*/ */
changeSaveType (saveType) { changeSaveType () {
let self = this; let self = this;
this.saveType = saveType;
this.isShowSaveTypeOptions = false; this.isShowSaveTypeOptions = false;
if (this.saveType === "当前特征") { if (this.saveType === "当前特征") {
// 处理特征点---保存时不需要处理数据，按照摆正的位置 // 处理特征点---保存时不需要处理数据，按照摆正的位置
// 自动的 // 自动的
self.tzdall = []; self.tzdall = [];
//console.log(self.autoTzdArr); console.log(self.autoTzdArr);
if (self.autoTzdArr && self.autoTzdArr.length > 0) { if (self.autoTzdArr && self.autoTzdArr.length > 0) {
// self.tzdall.concat(self.autoTzdArr) // self.tzdall.concat(self.autoTzdArr)
self.autoTzdArr.forEach((item) => { self.autoTzdArr.forEach((item) => {
...@@ -4630,7 +4762,7 @@ export default { ...@@ -4630,7 +4762,7 @@ export default {
}); });
}); });
} }
//console.log(self.tzdArr); console.log(self.tzdArr);
// 手动的 // 手动的
if (self.tzdArr.length > 0) { if (self.tzdArr.length > 0) {
self.tzdArr.forEach((item) => { self.tzdArr.forEach((item) => {
...@@ -4645,14 +4777,26 @@ export default { ...@@ -4645,14 +4777,26 @@ export default {
// 处理数据--圆 // 处理数据--圆
let circleArr_hand_t = []; let circleArr_hand_t = [];
let circleArr_hand_t2 = []; let circleArr_hand_t2 = [];
self.circleArr_hand.forEach((item) => { if(self.circleArr_hand) {
circleArr_hand_t.push({ self.circleArr_hand.forEach((item) => {
yxtq_yxxzb: item.centerX, circleArr_hand_t.push({
yxtq_yxyzb: item.centerY, yxtq_yxxzb: item.centerX,
yxtq_yxbj: item.radius yxtq_yxyzb: item.centerY,
yxtq_yxbj: item.radius
});
}); });
}); }
//console.log("圆：" + circleArr_hand_t); if(self.autoCircleArr_hand) {
self.autoCircleArr_hand.forEach((item) => {
circleArr_hand_t.push({
yxtq_yxxzb: item.centerX,
yxtq_yxyzb: item.centerY,
yxtq_yxbj: item.radius
});
});
}
console.log("圆：" + circleArr_hand_t);
// TODO // TODO
// 处理数据---自由 // 处理数据---自由
...@@ -4672,7 +4816,21 @@ export default { ...@@ -4672,7 +4816,21 @@ export default {
Fcanvasarr_s = []; Fcanvasarr_s = [];
}); });
} }
//console.log("自由：" + Fcanvasarr_t); if (self.autoFcanvas) {
self.autoFcanvas.forEach((itemarr) => {
itemarr.forEach((item) => {
Fcanvasarr_s.push({
zdytq_tzdxzb: item.x,
zdytq_tzdyzb: item.y
});
});
Fcanvasarr_t.push({
zddxx_zyhzzbd: Fcanvasarr_s
});
Fcanvasarr_s = [];
});
}
console.log("自由：" + Fcanvasarr_t);
self.fpt5LMinutiaList = []; self.fpt5LMinutiaList = [];
// self.fpt5LMinutiaList.push(self.circleArr_hand) // self.fpt5LMinutiaList.push(self.circleArr_hand)
...@@ -4681,9 +4839,9 @@ export default { ...@@ -4681,9 +4839,9 @@ export default {
self.fpt5LMinutiaList.push(circleArr_hand_t); self.fpt5LMinutiaList.push(circleArr_hand_t);
self.fpt5LMinutiaList.push(Fcanvasarr_t); self.fpt5LMinutiaList.push(Fcanvasarr_t);
//console.log(self.fpt5LMinutiaList); console.log(self.fpt5LMinutiaList);
//console.log(self.tzdall); console.log(self.tzdall);
let fpt5TraitMinutiaList = { let fpt5TraitMinutiaList = {
minutiaSet: { minutiaSet: {
...@@ -4696,7 +4854,7 @@ export default { ...@@ -4696,7 +4854,7 @@ export default {
xczhw_xcwzbh: self.seq > 9 ? self.seq : "0" + self.seq xczhw_xcwzbh: self.seq > 9 ? self.seq : "0" + self.seq
}; };
//console.log(8888); console.log(8888);
this.$axios({ this.$axios({
method: "post", method: "post",
headers: { headers: {
...@@ -4710,39 +4868,40 @@ export default { ...@@ -4710,39 +4868,40 @@ export default {
data: JSON.stringify(fpt5TraitMinutiaList), data: JSON.stringify(fpt5TraitMinutiaList),
loading: false loading: false
}).then((res) => { }).then((res) => {
//console.log(res); console.log(res);
if (res.data.message == "success") { if (res.data.message == "success") {
self.$message.success("保存成功！"); self.$message.success("保存成功！");
// 记录session保存的个数 // 记录session保存的个数
self.sessionCount++; self.sessionCount++;
} }
}); });
} else if (this.saveType === "全部特征") { }
else if (this.saveType === "全部特征") {
let sessionArr = []; let sessionArr = [];
let allTZData = []; let allTZData = [];
//console.log("111"); console.log("111");
if (!sessionStorage.getItem(self.seq)) { if (!sessionStorage.getItem(self.seq)) {
//console.log(self.seq); console.log(self.seq);
sessionStorage.setItem(self.seq, JSON.stringify(self.preTzdArr)); sessionStorage.setItem(self.seq, JSON.stringify(self.preTzdArr));
} }
if (!sessionStorage.getItem(`auto_tzdDom${self.seq}`)) { if (!sessionStorage.getItem(`auto_tzdDom${self.seq}`)) {
//console.log(self.autopretzdall); console.log(self.autopretzdall);
sessionStorage.setItem(`auto_tzdDom${self.seq}`, JSON.stringify(self.autopretzdall) || []); sessionStorage.setItem(`auto_tzdDom${self.seq}`, JSON.stringify(self.autopretzdall) || []);
} }
if (!sessionStorage.getItem(`auto_zyhz_${self.seq}`)) { if (!sessionStorage.getItem(`auto_zyhz_${self.seq}`)) {
//console.log(self.autozyhz); console.log(self.autozyhz);
sessionStorage.setItem(`auto_zyhz_${self.seq}`, JSON.stringify(self.autozyhz) || []); sessionStorage.setItem(`auto_zyhz_${self.seq}`, JSON.stringify(self.autozyhz) || []);
} }
if (!sessionStorage.getItem(`zyhz_${self.seq}`)) { if (!sessionStorage.getItem(`zyhz_${self.seq}`)) {
//console.log(self.zyhz); console.log(self.zyhz);
sessionStorage.setItem(`zyhz_${self.seq}`, JSON.stringify(self.zyhz) || []); sessionStorage.setItem(`zyhz_${self.seq}`, JSON.stringify(self.zyhz) || []);
} }
if (!sessionStorage.getItem(`auto_yxhz_${self.seq}`)) { if (!sessionStorage.getItem(`auto_yxhz_${self.seq}`)) {
//console.log(self.autoyxhz); console.log(self.autoyxhz);
sessionStorage.setItem(`auto_yxhz_${self.seq}`, JSON.stringify(self.autoyxhz) || []); sessionStorage.setItem(`auto_yxhz_${self.seq}`, JSON.stringify(self.autoyxhz) || []);
} }
if (!sessionStorage.getItem(`yxhz_${self.seq}`)) { if (!sessionStorage.getItem(`yxhz_${self.seq}`)) {
//console.log(self.yxhz); console.log(self.yxhz);
sessionStorage.setItem(`yxhz_${self.seq}`, JSON.stringify(self.yxhz) || []); sessionStorage.setItem(`yxhz_${self.seq}`, JSON.stringify(self.yxhz) || []);
} }
...@@ -4750,14 +4909,14 @@ export default { ...@@ -4750,14 +4909,14 @@ export default {
for (var i = 0; i < sessionKeys.length; i++) { for (var i = 0; i < sessionKeys.length; i++) {
//可以对key 进行分析从而决定是否要删除sessionStorage 里的缓存 //可以对key 进行分析从而决定是否要删除sessionStorage 里的缓存
//console.log(sessionKeys[i], sessionStorage.getItem(sessionKeys[i])); console.log(sessionKeys[i], sessionStorage.getItem(sessionKeys[i]));
// 去掉auto // 去掉auto
if (sessionKeys[i][0] === "a") { if (sessionKeys[i][0] === "a") {
for (var j = 0; j < sessionKeys.length; j++) { for (var j = 0; j < sessionKeys.length; j++) {
if (sessionKeys[j] == sessionKeys[i].substring(11, sessionKeys[i].length)) { if (sessionKeys[j] == sessionKeys[i].substring(11, sessionKeys[i].length)) {
sessionArr.push(sessionStorage.getItem(sessionKeys[i])); sessionArr.push(sessionStorage.getItem(sessionKeys[i]));
//console.log(JSON.parse(sessionStorage.getItem(sessionKeys[j]))); console.log(JSON.parse(sessionStorage.getItem(sessionKeys[j])));
//console.log(JSON.parse(sessionStorage.getItem(sessionKeys[i]))); console.log(JSON.parse(sessionStorage.getItem(sessionKeys[i])));
let arr; let arr;
if (JSON.parse(sessionStorage.getItem(sessionKeys[i])) == null && JSON.parse(sessionStorage.getItem(sessionKeys[j])) != null) { if (JSON.parse(sessionStorage.getItem(sessionKeys[i])) == null && JSON.parse(sessionStorage.getItem(sessionKeys[j])) != null) {
arr = JSON.parse(sessionStorage.getItem(sessionKeys[j])); arr = JSON.parse(sessionStorage.getItem(sessionKeys[j]));
...@@ -4811,7 +4970,7 @@ export default { ...@@ -4811,7 +4970,7 @@ export default {
} }
//console.log(allTZData); console.log(allTZData);
let tjsj_zddxx_zyhz = []; let tjsj_zddxx_zyhz = [];
let tjsj_zddxx_yxhz = []; let tjsj_zddxx_yxhz = [];
allTZData.forEach(item => { allTZData.forEach(item => {
...@@ -4828,8 +4987,8 @@ export default { ...@@ -4828,8 +4987,8 @@ export default {
}); });
} }
}); });
//console.log(tjsj_zddxx_zyhz); console.log(tjsj_zddxx_zyhz);
//console.log(tjsj_zddxx_yxhz); console.log(tjsj_zddxx_yxhz);
// 处理自有绘制数据 // 处理自有绘制数据
var tjsj_zddxx_zyhz_2 = []; var tjsj_zddxx_zyhz_2 = [];
tjsj_zddxx_zyhz.forEach((item, index) => { tjsj_zddxx_zyhz.forEach((item, index) => {
...@@ -4849,7 +5008,7 @@ export default { ...@@ -4849,7 +5008,7 @@ export default {
}); });
}); });
//console.log(tjsj_zddxx_zyhz_2); console.log(tjsj_zddxx_zyhz_2);
// 处理圆形绘制数据 // 处理圆形绘制数据
var tjsj_zddxx_yxhz_2 = []; var tjsj_zddxx_yxhz_2 = [];
...@@ -4866,7 +5025,7 @@ export default { ...@@ -4866,7 +5025,7 @@ export default {
}); });
}); });
}); });
//console.log(tjsj_zddxx_yxhz_2); console.log(tjsj_zddxx_yxhz_2);
let tjsj_tzd = []; let tjsj_tzd = [];
allTZData.forEach(item => { allTZData.forEach(item => {
...@@ -4877,13 +5036,13 @@ export default { ...@@ -4877,13 +5036,13 @@ export default {
}); });
} }
}); });
//console.log(tjsj_tzd); console.log(tjsj_tzd);
tjsj_tzd.forEach(item => { tjsj_tzd.forEach(item => {
item.fpt5TraitMinutiaList.forEach(item2 => { item.fpt5TraitMinutiaList.forEach(item2 => {
delete item2.id; delete item2.id;
}); });
}); });
//console.log(tjsj_tzd); console.log(tjsj_tzd);
let tjsj_zddxx_zyhz_length = tjsj_zddxx_zyhz.length; let tjsj_zddxx_zyhz_length = tjsj_zddxx_zyhz.length;
let tjsj_zddxx_yxhz_length = tjsj_zddxx_yxhz.length; let tjsj_zddxx_yxhz_length = tjsj_zddxx_yxhz.length;
...@@ -4980,7 +5139,7 @@ export default { ...@@ -4980,7 +5139,7 @@ export default {
}); });
} }
//console.log(all_tjsj); console.log(all_tjsj);
tjsj_zddxx_zyhz = []; tjsj_zddxx_zyhz = [];
...@@ -4996,16 +5155,17 @@ export default { ...@@ -4996,16 +5155,17 @@ export default {
url: "/api/upload/trait/allperson?barcode=" + self.barcode, url: "/api/upload/trait/allperson?barcode=" + self.barcode,
data: JSON.stringify(all_tjsj) data: JSON.stringify(all_tjsj)
}).then(res => { }).then(res => {
//console.log(res); console.log(res);
// 计算session的个数 // 计算session的个数
self.sessionCount = self.sessionCount + Number(sessionArr.length); self.sessionCount = self.sessionCount + Number(sessionArr.length);
}); });
// //console.log(allTZData); // console.log(allTZData);
} else if (this.saveType === "当前特征和图片") { }
else if (this.saveType === "当前特征和图片") {
// 处理特征点---保存前需要处理数据 // 处理特征点---保存前需要处理数据
// 自动的 // 自动的
self.tzdall = []; self.tzdall = [];
//console.log(self.autoTzdArr); console.log(self.autoTzdArr);
if (self.autoTzdArr && self.autoTzdArr.length > 0) { if (self.autoTzdArr && self.autoTzdArr.length > 0) {
// self.tzdall.concat(self.autoTzdArr) // self.tzdall.concat(self.autoTzdArr)
self.autoTzdArr.forEach((item) => { self.autoTzdArr.forEach((item) => {
...@@ -5016,7 +5176,7 @@ export default { ...@@ -5016,7 +5176,7 @@ export default {
}); });
}); });
} }
//console.log(self.tzdArr); console.log(self.tzdArr);
// 手动的 // 手动的
if (self.tzdArr.length > 0) { if (self.tzdArr.length > 0) {
self.tzdArr.forEach((item) => { self.tzdArr.forEach((item) => {
...@@ -5032,7 +5192,7 @@ export default { ...@@ -5032,7 +5192,7 @@ export default {
// 获取 tzdDrawing 旋转的角度 // 获取 tzdDrawing 旋转的角度
let canvasImage = self.imageEditor._graphics.getCanvasImage(); let canvasImage = self.imageEditor._graphics.getCanvasImage();
let tzdDrawing_angle = canvasImage.angle; let tzdDrawing_angle = canvasImage.angle;
//console.log(tzdDrawing_angle); console.log(tzdDrawing_angle);
self.tzdall.forEach((item) => { self.tzdall.forEach((item) => {
let src = { let src = {
x: item.xczw_zwtzd_tzxzb, x: item.xczw_zwtzd_tzxzb,
...@@ -5047,7 +5207,7 @@ export default { ...@@ -5047,7 +5207,7 @@ export default {
// 角度超出360°范围了 // 角度超出360°范围了
const angle = tzdDrawing_angle * Math.PI / 180.00; const angle = tzdDrawing_angle * Math.PI / 180.00;
//console.log(angle); console.log(angle);
// 角度 * Math.PI / 180 // 角度 * Math.PI / 180
const [x, y] = reverse( const [x, y] = reverse(
point.x, point.x,
...@@ -5056,7 +5216,7 @@ export default { ...@@ -5056,7 +5216,7 @@ export default {
det.y, det.y,
-angle -angle
); );
//console.log(x, y); console.log(x, y);
self.tzdall2.push({ self.tzdall2.push({
xczw_zwtzd_tzfx: item.xczw_zwtzd_tzfx + tzdDrawing_angle, xczw_zwtzd_tzfx: item.xczw_zwtzd_tzfx + tzdDrawing_angle,
xczw_zwtzd_tzxzb: x, xczw_zwtzd_tzxzb: x,
...@@ -5065,17 +5225,29 @@ export default { ...@@ -5065,17 +5225,29 @@ export default {
}); });
// 处理数据--圆 -- 存入数据库前需要多圆心坐标点处理 // 处理数据--圆 -- 存入数据库前需要多圆心坐标点处理
//console.log(self.circleArr_hand); console.log(self.circleArr_hand);
let circleArr_hand_t = []; let circleArr_hand_t = [];
let circleArr_hand_t2 = []; let circleArr_hand_t2 = [];
self.circleArr_hand.forEach((item) => { if(self.circleArr_hand) {
circleArr_hand_t.push({ self.circleArr_hand.forEach((item) => {
yxtq_yxxzb: item.centerX, circleArr_hand_t.push({
yxtq_yxyzb: item.centerY, yxtq_yxxzb: item.centerX,
yxtq_yxbj: item.radius yxtq_yxyzb: item.centerY,
yxtq_yxbj: item.radius
});
}); });
}); }
//console.log(circleArr_hand_t);
if(self.autoCircleArr_hand) {
self.autoCircleArr_hand.forEach((item) => {
circleArr_hand_t.push({
yxtq_yxxzb: item.centerX,
yxtq_yxyzb: item.centerY,
yxtq_yxbj: item.radius
});
});
}
console.log(circleArr_hand_t);
// 处理圆形绘制的数据 // 处理圆形绘制的数据
circleArr_hand_t.forEach((item) => { circleArr_hand_t.forEach((item) => {
let src = { let src = {
...@@ -5096,7 +5268,7 @@ export default { ...@@ -5096,7 +5268,7 @@ export default {
det.y, det.y,
-angle -angle
); );
//console.log(x, y); console.log(x, y);
circleArr_hand_t2.push({ circleArr_hand_t2.push({
yxtq_yxxzb: x, yxtq_yxxzb: x,
yxtq_yxyzb: y, yxtq_yxyzb: y,
...@@ -5108,7 +5280,8 @@ export default { ...@@ -5108,7 +5280,8 @@ export default {
let Fcanvasarr_s = []; let Fcanvasarr_s = [];
let Fcanvasarr_t = []; let Fcanvasarr_t = [];
let Fcanvasarr_t2 = []; let Fcanvasarr_t2 = [];
//console.log(self.Fcanvasarr); console.log(self.Fcanvasarr);
console.log(self.autoFcanvas);
if (self.Fcanvasarr) { if (self.Fcanvasarr) {
self.Fcanvasarr.forEach((itemarr) => { self.Fcanvasarr.forEach((itemarr) => {
itemarr.forEach((item) => { itemarr.forEach((item) => {
...@@ -5130,14 +5303,14 @@ export default { ...@@ -5130,14 +5303,14 @@ export default {
zdytq_tzdxzb: item.x, zdytq_tzdxzb: item.x,
zdytq_tzdyzb: item.y zdytq_tzdyzb: item.y
}); });
Fcanvasarr_t.push({
zddxx_zyhzzbd: Fcanvasarr_s
});
Fcanvasarr_s = [];
}); });
Fcanvasarr_t.push({
zddxx_zyhzzbd: Fcanvasarr_s
});
Fcanvasarr_s = [];
}); });
} }
//console.log("自由：" + Fcanvasarr_t); console.log("自由：" + Fcanvasarr_t);
// 处理自由绘制的坐标转换 // 处理自由绘制的坐标转换
Fcanvasarr_t.forEach((itemarr) => { Fcanvasarr_t.forEach((itemarr) => {
itemarr.zddxx_zyhzzbd.forEach((item) => { itemarr.zddxx_zyhzzbd.forEach((item) => {
...@@ -5169,7 +5342,7 @@ export default { ...@@ -5169,7 +5342,7 @@ export default {
}); });
Fcanvasarr_s = []; Fcanvasarr_s = [];
}) })
//console.log(Fcanvasarr_t2); console.log(Fcanvasarr_t2);
self.fpt5LMinutiaList = []; self.fpt5LMinutiaList = [];
// self.fpt5LMinutiaList.push(self.circleArr_hand) // self.fpt5LMinutiaList.push(self.circleArr_hand)
...@@ -5178,9 +5351,9 @@ export default { ...@@ -5178,9 +5351,9 @@ export default {
self.fpt5LMinutiaList.push(circleArr_hand_t2); self.fpt5LMinutiaList.push(circleArr_hand_t2);
self.fpt5LMinutiaList.push(Fcanvasarr_t); self.fpt5LMinutiaList.push(Fcanvasarr_t);
//console.log(self.fpt5LMinutiaList); console.log(self.fpt5LMinutiaList);
//console.log(self.tzdall2); console.log(self.tzdall2);
let fpt5TraitMinutiaList = { let fpt5TraitMinutiaList = {
minutiaSet: { minutiaSet: {
...@@ -5193,7 +5366,7 @@ export default { ...@@ -5193,7 +5366,7 @@ export default {
xczhw_xcwzbh: self.seq > 9 ? self.seq : "0" + self.seq xczhw_xcwzbh: self.seq > 9 ? self.seq : "0" + self.seq
}; };
//console.log(8888); console.log(8888);
this.$axios({ this.$axios({
method: "post", method: "post",
headers: { headers: {
...@@ -5207,7 +5380,7 @@ export default { ...@@ -5207,7 +5380,7 @@ export default {
data: JSON.stringify(fpt5TraitMinutiaList), data: JSON.stringify(fpt5TraitMinutiaList),
loading: false loading: false
}).then((res) => { }).then((res) => {
//console.log(res); console.log(res);
if (res.data.message == "success") { if (res.data.message == "success") {
self.$message.success("特征保存成功！"); self.$message.success("特征保存成功！");
// 记录session保存的个数 // 记录session保存的个数
...@@ -5231,7 +5404,7 @@ export default { ...@@ -5231,7 +5404,7 @@ export default {
} }
}); });
tj_lr_finger = lr_finger.join(","); tj_lr_finger = lr_finger.join(",");
//console.log(tj_lr_finger); console.log(tj_lr_finger);
// ================================================ // ================================================
// canvas图片自处理 --- 后端压缩需要将透明的补成白色背景 // canvas图片自处理 --- 后端压缩需要将透明的补成白色背景
/*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas'); /*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
...@@ -5248,25 +5421,25 @@ export default { ...@@ -5248,25 +5421,25 @@ export default {
} }
context.putImageData(imageData, 0, 0);*/ context.putImageData(imageData, 0, 0);*/
// ================================================ // ================================================
// //console.log(self.imageEditor.toDataURL('image/bmp').split(",")[1]); // console.log(self.imageEditor.toDataURL('image/bmp').split(",")[1]);
// 图片接口传入 // 图片接口传入
// data: JSON.stringify(self.imageEditor.toDataURL().split(",")[1]) // data: JSON.stringify(self.imageEditor.toDataURL().split(",")[1])
/*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas'); /*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
// //console.log(Canvas2Image); // console.log(Canvas2Image);
let bmpSrc = Canvas2Image.convertToBMP(canvas_imgSave, 512, 512) let bmpSrc = Canvas2Image.convertToBMP(canvas_imgSave, 512, 512)
Canvas2Image.saveAsBMP(canvas_imgSave, 512, 512) Canvas2Image.saveAsBMP(canvas_imgSave, 512, 512)
// //console.log(bmpSrc); // console.log(bmpSrc);
let datasrc = bmpSrc.src let datasrc = bmpSrc.src
// //console.log(src); // console.log(src);
let sendSrc = datasrc.split(',')[1] let sendSrc = datasrc.split(',')[1]
//console.log(sendSrc);*/ console.log(sendSrc);*/
// 转8位bmp格式图片 // 转8位bmp格式图片
/*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas'); /*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
const grey = new Bmp(Bmp.GREY, canvas_imgSave); const grey = new Bmp(Bmp.GREY, canvas_imgSave);
//console.log(typeof grey.getBase64()); console.log(typeof grey.getBase64());
let tj_grey = grey.getBase64().split(',')[1] let tj_grey = grey.getBase64().split(',')[1]
//console.log(tj_grey);*/ console.log(tj_grey);*/
// 获取图像旋转的角度 // 获取图像旋转的角度
let canvasImage_angle = self.imageEditor._graphics.getCanvasImage().angle; let canvasImage_angle = self.imageEditor._graphics.getCanvasImage().angle;
...@@ -5275,7 +5448,7 @@ export default { ...@@ -5275,7 +5448,7 @@ export default {
method: "post", method: "post",
url: `/api/upload/trait/case/image?angle=${canvasImage_angle}&barcode=${self.barcode}&hpseqno=${self.seq}&fingerPosition=${tj_lr_finger}` url: `/api/upload/trait/case/image?angle=${canvasImage_angle}&barcode=${self.barcode}&hpseqno=${self.seq}&fingerPosition=${tj_lr_finger}`
}).then((res) => { }).then((res) => {
//console.log(res); console.log(res);
if (res.data.code === 0) { if (res.data.code === 0) {
self.$message.success("图片保存成功！"); self.$message.success("图片保存成功！");
} else { } else {
...@@ -5330,9 +5503,9 @@ export default { ...@@ -5330,9 +5503,9 @@ export default {
*/ */
zyhzOptionsChange () { zyhzOptionsChange () {
this.isHandTZD = false; this.isHandTZD = false;
//console.log(1); console.log(1);
this.isShowzyhzOptions = !this.isShowzyhzOptions; this.isShowzyhzOptions = !this.isShowzyhzOptions;
//console.log(this.isShowzyhzOptions); console.log(this.isShowzyhzOptions);
}, },
/** /**
* @description: 放大 * @description: 放大
...@@ -5477,7 +5650,7 @@ export default { ...@@ -5477,7 +5650,7 @@ export default {
this.isHistoryOptions = false; this.isHistoryOptions = false;
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
//console.log("放大"); console.log("放大");
this.isEnlarge = !this.isEnlarge; this.isEnlarge = !this.isEnlarge;
if (this.isEnlarge) { if (this.isEnlarge) {
$(".enlarge").css("background", "#055FE7"); $(".enlarge").css("background", "#055FE7");
...@@ -5677,7 +5850,7 @@ export default { ...@@ -5677,7 +5850,7 @@ export default {
// 转换canvas为base64图片贴到缩略图中 // 转换canvas为base64图片贴到缩略图中
setTimeout(() => { setTimeout(() => {
let dataURL = this.imageEditor.toDataURL(); let dataURL = this.imageEditor.toDataURL();
//console.log(dataURL); console.log(dataURL);
this.previewSource = dataURL; this.previewSource = dataURL;
}, 200); }, 200);
} }
...@@ -5825,8 +5998,8 @@ export default { ...@@ -5825,8 +5998,8 @@ export default {
this.isHistoryOptions = false; this.isHistoryOptions = false;
// 是否点击了历史 // 是否点击了历史
this.isActive_history = false; this.isActive_history = false;
//console.log(this.imageEditor); console.log(this.imageEditor);
//console.log(555); console.log(555);
this.imageEditor.stopDrawingMode(); this.imageEditor.stopDrawingMode();
this.isHand = !this.isHand; this.isHand = !this.isHand;
if (this.isHand) { if (this.isHand) {
...@@ -5875,7 +6048,7 @@ export default { ...@@ -5875,7 +6048,7 @@ export default {
contrast: parseInt(newValue, 10) / 255 contrast: parseInt(newValue, 10) / 255
}) })
.then(function (result) { .then(function (result) {
//console.log(result); console.log(result);
}); });
}, },
inputRotationRange (newValue, oldValue) { inputRotationRange (newValue, oldValue) {
...@@ -5898,7 +6071,7 @@ export default { ...@@ -5898,7 +6071,7 @@ export default {
); );
} }
if (self.isTpdr_flag) { if (self.isTpdr_flag) {
$(".small-drawing-img").css("transform", `rotate(${deg}deg)`); $(".small-drawing-img").css("transform", `rotate(${newValue}deg)`);
} }
// 特征点的图层也要跟着转 // 特征点的图层也要跟着转
$(".tzdDrawing").css("transform", `rotate(${newValue}deg)`); $(".tzdDrawing").css("transform", `rotate(${newValue}deg)`);
...@@ -5910,7 +6083,7 @@ export default { ...@@ -5910,7 +6083,7 @@ export default {
distance: parseInt(newValue, 10) / 255 distance: parseInt(newValue, 10) / 255
}) })
.then(function (result) { .then(function (result) {
//console.log(result); console.log(result);
}); });
}, },
inputColorFilterRange (newValue, oldValue) { inputColorFilterRange (newValue, oldValue) {
...@@ -5919,7 +6092,7 @@ export default { ...@@ -5919,7 +6092,7 @@ export default {
distance: parseInt(newValue, 10) / 255 distance: parseInt(newValue, 10) / 255
}) })
.then(function (result) { .then(function (result) {
//console.log(result); console.log(result);
}); });
}, },
inputBrightnessRange (newValue, oldValue) { inputBrightnessRange (newValue, oldValue) {
...@@ -5928,21 +6101,21 @@ export default { ...@@ -5928,21 +6101,21 @@ export default {
brightness: parseInt(newValue, 10) / 255 brightness: parseInt(newValue, 10) / 255
}) })
.then(function (result) { .then(function (result) {
//console.log(result); console.log(result);
}); });
}, },
isEnlarge (newValue, oldValue) { isEnlarge (newValue, oldValue) {
if (newValue) { if (newValue) {
} else { } else {
$(".tui-image-editor").unbind("mousemove", function (e) { $(".tui-image-editor").unbind("mousemove", function (e) {
//console.log(111); console.log(111);
}); });
} }
}, },
isHideSubline (newValue, oldValue) { isHideSubline (newValue, oldValue) {
let self = this; let self = this;
if (newValue) { if (newValue) {
//console.log(this.lines); console.log(this.lines);
this.lines.forEach((item) => { this.lines.forEach((item) => {
setTimeout(() => { setTimeout(() => {
self.imageEditor.setObjectPosition(item.id, { self.imageEditor.setObjectPosition(item.id, {
...@@ -5954,7 +6127,7 @@ export default { ...@@ -5954,7 +6127,7 @@ export default {
}, 500); }, 500);
}); });
} else { } else {
//console.log(this.lines); console.log(this.lines);
this.lines.forEach((item) => { this.lines.forEach((item) => {
setTimeout(() => { setTimeout(() => {
if ( if (
...@@ -6033,13 +6206,13 @@ export default { ...@@ -6033,13 +6206,13 @@ export default {
var sessionKeys = Object.keys(sessionStorage); var sessionKeys = Object.keys(sessionStorage);
for (var i = 0; i < sessionKeys.length; i++) { for (var i = 0; i < sessionKeys.length; i++) {
//可以对key 进行分析从而决定是否要删除sessionStorage 里的缓存 //可以对key 进行分析从而决定是否要删除sessionStorage 里的缓存
//console.log(sessionKeys[i], sessionStorage.getItem(sessionKeys[i])); console.log(sessionKeys[i], sessionStorage.getItem(sessionKeys[i]));
if (sessionKeys[i].substring(0, 11) == "auto_tzdDom") { if (sessionKeys[i].substring(0, 11) == "auto_tzdDom") {
sessionArr.push(sessionStorage.getItem(sessionKeys[i])); sessionArr.push(sessionStorage.getItem(sessionKeys[i]));
} }
} }
//console.log(sessionArr); console.log(sessionArr);
//console.log(this.sessionCount); console.log(this.sessionCount);
if (sessionArr.length == this.sessionCount) { if (sessionArr.length == this.sessionCount) {
return; return;
} else { } else {
......
src/views/Editor/modules/rydaxx.scss
...@@ -98,6 +98,37 @@ ...@@ -98,6 +98,37 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 24px; 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 { /deep/ .el-form-item__label {
...@@ -218,7 +249,7 @@ ...@@ -218,7 +249,7 @@
width: 100%; width: 100%;
margin-left: 0 !important; margin-left: 0 !important;
display: flex; display: flex;
align-items: center; //align-items: center;
margin-right: 24px; margin-right: 24px;
} }
/deep/.el-checkbox { /deep/.el-checkbox {
...@@ -228,6 +259,7 @@ ...@@ -228,6 +259,7 @@
/deep/ .el-checkbox-group { /deep/ .el-checkbox-group {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap;
} }
.fk { .fk {
...@@ -381,3 +413,9 @@ ...@@ -381,3 +413,9 @@
border-color: #055fe7; border-color: #055fe7;
} }
} }
.ajdaxx-drawer {
.content {
height: 1400px;
}
}
src/views/Editor/modules/rydaxx.vue
...@@ -34,10 +34,14 @@ ...@@ -34,10 +34,14 @@
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item label="采集信息原因：" prop="cjxxyy"> <el-form-item label="采集信息原因：" prop="cjxxyy">
<el-select v-model="ruleForm.cjxxyy" placeholder="根据代码自动匹配"> <SelectCode
<el-option label="区域一" value="shanghai"></el-option> codeUrl="cjxxyydm"
<el-option label="区域二" value="beijing"></el-option> width="16.5"
</el-select> :clearable="true"
:multiple="false"
:form="ruleForm"
id="cjxxyy"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item label="指掌纹卡编号：" prop="zzwkbh"> <el-form-item label="指掌纹卡编号：" prop="zzwkbh">
<el-input placeholder="请输入指掌纹卡编号" v-model="ruleForm.zzwkbh" maxlength="23" show-word-limit></el-input> <el-input placeholder="请输入指掌纹卡编号" v-model="ruleForm.zzwkbh" maxlength="23" show-word-limit></el-input>
...@@ -65,12 +69,15 @@ ...@@ -65,12 +69,15 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item label="性别：" prop="cjxxyy"> <el-form-item label="性别：" prop="xbdm">
<el-select v-model="ruleForm.xbdm" placeholder="请选择性别"> <SelectCode
<el-option label="男" value="1"></el-option> codeUrl="sex"
<el-option label="女" value="2"></el-option> width="16.5"
<el-option label="未知" value="3"></el-option> :clearable="true"
</el-select> :multiple="false"
:form="ruleForm"
id="xbdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item label="出生日期：" prop="csrq"> <el-form-item label="出生日期：" prop="csrq">
<el-date-picker type="date" placeholder="请输入出生日期" v-model="ruleForm.csrq"></el-date-picker> <el-date-picker type="date" placeholder="请输入出生日期" v-model="ruleForm.csrq"></el-date-picker>
...@@ -78,21 +85,45 @@ ...@@ -78,21 +85,45 @@
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item label="国籍：" prop="gjdm"> <el-form-item label="国籍：" prop="gjdm">
<el-select v-model="ruleForm.gjdm" placeholder="请输入国籍"> <!-- <el-select v-model="ruleForm.gjdm" placeholder="请输入国籍">-->
<el-option label="中国" value="中国"></el-option> <!-- <el-option label="中国" value="中国"></el-option>-->
</el-select> <!-- </el-select>-->
<SelectCode
codeUrl="nationality"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="gjdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item label="民族：" prop="mzdm"> <el-form-item label="民族：" prop="mzdm">
<el-select v-model="ruleForm.mzdm" placeholder="请选择民族类型"> <!-- <el-select v-model="ruleForm.mzdm" placeholder="请选择民族类型">-->
<el-option label="汉" value="汉"></el-option> <!-- <el-option label="汉" value="汉"></el-option>-->
</el-select> <!-- </el-select>-->
<SelectCode
codeUrl="nation"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="mzdm"
></SelectCode>
</el-form-item> </el-form-item>
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item label="证件类型：" prop="cyzjdm" class="select"> <el-form-item label="证件类型：" prop="cyzjdm" class="select">
<el-select v-model="ruleForm.cyzjdm" placeholder="请选择证件类型"> <!-- <el-select v-model="ruleForm.cyzjdm" placeholder="请选择证件类型">-->
<el-option label="中国" value="中国"></el-option> <!-- <el-option label="中国" value="中国"></el-option>-->
</el-select> <!-- </el-select>-->
<SelectCode
codeUrl="certificates"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="cyzjdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item label="证件号码：" prop="zjhm" class="input2"> <el-form-item label="证件号码：" prop="zjhm" class="input2">
<el-input placeholder="请输入证件号码" v-model="ruleForm.zjhm"></el-input> <el-input placeholder="请输入证件号码" v-model="ruleForm.zjhm"></el-input>
...@@ -100,9 +131,17 @@ ...@@ -100,9 +131,17 @@
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item label="户籍地行政区：" prop="hjdzXzqhdm" class="select"> <el-form-item label="户籍地行政区：" prop="hjdzXzqhdm" class="select">
<el-select v-model="ruleForm.hjdzXzqhdm" placeholder="请输入户籍地行政区"> <!-- <el-select v-model="ruleForm.hjdzXzqhdm" placeholder="请输入户籍地行政区">-->
<el-option label="中国" value="中国"></el-option> <!-- <el-option label="中国" value="中国"></el-option>-->
</el-select> <!-- </el-select>-->
<SelectCode
codeUrl="administrative"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="hjdzXzqhdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item label="户籍地址：" prop="hjdzDzmc" class="input2"> <el-form-item label="户籍地址：" prop="hjdzDzmc" class="input2">
<el-input placeholder="请输入户籍地址" v-model="ruleForm.hjdzDzmc"></el-input> <el-input placeholder="请输入户籍地址" v-model="ruleForm.hjdzDzmc"></el-input>
...@@ -110,9 +149,14 @@ ...@@ -110,9 +149,14 @@
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item label="现住址行政区：" prop="xzzXzqhdm" class="select"> <el-form-item label="现住址行政区：" prop="xzzXzqhdm" class="select">
<el-select v-model="ruleForm.xzzXzqhdm" placeholder="请输入现住址行政区"> <SelectCode
<el-option label="中国" value="中国"></el-option> codeUrl="administrative"
</el-select> width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="xzzXzqhdm"
></SelectCode>
</el-form-item> </el-form-item>
<el-form-item label="现地址：" prop="xzzDzmc" class="input2"> <el-form-item label="现地址：" prop="xzzDzmc" class="input2">
<el-input placeholder="请输入现住址" v-model="ruleForm.xzzDzmc"></el-input> <el-input placeholder="请输入现住址" v-model="ruleForm.xzzDzmc"></el-input>
...@@ -145,8 +189,8 @@ ...@@ -145,8 +189,8 @@
<div class="ayzzwjbxx-items"> <div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item label="捺印单位：" prop="unitCode"> <el-form-item label="捺印单位：" prop="unitCode">
<el-input placeholder="请输入捺印单位名称" v-model="ruleForm.unitCode"></el-input> <!-- <el-input placeholder="请输入捺印单位名称" v-model="ruleForm.unitCode"></el-input>-->
<!-- <Cascader :form="ruleForm" id="unitCode"></Cascader>--> <Cascader :form="ruleForm" id="unitCode"></Cascader>
</el-form-item> </el-form-item>
<el-form-item label="捺印人姓名：" prop="nyryXm"> <el-form-item label="捺印人姓名：" prop="nyryXm">
<el-input placeholder="请输入捺印人姓名" v-model="ruleForm.nyryXm"></el-input> <el-input placeholder="请输入捺印人姓名" v-model="ruleForm.nyryXm"></el-input>
...@@ -225,6 +269,7 @@ ...@@ -225,6 +269,7 @@
</template> </template>
<script> <script>
import SelectCode from "../../../components/SelectCode.vue";
import Cascader from "@/components/Cascader.vue"; import Cascader from "@/components/Cascader.vue";
import {mapState} from "vuex"; import {mapState} from "vuex";
import dcftpx from "../../AllPersonnelBase/modules/dcftpx.vue"; import dcftpx from "../../AllPersonnelBase/modules/dcftpx.vue";
...@@ -440,7 +485,7 @@ export default { ...@@ -440,7 +485,7 @@ export default {
// let ryljfk = this.ryInfo.logicdbtype.split('') // let ryljfk = this.ryInfo.logicdbtype.split('')
// this.ruleForm.logicdbtype = ryljfk // this.ruleForm.logicdbtype = ryljfk
this.ruleForm.logicdbtype = this.ryInfo.logicdbtype 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.nyryXm = this.ryInfo.nyryXm
this.ruleForm.nysj = this.ryInfo.nysj this.ruleForm.nysj = this.ryInfo.nysj
this.ruleForm.nyryGmsfhm = this.ryInfo.nyryGmsfhm this.ruleForm.nyryGmsfhm = this.ryInfo.nyryGmsfhm
...@@ -492,6 +537,7 @@ export default { ...@@ -492,6 +537,7 @@ export default {
} }
}, },
components: { components: {
SelectCode,
Cascader, Cascader,
dcftpx dcftpx
} }
......
src/views/Home.vue
...@@ -606,6 +606,7 @@ export default { ...@@ -606,6 +606,7 @@ export default {
cursor: pointer; cursor: pointer;
display: flex; display: flex;
img { img {
cursor: pointer;
object-fit: contain; object-fit: contain;
} }
} }
...@@ -698,6 +699,7 @@ export default { ...@@ -698,6 +699,7 @@ export default {
align-items: center; align-items: center;
margin-left: 25px; margin-left: 25px;
.icon { .icon {
cursor: pointer;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
......
src/views/login/Login1.vue
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
mounted() { mounted() {
this.loginType.accountStatus = true; this.loginType.accountStatus = true;
if (localStorage.getItem("token") !== null) { if (localStorage.getItem("token") !== null) {
this.$router.push("/Home/Home"); this.$router.push("/gateway");
} }
this.initVideo(); this.initVideo();
// todo 初始登录 帐号密码登录选中状态 // todo 初始登录 帐号密码登录选中状态
......
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