瀏覽代碼

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

28169 1 年之前
父節點
當前提交
6f74444684

+ 2 - 2
src/xt_pages/outpatientCharges/listPrint.vue 查看文件

@@ -14,11 +14,11 @@
14 14
     </template>
15 15
 
16 16
     <div class='dialysisPage' style="padding-top:40px;">
17
-      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id!=0 " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
17
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485  " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
18 18
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
19 19
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
20 20
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
21
-     <list-print-three v-if="org_id == 10215 || org_id==9675 || org_id == 0 || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
21
+     <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
22 22
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
23 23
     </div>
24 24
   </div>

+ 1 - 1
src/xt_pages/outpatientCharges/settlementTemplate/printOne.vue 查看文件

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
     <div id="prescription-print" class="print_page_main_content">
3
-        <div class="title">广东省社会医疗保障基金结算清单</div>
3
+        <div class="title" v-if="">广东省社会医疗保障基金结算清单</div>
4 4
         <div style="text-align:right;">清单流水号 <div style="width:120px;" class="under_line">{{ info.mdtrt_id }}</div></div>
5 5
         <div class="row">
6 6
             <div>定点医疗机构名称<div style="width:120px;" class="under_line">{{info.fixmedins_name}}</div></div>

+ 4 - 0
src/xt_pages/outpatientCharges/statementPrint.vue 查看文件

@@ -486,6 +486,8 @@ export default {
486 486
           obj['count'] = details[a].cnt
487 487
           obj['price'] = parseFloat(details[a].pric)
488 488
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
489
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
490
+
489 491
           list.push(obj)
490 492
         }
491 493
 
@@ -497,6 +499,7 @@ export default {
497 499
           obj['spec'] = ""
498 500
           obj['count'] = details[a].cnt
499 501
           obj['price'] = parseFloat(details[a].pric)
502
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
500 503
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
501 504
           list.push(obj)
502 505
         }
@@ -509,6 +512,7 @@ export default {
509 512
           obj['spec'] = details[a].project.good_info.specification_name
510 513
           obj['count'] = details[a].cnt
511 514
           obj['price'] = parseFloat(details[a].pric)
515
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
512 516
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
513 517
           list.push(obj)
514 518
         }

+ 3 - 2
src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue 查看文件

@@ -65,6 +65,8 @@
65 65
           <td width="8.1%">单价</td>
66 66
           <td width="8.1%">金额</td>
67 67
           <td width="10.1%">医保标识</td>
68
+          <td width="10.1%">自付金额</td>
69
+
68 70
         </tr>
69 71
         <!-- width="72.6%"  16.82%  16.1-->
70 72
         <tr>
@@ -85,6 +87,7 @@
85 87
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
86 88
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
87 89
                 <div style="width: 10.1%;padding: 5px;"></div>
90
+                <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>
88 91
               </div>
89 92
             </div>
90 93
           </td>
@@ -198,8 +201,6 @@ export default {
198 201
 .statementTable {
199 202
   width: 100%;
200 203
   font-size: 14px;
201
-  // word-wrap: break-word;
202
-  // word-break: break-all;
203 204
   table tr td{
204 205
     padding: 5px;
205 206
     line-height: 30px;

+ 37 - 5
src/xt_pages/outpatientCharges/summary.vue 查看文件

@@ -124,10 +124,10 @@
124 124
           <!--          </el-button-->
125 125
           <!--          >-->
126 126
 
127
-<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
127
+           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
128 128
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
129 129
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
130
-<!--           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
130
+           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>
131 131
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
132 132
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
133 133
 
@@ -1280,7 +1280,7 @@ export default {
1280 1280
                 name: order.patient.name,
1281 1281
                 id_card_no: order.patient.id_card_no,
1282 1282
                 year: "2023",
1283
-                month: "07",
1283
+                month: "08",
1284 1284
                 code: data[b].code,
1285 1285
                 pric: data[b].total ,
1286 1286
                 item_name: data[b].name,
@@ -1672,7 +1672,7 @@ export default {
1672 1672
           var tarList = []
1673 1673
           for (let i = 0; i < list.length; i++) {
1674 1674
             let obj = {
1675
-              "周期": "2023年第二季度",
1675
+              "周期": "2022年第二季度",
1676 1676
               "类别": "门诊",
1677 1677
               "医保目录编码": list[i].code,
1678 1678
               "医保目录名称": list[i].name,
@@ -2413,36 +2413,69 @@ export default {
2413 2413
         case '01':
2414 2414
           return '床位费'
2415 2415
           break
2416
+        case '1':
2417
+          return '床位费'
2418
+          break
2416 2419
         case '02':
2417 2420
           return '诊察费'
2418 2421
 
2422
+          break
2423
+        case '2':
2424
+          return '诊察费'
2419 2425
           break
2420 2426
         case '03':
2421 2427
           return '检查费'
2422 2428
 
2429
+          break
2430
+        case '3':
2431
+          return '检查费'
2432
+
2423 2433
           break
2424 2434
         case '04':
2425 2435
           return '化验费'
2426 2436
           break
2437
+        case '4':
2438
+          return '化验费'
2439
+          break
2427 2440
         case '05':
2428 2441
           return '治疗费'
2429 2442
 
2443
+          break
2444
+        case '5':
2445
+          return '治疗费'
2446
+
2430 2447
           break
2431 2448
         case '06':
2432 2449
           return '手术费'
2433 2450
 
2451
+          break
2452
+        case '6':
2453
+          return '手术费'
2454
+
2434 2455
           break
2435 2456
         case '07':
2436 2457
           return '护理费'
2437 2458
 
2459
+          break
2460
+        case '7':
2461
+          return '护理费'
2462
+
2438 2463
           break
2439 2464
         case '08':
2440 2465
           return '材料费'
2441 2466
 
2467
+          break
2468
+        case '8':
2469
+          return '材料费'
2470
+
2442 2471
           break
2443 2472
         case '09':
2444 2473
           return '西药费'
2445 2474
 
2475
+          break
2476
+        case '9':
2477
+          return '西药费'
2478
+
2446 2479
           break
2447 2480
         case '10':
2448 2481
           return '中药饮片费'
@@ -2465,7 +2498,6 @@ export default {
2465 2498
         case '0':
2466 2499
           return '其他费'
2467 2500
           break
2468
-
2469 2501
       }
2470 2502
 
2471 2503
     },

+ 66 - 115
src/xt_pages/user/Sitemap.vue 查看文件

@@ -19,38 +19,32 @@
19 19
       </div>
20 20
       <div style="margin-top:6px;display:flex;flex-wrap: wrap;position:relative;min-height:480px;">
21 21
         <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" ref="imageWrapper">
22
-          <div id="point_mark_img_wrap1" class="print_main_content" style="width: 100%;padding: 0;border: 0;" >
23
-            <!-- <template>
24
-              <div>
25
-                <quill-editor v-model="content" ref="myQuillEditor" :options="editorOption">
26
-                  
27
-                </quill-editor>
28
-              </div>
29
-            </template> -->
30
-            <!-- 背景大图  v-if="fileList.length==0"-->
22
+          <div id="point_mark_img_wrap1" class="print_main_content" style="width: 520px;padding: 0;border: 0;" >
23
+
31 24
             <img v-if="fileList.length==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
32 25
             <img v-if="fileList.length>0" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
33 26
 
34 27
             <!-- A端/V端 v-if="a_num==2" -->
35 28
             <div v-for="(item,index) in A_arr" :key="index">
36
-              <div v-if="a_num==2" title="长按右键调整线条角度" class="mark-target mark-target-a mark-target-a1" data-num="1" 
37
-                  :style="{left:A_left+'px', top: (A_top+(index*30))+'px', cursor: 'move',position: 'absolute'}" 
29
+              <div v-if="a_num==2" title="长按右键调整线条角度" class="mark-target mark-target-a mark-target-a1" data-num="1"
30
+                  :style="{left:A_left+'px', top: (A_top+(index*30))+'px', cursor: 'move',position: 'absolute'}"
38 31
                   @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">{{item.markNum}}
39 32
                 <span class="mark-line mark-line-a" style="transform: rotate(160deg);" data-rotate="160"></span>
40 33
               </div>
41 34
             </div>
42 35
             <div v-for="(item,index) in V_arr" :key="index">
43
-              <div v-if="v_num==2" title="长按右键调整线条角度" class="mark-target mark-target-v mark-target-v1" data-num="1" 
44
-                    :style="{left: V_left+'px', top: (V_top+(index*30))+'px', cursor: 'move', position: 'absolute'}" 
36
+              <div v-if="v_num==2" title="长按右键调整线条角度" class="mark-target mark-target-v mark-target-v1" data-num="1"
37
+                    :style="{left: V_left+'px', top: (V_top+(index*30))+'px', cursor: 'move', position: 'absolute'}"
45 38
                     @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)">{{item.markNum}}
46 39
                 <span class="mark-line mark-line-v" style="transform: rotate(20deg);" data-rotate="20"></span>
47 40
               </div>
48 41
             </div>
49 42
             <!-- 穿刺文字 active  @mousedown="startDrag"   @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"-->
50 43
             <div v-for="(item,index) in text_arr" :key="index" >
51
-              <div ref="text_cc" class="add-mark-text-wrap active" :style="{width:(item.width + 10)+'px',left:text_left+'%',top:(text_top+(index*4))+'%','font-size':14+'px'}" 
44
+              <div ref="text_cc" class="add-mark-text-wrap active"
45
+              :style="{width:(item.width + 10)+'px',left:text_left+'%',top:(text_top+(index*4))+'%','font-size':14+'px', position: 'absolute'}"
52 46
               @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
53
-                <!-- <div  style="width:82px;left:62.17%;top:39.00%;display: inline-block;" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"> -->
47
+                <!-- <div  style="width:82px;left:62.17%;top:39.00%;display: inline-block;" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)">position: 'absolute',top: 36+'%',left: 48+'%' -->
54 48
                   <!-- {{ item }} -->
55 49
                   <el-input v-text:value="item.text" size="mini" :style="{width:item.width+'px', border: 1+'px solid transparent', cursor: 'default'}"></el-input>
56 50
                   <!-- <input id="inpu" type="text" :value="item" data-width="82" style="width: 82px; border: 1px solid transparent; cursor: default;" class="mark-text-ipt"> -->
@@ -60,60 +54,60 @@
60 54
               </div>
61 55
             </div>
62 56
             <!-- 穿刺方向 -->
63
-            <div v-if="fangxiangA_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" 
64
-              title="长按右键调整线条角度" id="jinzhen_fangxiang_A" class="mark-target mark-target-a mark-target-adccz" 
65
-              :style="{left: fangxiangA_left+'px', top: fangxiangA_top+'px', width: 14+'px', height: 14+'px', background: rgb(231, 53, 53), 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
57
+            <div v-if="fangxiangA_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"
58
+              title="长按右键调整线条角度" id="jinzhen_fangxiang_A" class="mark-target mark-target-a mark-target-adccz"
59
+              :style="{left: fangxiangA_left+'px', top: fangxiangA_top+'px', width: 14+'px', height: 14+'px', background: 'rgb(231, 53, 53)', 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
66 60
               <span class="mark-line mark-line-ccza" data-rotate="160" style="width:50px;transform:rotate(160deg);">
67
-              <b class="xtgl-ccz-arrow xtgl-ccz-arrow-a" 
61
+              <b class="xtgl-ccz-arrow xtgl-ccz-arrow-a"
68 62
                 style="position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);">
69 63
               </b></span></div>
70 64
 
71
-            <div v-if="fangxiangV_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" 
72
-            title="长按右键调整线条角度" id="jinzhen_fangxiang_V" class="mark-target mark-target-v mark-target-vdccz" 
73
-            :style="{left: fangxiangV_left+'px', top: fangxiangV_top+'px', width: 14+'px', height: 14+'px', background: rgb(231, 53, 53), 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
65
+            <div v-if="fangxiangV_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"
66
+            title="长按右键调整线条角度" id="jinzhen_fangxiang_V" class="mark-target mark-target-v mark-target-vdccz"
67
+            :style="{left: fangxiangV_left+'px', top: fangxiangV_top+'px', width: 14+'px', height: 14+'px', background: 'rgb(53, 162, 231)', 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
74 68
             <span class="mark-line mark-line-cczv" data-rotate="20" style="width:50px;transform:rotate(20deg);">
75 69
               <b class="xtgl-ccz-arrow xtgl-ccz-arrow-v"
76 70
               style="position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);">
77 71
               </b></span></div>
78 72
             <!-- 辅助工具 :style="{transform: rotate(30deg)}"  ,'background-img': 'url(' + require('../../assets/evaluate/tool-a.png') + ')'  -->
79
-            <div v-if="fuzhuA_num==2"  
80
-             class="jinzhen-jiaodu-target jinzhen-jiaodu-target-A" id="jinzhen-jiaodu-target-A">
73
+            <div v-if="fuzhuA_num==2"
74
+             class="jinzhen-jiaodu-target jinzhen-jiaodu-target-A" id="jinzhen-jiaodu-target-A" style="position: absolute;top: 56px;left: 360px;">
81 75
               <div class="frame-box  actives" :style="{'transform': `scale(${scalea_num})`,top:fuzhuA_top+'px',left:fuzhuA_left+'px'}" @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
82 76
                 <div class="frame-image" data-rotate="0" :style="{transform: `rotate(${xuanzhuan_a}deg)`}">
83
-                  <!-- <img src="../../assets/evaluate/tool-a.png" alt="" srcset="" > -->
77
+                  <img src="../../assets/evaluate/tool-a.png" alt="" srcset="" style="margin: 6px 0 0 6px;">
84 78
                 </div>
85 79
                 <div class="drag-elem bottom right" @click="imga_click"></div>
86 80
                 <div class="frame-image-toolbar-btn frame-image-toolbar-btn-reset" data-tooltip="" title="调整方向" @click="fuzhuaclick"></div>
87 81
               </div>
88
-            </div> 
89
-            <div v-if="fuzhuV_num==2" 
82
+            </div>
83
+            <div v-if="fuzhuV_num==2" style="position: absolute;top: 56px;left: 56px;"
90 84
              class="jinzhen-jiaodu-target jinzhen-jiaodu-target-V" id="jinzhen-jiaodu-target-V">
91 85
               <div class="frame-box actives" :style="{'transform': `scale(${scalev_num})`,top:fuzhuV_top+'px',left:fuzhuV_left+'px'}" @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
92 86
                 <div id="v_img" class="frame-image" data-rotate="0" :style="{'transform': `rotate(${xuanzhuan_v}deg)`}">
93
-                  <!-- <img id="image" src="../../assets/evaluate/tool-a.png" alt="" srcset="" > -->
87
+                  <img id="image" src="../../assets/evaluate/tool-a.png" alt="" srcset="" style="margin: 6px 0 0 6px;">
94 88
                 </div>
95 89
                 <div class="drag-elem bottom right" @click="imgv_click"></div>
96 90
                 <div class="frame-image-toolbar-btn frame-image-toolbar-btn-reset" data-tooltip="" title="调整方向" @click="fuzhu_click"></div>
97 91
               </div>
98
-            </div> 
92
+            </div>
99 93
           </div>
100 94
         </div>
101
-        <div style="width:20px;"></div>
102
-        <div style="width:48%;">
95
+        <div style="width:25px;"></div>
96
+        <div style="width:49%;">
103 97
           <div>
104 98
             <p class="point-mark-title">A端:</p>
105 99
             <div :class="append == false ? 'point-mark-items' : 'mark-a-items'"> <!-- v-for="(item,index) in 12" :key="index" -->
106
-              <div class="point-mark-a-item not-able" 
100
+              <div class="point-mark-a-item not-able"
107 101
                 data-tag="-a" data-mark="A" title="点击移除标记" v-for="(item,index) in 12" :key="index" @click="a_item($event,item)">{{item}}</div>
108 102
             </div>
109 103
             <p class="point-mark-title">V端:</p>
110 104
             <div :class="append == false ? 'point-mark-items' : 'mark-v-items'" style="border-bottom: 1px solid #ddd;">
111
-              <div class="point-mark-v-item not-able" 
105
+              <div class="point-mark-v-item not-able"
112 106
                 data-tag="-v" data-mark="V" title="点击移除标记" v-for="(item,index) in 12" :key="index" @click="v_item($event,item)">{{item}}</div>
113 107
             </div>
114 108
             <div><span class="active-addtext-btn">添加文本框:</span></div>
115 109
             <div id="default-marktext-wrap" style="display:flex;flex-wrap:wrap;">
116
-              <span :class="append == true ?'default-mark-text chuanci' : 'disabled'" data-index="0" 
110
+              <span :class="append == true ?'default-mark-text chuanci' : 'disabled'" data-index="0"
117 111
                   v-for="(item,index) in puncture_text" :key="index" @click="punctureclick($event,item)">{{ item.text }}</span>
118 112
                 <!-- <span :class="append == true ?'default-mark-text chuanci' : 'disabled'" data-index="0">穿刺角度</span>
119 113
                 <span :class="append == true ?'default-mark-text chuanci' : 'disabled'" data-index="1">卡夫距导管出口距离cm</span>
@@ -160,7 +154,7 @@
160 154
         </div>
161 155
       </div>
162 156
     </div>
163
-    
157
+
164 158
     <div style="width:50%; margin-top:20px">
165 159
       <div class='content_top' style="width: 100%;margin-bottom: 20px;border-bottom:1px solid #DCDFE6;padding-bottom:10px">
166 160
         <div style="font-size: 20px;">位点记录列表</div>
@@ -179,11 +173,6 @@
179 173
           </thead>
180 174
         </table>
181 175
       </div>
182
-      <!-- <template>
183
-        <div>
184
-          <vue-quill-editor v-model="content" ref="myQuillEditor" :options="editorOption"></vue-quill-editor>
185
-        </div>
186
-      </template> -->
187 176
     </div>
188 177
     <!-- 保存按钮的隐藏 -->
189 178
     <el-dialog
@@ -242,14 +231,6 @@ import print from "print-js";
242 231
 import { getFileExtension} from '@/utils/tools'
243 232
 import { saveSitemap,getPatientSitemap,updateSiteMap } from "@/api/patient";
244 233
 import { getToken } from '@/api/qiniu'
245
-// import html2canvas from "html2canvas"
246
-// import Quill from 'quill';
247
-// import {quillEditor, Quill} from 'vue-quill-editor'
248
-// import { container, ImageExtend } from "quill-image-extend-module";
249
-// Quill.register("modules/ImageExtend", ImageExtend);
250
-// import 'quill/dist/quill.core.css'
251
-// import 'quill/dist/quill.snow.css'
252
-// import 'quill/dist/quill.bubble.css'
253 234
 export default{
254 235
   components:{
255 236
     // quillEditor
@@ -298,7 +279,7 @@ export default{
298 279
       qiniuDomain: 'https://images.shengws.com/',
299 280
       puncture_text:[{text:'穿刺角度',width:70},{text:'卡夫距导管出口距离cm',width:158},{text:'动脉端向心穿刺',width:116},{text:'动脉端离心穿刺',width:116},
300 281
                       {text:'静脉端向心穿刺',width:116},{text:'手背朝上',width:70},{text:'手掌朝上',width:70},{text:'虎口朝上',width:70},{text:'A端',width:70},{text:'V端',width:70},{text:'自定义',width:70}],
301
-      // picture:'@/assets/evaluate/tool-a.png',   
282
+      // picture:'@/assets/evaluate/tool-a.png',
302 283
       // url:'',//图片路径
303 284
 
304 285
       value:'',//获取文本框文字
@@ -345,7 +326,7 @@ export default{
345 326
               }
346 327
             }
347 328
           }
348
-            
329
+
349 330
         }
350 331
       }
351 332
       console.log('333',this.A_arr)
@@ -368,7 +349,7 @@ export default{
368 349
               }
369 350
             }
370 351
           }
371
-            
352
+
372 353
         }
373 354
       }
374 355
     },
@@ -399,7 +380,7 @@ export default{
399 380
         _target.style.top = endy+'px'
400 381
         // console.log('x',this.endx,'y',this.endy);
401 382
       }
402
-      
383
+
403 384
       // inpu.addEventListener('mousedown',this.A_mousedow)
404 385
     },
405 386
     A_moouseup(e){
@@ -469,7 +450,7 @@ export default{
469 450
       // if(this.fuzhuV_num ==1 || this.append ==false){
470 451
       //  return this.xuanzhuan_v =0
471 452
       // }
472
-      
453
+
473 454
     },
474 455
     fuzhuaclick(){
475 456
       if(this.append ==true && this.fuzhuA_num ==2){
@@ -482,8 +463,8 @@ export default{
482 463
     },
483 464
     printtup(){
484 465
       const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {position: absolute;top: 36%;left: 48%;border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} .remove-mark-text{overflow: hidden;} b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}div.frame-image {position: absolute;overflow: hidden;top: 0px;left: 0px;width: 100%;height: 100%;background-image: url('+'../../assets/evaluate/tool-a.png'+');background-position: center center;background-size: 100%; background-repeat: no-repeat;}}}'
485
-      // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;}  b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} 
486
-      // b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} 
466
+      // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;}  b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;}
467
+      // b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}
487 468
       // .mark-target-a{background: #E73535;top: 40px;left: 40px;} .mark-line{background: #E73535;}}}'
488 469
       // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {position: absolute;top: 36%;left: 48%;border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} input {width: 100px;width: 60px;max-width: 400px;border: 1px solid transparent;padding: 4px;color: #333;height: 24px;cursor: pointer;background-color: #fcfcfc;position: absolute;left: 0;top: 0;font-size: 13px;z-index: 1002;border-radius: 2px !important;outline: none;}.mark-text-ipt {cursor: default;}}}}'
489 470
 
@@ -591,37 +572,9 @@ export default{
591 572
       this.imgDialogVisible=false
592 573
     },
593 574
     saveimg(){
594
-      
595
-      // html2canvas(this.$refs.imageWrapper).then(canvas  =>{
596
-      //   // const imageSrc = canvas.toDataURL();
597
-      //   const imageUrl = canvas.toDataURL("image/png");
598
-      //   console.log('5555',imageUrl);
599
-      // //   // const base = this.url.split(',')[1]
600
-      // //   // console.log('2222',base);
601
-      //   const blob = this.dataURLtoBlob(imageUrl)
602
-      //   console.log('4444',blob);
603
-      //   this.url = URL.createObjectURL(blob);
604
-      //   console.log('1111',urls);
605
-        // var link= document.createElement("a");
606
-        // //将生成的图片url赋值给a标签的href属性
607
-        // link.href = this.url; 
608
-        // //设置下载的文件名
609
-        // link.download = "页面截图";
610
-        // // 将a标签插入dom中
611
-        // document.body.appendChild(link);
612
-        // //模拟点击事件触发下载
613
-        // link.click();
614
-        // // 完成之后销毁创建的a标签
615
-        // document.body.removeChild(link);
616
-
617
-      // })
618
-      // console.log('3333');
619
-      // const editedHTML=this.editor.getContents();
620
-      // console.log('6666',editedHTML);
621
-       
575
+
622 576
        var is_append = 2
623
-        
624
-      
577
+
625 578
        if(this.append == true){
626 579
            is_append = 1
627 580
        }
@@ -631,10 +584,10 @@ export default{
631 584
 
632 585
        var is_img_v = 2
633 586
 
634
-      
587
+
635 588
        if(this.img_v ==true){
636 589
           is_img_v = 1
637
-         
590
+
638 591
        }
639 592
        if(this.img_v == false){
640 593
           is_img_v = 2
@@ -662,8 +615,6 @@ export default{
662 615
           text_arr_str = this.text_arr.join(",")
663 616
        }
664 617
 
665
-      //  console.log("fangxiang_A_top",this.fangxiangA_top)
666
-
667 618
        var params = {
668 619
          is_append:is_append,
669 620
          is_img_v:is_img_v,
@@ -738,7 +689,7 @@ export default{
738 689
             this.text_num = sitemap.text_num
739 690
 
740 691
             this.fangxiangA_num = sitemap.fangxianga_num
741
-           
692
+
742 693
             this.fangxiangA_left = sitemap.fangxianga_left
743 694
 
744 695
             this.fangxiangV_top = sitemap.fangxianga_top,
@@ -752,23 +703,23 @@ export default{
752 703
             this.xuanzhuan_a =  sitemap.xuanzhuan_a
753 704
 
754 705
             this.xuanzhuan_v = sitemap.xuanzhuan_a
755
-           
706
+
756 707
             this.fuzhuA_top = sitemap.fuzhua_top
757 708
 
758 709
             this.fuzhuV_top  = sitemap.fuzhuv_top
759 710
 
760 711
             this.A_arr  = sitemap.a_arr_str.split(",")
761
-           
712
+
762 713
             this.V_arr  = sitemap.v_arr_str.split(",")
763
-           
714
+
764 715
             this.A_left = sitemap.a_left
765 716
 
766 717
             this.A_top = sitemap.a_top
767 718
 
768 719
             this.V_left = sitemap.v_left
769
-    
720
+
770 721
             this.V_top = sitemap.v_top
771
-        
722
+
772 723
             this.text_arr = sitemap.text_arr.split(",")
773 724
 
774 725
             this.text_left = sitemap.text_left
@@ -777,37 +728,37 @@ export default{
777 728
 
778 729
             this.scalev_num = sitemap.scalev_num
779 730
 
780
-            this.scalea_num =  sitemap.scalea_num 
731
+            this.scalea_num =  sitemap.scalea_num
781 732
 
782 733
             this.value = sitemap.value
783 734
 
784 735
             this.id = sitemap.id
785
-            
736
+
786 737
          }
787 738
       })
788 739
     },
789 740
     updateSiteMap(){
790 741
       var is_append = 2
791
-        
792
-      
742
+
743
+
793 744
         if(this.append == true){
794 745
             is_append = 1
795 746
         }
796 747
         if(this.append == false){
797 748
            is_append = 2
798 749
         }
799
- 
750
+
800 751
         var is_img_v = 2
801
- 
802
-       
752
+
753
+
803 754
         if(this.img_v ==true){
804 755
            is_img_v = 1
805
-          
756
+
806 757
         }
807 758
         if(this.img_v == false){
808 759
            is_img_v = 2
809 760
         }
810
- 
761
+
811 762
         var is_img_a = 2
812 763
         if(this.img_a == true){
813 764
            is_img_a = 1
@@ -815,7 +766,7 @@ export default{
815 766
         if(this.img_a == false){
816 767
            is_img_a = 2
817 768
         }
818
- 
769
+
819 770
         var a_arr_str = ""
820 771
         if(this.A_arr!=null && this.A_arr.length>0){
821 772
           a_arr_str = this.A_arr.join(",")
@@ -824,12 +775,12 @@ export default{
824 775
         if(this.V_arr!=null){
825 776
          v_arr_str = this.V_arr.join(",")
826 777
         }
827
- 
778
+
828 779
         var text_arr_str = ""
829 780
         if(this.text_arr!=null){
830 781
            text_arr_str = this.text_arr.join(",")
831 782
         }
832
- 
783
+
833 784
         var params = {
834 785
          id:this.id,
835 786
          is_append:is_append,
@@ -939,7 +890,7 @@ export default{
939 890
   background-color: #fff;
940 891
   border: 1px solid #ddd;
941 892
   border-radius: 4px;
942
-  
893
+
943 894
   .mark-target-a{
944 895
     background: #E73535;
945 896
     top: 40px;
@@ -1036,7 +987,7 @@ export default{
1036 987
   //     opacity: 0;
1037 988
   //     cursor: pointer;
1038 989
   //     border-radius: 50%;
1039
-      
990
+
1040 991
   // }
1041 992
   // div.add-mark-text-wrap:hover .remove-mark-text {
1042 993
   //   background: red;
@@ -1106,7 +1057,7 @@ export default{
1106 1057
     left: 5px;
1107 1058
     width: 90%;
1108 1059
     height: 90%;
1109
-    background-image: url('../../assets/evaluate/tool-a.png');
1060
+    // background-image: url('../../assets/evaluate/tool-a.png');
1110 1061
     background-position: center center;
1111 1062
     background-size: 100%;
1112 1063
     background-repeat: no-repeat;
@@ -1151,7 +1102,7 @@ export default{
1151 1102
     box-shadow: 1px 1px 5px rgba(0,0,0,.1);
1152 1103
     background: url('../../assets/evaluate/xgtl_tool_rotate.png')no-repeat center center / 20px;
1153 1104
   }
1154
- 
1105
+
1155 1106
   .frame-box .drag-elem.bottom.right {
1156 1107
     cursor: nwse-resize;
1157 1108
     z-index: 3;
@@ -1188,9 +1139,9 @@ div.add-mark-text-wrap.active {
1188 1139
   box-shadow: 2px 3px 8px rgba(0,0,0,.2), -3px -2px 8px rgba(0,0,0,.2);
1189 1140
 }
1190 1141
 div.add-mark-text-wrap {
1191
-  position: absolute;
1192
-  top: 36%;
1193
-  left: 48%;
1142
+  // position: absolute;
1143
+  // top: 36%;
1144
+  // left: 48%;
1194 1145
   border-radius: 4px;
1195 1146
   width: 60px;
1196 1147
   height: 25px;
@@ -1350,4 +1301,4 @@ span.chuanci:hover{
1350 1301
 .ql-snow .ql-tooltip[data-mode="link"]::before {
1351 1302
   content: "../../assets/evaluate/tool-a.png";
1352 1303
 }
1353
-</style>
1304
+</style>