From d27266ab7ae02b144605dffd7aded88b06c207bb Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 12 Oct 2020 13:04:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BA=BF=E6=AE=B5=E7=94=BB?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...sdfzxcg85039.png => iscs_kongzhixiang.png} | Bin 2249 -> 2270 bytes
 src/iscs/constant/deviceRender.js             |   2 +-
 src/iscs/shape/line.js                        |  24 +++---
 src/iscs/shape/picture.js                     |  52 +++++++------
 .../iscs/iscsDraw/icscComponents/line.vue     |  28 ++++---
 .../iscs/iscsDraw/icscComponents/picture.vue  |  71 +++++++++---------
 6 files changed, 96 insertions(+), 81 deletions(-)
 rename src/assets/iscs_picture/{sdfzxcg85039.png => iscs_kongzhixiang.png} (51%)

diff --git a/src/assets/iscs_picture/sdfzxcg85039.png b/src/assets/iscs_picture/iscs_kongzhixiang.png
similarity index 51%
rename from src/assets/iscs_picture/sdfzxcg85039.png
rename to src/assets/iscs_picture/iscs_kongzhixiang.png
index 4a85d2131b7a530f325b36e1e38886c0ae305f81..d2590b473883c6f3f8cb22d9fdf1def8130905e0 100644
GIT binary patch
delta 649
zcmX>pcu#PG1ryt;jaHpZe1-<PhDIR<mR6<~Rz?PsFEYua3;koNR5467NlY^}O4GG8
zF-+1mu`sdFwJ<g?(=|0SH8D<3wlqyiOWr)2*@bB`KdYH5F{+gmic4I}O03E=QuAz;
zj0}u`?m%_Q85aA=Ct36BB^|blGcYjj@^o<wshIQj?%CXC2NBnY)`46FoFWhBtvG2L
z$fA1TV2WU}Vs>4{oxn{WEQPe~D<7QhSz7UUN^#iwDM9rwoPWRLT{7j<CY__#-+kY`
zE%)-<vf$ij7TPPV&3C=9b({Y@`^Mb53}1(`_}XtDD?G9owte`fWd7~Ct3&;_MHQEh
zD$BTb+8n8W@@HaqgUsDuZwkMAvO4tT{jI(Kaf$f>xqCNdOP?ybiNu<JvQf3s{2+Pa
zdE8EM1^4a$_HDhZZp&!7>+4Rjc}MD%$~=YQMM7S^-B&rUe!ow|^{o~LzL#HTTuEDZ
zrcY<ryPH2VXZfu?FKEVmfycp^;Vgp*b3L3zOU8ljv!B<@DQ3FBbAbEpZht0&JA(d9
z7x)f1ypII(K9s21a5`8s_=nuC6>2DBD9d_l$9W*l)`s(d;?rwebE7|hUA<X({fk}c
y&x_B!ie34&SmOBngD-NQo_KR&(d)i_=j9naCkJX>e{+HX2s~Z=T-G@yGywnrHUgXg

delta 727
zcmV;|0x1375y=sdI06Owu{wzY4lp?_GBH#!HaajkIx#hq(E=Y1FgYzUF;p=&Ixsjo
zF*TF^0(p}~1tznd1406muLfCvhXR@&0007YNkl<Zc%1E>?TzX%5Jj(_wg5_S5%iRr
z=!qgyLOSsNc+Wgz`7@K<@rZk*h+P<w<S^rbArdZxfF91de$a>V)eCUWh3E5GeC&R|
z<2Vl7Za36o(pUi9xT~2x#@X}vbJ>x8C{2OPzIyEA@c_^e*pe5SIk4Y<W=2S4RvvJ&
zglDD9oP-9F7r7{qrCX0pvkxc;Wa-wQH<t%w0(<gCGwRGqT*2&qXU?Z2513d3x$c#D
z31sQkpSPBMz(0X3-FjS09>7l`VjKVt3M%xnZ`-!N!-Rd`iviyIS83E@&ct5H?0!e%
zz4t@=X9)|TKp_+;gaU<sP@oVB6heVQC{PFm3ZXzD6exrOg;1anb%Cv^$LK^vlkT-K
zKSe4h{=M(}+x@>e7CVcYz?K{f;v#A#oR_DCaxI}IFfCW_{ae;~?_b;Ms0d8u<hQ{8
z61GsvDr;b#Z5Bk;Sgs3OL%j=I&p>uzA!<z|&$`%^t!1N%z_fgSBNpWWifbV7-ZV-X
zX@MoWa0v<=pmj}-71YOBDVD@VR0UcTmZK`LHBhjEdI?*7{})jgXdQKdG5bpEp@lV4
zy@{l=KMTTg)SF1@e@il#87AadX)3D21fV_EvLI2tiCBjMg)A|Rsg<#X5?<~*5o@1H
zSi(XmP>4zi_r8&Tv-DPGxhoU627VaJ3=^!PdS!xjd4Tfufiw573fI7sY}<wqf}=no
z6nKJ|eE<bclga}qPz(i5kY^u2fy0#K0Td{P0tcvNA3%X(D6m5-`v3}T(vt^J;3b6C
zb{t3Z@w2g4ZnOIxjSnH9x4G8OVWdBU(M#o-*ejXc@72c^`3;%IC|Kc&g(Uz0002ov
JPDHLkV1oYnNHzcf

diff --git a/src/iscs/constant/deviceRender.js b/src/iscs/constant/deviceRender.js
index 1ed1ff2b3..f19af7189 100644
--- a/src/iscs/constant/deviceRender.js
+++ b/src/iscs/constant/deviceRender.js
@@ -190,7 +190,7 @@ deviceRender[deviceType.IscsText] = {
 deviceRender[deviceType.IscsLine] = {
     _type: deviceType.IscsLine,
     zlevel: 1,
-	z: 5
+    z: 5
 };
 /** 矩形渲染配置 */
 deviceRender[deviceType.IscsRect] = {
diff --git a/src/iscs/shape/line.js b/src/iscs/shape/line.js
index 9b9f1b34c..29399d9fb 100644
--- a/src/iscs/shape/line.js
+++ b/src/iscs/shape/line.js
@@ -27,7 +27,7 @@ export default class line extends Group {
             position: [model.points[0].x, model.points[0].y]
         });
         // 1101 垂直渐变 1110 水平渐变
-        let strokeColor = this.model.fillColor;
+        let fillColor = this.model.fillBackground;
         if (model.isGradual) {
             const offsetList = [];
             model.modelList.forEach(item => {
@@ -37,9 +37,9 @@ export default class line extends Group {
                 });
             });
             if (model.gradualShow == 'level') {
-                strokeColor = new zrender.LinearGradient(1, 1, 0, 1, offsetList);
+                fillColor = new zrender.LinearGradient(1, 1, 0, 1, offsetList);
             } else {
-                strokeColor = new zrender.LinearGradient(1, 1, 1, 0, offsetList);
+                fillColor = new zrender.LinearGradient(1, 1, 1, 0, offsetList);
             }
         }
         const modelPoints = [];
@@ -52,17 +52,21 @@ export default class line extends Group {
         });
         this.iscsLine = new Polyline({
             zlevel: model.zlevel,
-			z: model.z,
-			z2: model.z2||0,
+            z: model.z,
+            z2: model.z2 || 0,
             draggable: false,
             shape: {
                 points: modelPoints
             },
             style: {
                 lineWidth: this.model.lineWidth,
-                stroke: strokeColor
+                stroke: this.model.fillColor
             }
         });
+        console.log(this.model.fill);
+        if (fillColor) {
+            this.iscsLine.setStyle('fill', fillColor);
+        }
         if (model.classify == 'dashed') {
             this.iscsLine.setStyle('lineDash', [8, 6]);
         }
@@ -75,8 +79,8 @@ export default class line extends Group {
             }
             this.arrows = new Polygon({
                 zlevel: model.zlevel,
-				z: model.z,
-				z2: model.z2||0,
+                z: model.z,
+                z2: model.z2 || 0,
                 origin: [0, 0],
                 rotation: rotation,
                 shape: {
@@ -103,8 +107,8 @@ export default class line extends Group {
             const y = model.points[this.model.points.length - 1].y - model.points[this.model.points.length - 2].y;
             this.arrows = new Polygon({
                 zlevel: model.zlevel,
-				z: model.z,
-				z2: model.z2||0,
+                z: model.z,
+                z2: model.z2 || 0,
                 origin: [x, y],
                 rotation: rotation,
                 shape: {
diff --git a/src/iscs/shape/picture.js b/src/iscs/shape/picture.js
index a3953db31..3a782430b 100644
--- a/src/iscs/shape/picture.js
+++ b/src/iscs/shape/picture.js
@@ -20,35 +20,37 @@ import blowerRedRight from '@/assets/iscs_picture/gufengji-red-r.png';
 import blowerGrayRight from '@/assets/iscs_picture/gufengji-gray-r.png';
 import iscsAPF from '@/assets/iscs_picture/iscs_APF.png';
 import drum from '@/assets/iscs_picture/drum.png';
-import exhaustFan from '@/assets/iscs_picture/exhaustFan.png'
+import exhaustFan from '@/assets/iscs_picture/exhaustFan.png';
 import waterCooler from '@/assets/iscs_picture/ZSDF533.png';
 import textBgBluePoint from '@/assets/iscs_picture/textBgBluePoint.png';
-import ventilationFan from '@/assets/iscs_picture/ventilationFan.png'
+import ventilationFan from '@/assets/iscs_picture/ventilationFan.png';
+import kongzhixiang from '@/assets/iscs_picture/iscs_kongzhixiang.png';
 
 const pictureObj = {
     'psdLeft': psdLeft,
     'psdSystem': psdSystem,
-	'psdRight': psdRight,
-	'APF': iscsAPF,
-	'envPersonDoor': envPersonDoor,
+    'psdRight': psdRight,
+    'APF': iscsAPF,
+    'envPersonDoor': envPersonDoor,
     's': fireBlue,
-	'a': fireRed,
-	hand,
-	fmBlue,
-	fmGray,
-	fmGreen,
-	airCond,
-	airCondMul,
-	setting,
-	blowerRedLeft,
-	blowerGrayLeft,
-	blowerRedRight,
-	blowerGrayRight,
-	drum,
-	exhaustFan,
-	waterCooler,
-	textBgBluePoint,
-	ventilationFan
+    'a': fireRed,
+    hand,
+    fmBlue,
+    fmGray,
+    fmGreen,
+    airCond,
+    airCondMul,
+    setting,
+    blowerRedLeft,
+    blowerGrayLeft,
+    blowerRedRight,
+    blowerGrayRight,
+    drum,
+    exhaustFan,
+    waterCooler,
+    textBgBluePoint,
+    ventilationFan,
+    kongzhixiang
 };
 export default class Picture extends Group {
     constructor(device) {
@@ -69,9 +71,9 @@ export default class Picture extends Group {
         });
         this.imageButton = new Image({
             zlevel: model.zlevel,
-			z: model.z,
-			origin: [model.width/2, model.height/2],
-			rotation: (model.rotation||0)*Math.PI/180,
+            z: model.z,
+            origin: [model.width / 2, model.height / 2],
+            rotation: (model.rotation || 0) * Math.PI / 180,
             style: {
                 x: 0,
                 y: 0,
diff --git a/src/views/iscs/iscsDraw/icscComponents/line.vue b/src/views/iscs/iscsDraw/icscComponents/line.vue
index a17c8f4fe..7c5263072 100644
--- a/src/views/iscs/iscsDraw/icscComponents/line.vue
+++ b/src/views/iscs/iscsDraw/icscComponents/line.vue
@@ -1,11 +1,11 @@
 <template>
   <div style="overflow-y: scroll;height: calc(100% - 46px); width: 100%;">
     <el-form ref="form" :rules="rules" :model="form" label-width="100px" style="width: 100%;padding: 10px 20px;">
-	  <el-form-item label="图层:" prop="z2">
+      <el-form-item label="图层:" prop="z2">
         <el-input-number v-model="form.z2" controls-position="right" :min="0" size="small" />
       </el-form-item>
       <el-form-item label="线段宽度:" prop="lineWidth">
-        <el-input-number v-model="form.lineWidth" controls-position="right" :min="1" :max="50" size="small" />
+        <el-input-number v-model="form.lineWidth" controls-position="right" :min="0" :max="50" size="small" />
       </el-form-item>
       <el-form-item label="类型:" prop="type">
         <el-select v-model="form.classify" placeholder="请选择类型" size="small">
@@ -43,7 +43,10 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-form-item v-if="!form.isGradual" label="线段颜色:" prop="fillColor">
+      <el-form-item v-if="!form.isGradual" label="线段填充色:" prop="fillColor">
+        <el-color-picker v-model="form.fillBackground" size="small" />
+      </el-form-item>
+      <el-form-item label="线段颜色:" prop="borderColor">
         <el-color-picker v-model="form.fillColor" size="small" />
       </el-form-item>
       <el-form-item label="箭头显示:" prop="arrowShow">
@@ -122,10 +125,11 @@ export default {
             showDeleteButton: false,
             form: {
                 classify:'solid',
-				code: '',
-				z2: 0,
+                code: '',
+                z2: 0,
                 lineWidth: '',
                 fillColor: '#fff',
+                fillBackground: '',
                 arrowShow: 'none',
                 arrowSize: 5,
                 points: [
@@ -141,7 +145,7 @@ export default {
                     { required: true, message: '请输入线段宽度', trigger: 'blur' }
                 ],
                 fillColor: [
-                    { required: true, message: '请输入线段颜色', trigger: 'blur' }
+                    { required: true, message: '请输入线段边框颜色', trigger: 'blur' }
                 ]
             }
         };
@@ -158,10 +162,11 @@ export default {
                 this.buttonText = '修改';
                 this.showDeleteButton = true;
                 this.isUpdate = true;
-				this.form.code = model.code;
-				this.form.z2 = model.z2||0;
+                this.form.code = model.code;
+                this.form.z2 = model.z2 || 0;
                 this.form.lineWidth = model.lineWidth;
                 this.form.fillColor = model.fillColor;
+                this.form.fillBackground = model.fillBackground || '';
                 if (model.point1) {
                     this.form.points = [];
                     this.form.points.push(model.point1);
@@ -189,10 +194,11 @@ export default {
                     const lineModel = {
                         points: this.form.points,
                         code: this.isUpdate ? this.form.code : getUID('IscsLine', this.iscs.iscsLineList),
-						_type: 'IscsLine',
-						z2: this.form.z2,
+                        _type: 'IscsLine',
+                        z2: this.form.z2,
                         lineWidth: this.form.lineWidth,
                         fillColor: this.form.fillColor,
+                        fillBackground: this.form.fillBackground,
                         classify: this.form.classify,
                         arrowShow: this.form.arrowShow,
                         arrowSize: this.form.arrowSize,
@@ -222,6 +228,7 @@ export default {
                 _type: 'IscsLine',
                 lineWidth: this.form.lineWidth,
                 fillColor: this.form.fillColor,
+                fillBackground: this.form.fillBackground,
                 classify: this.form.classify,
                 arrowShow: this.form.arrowShow,
                 arrowSize: this.form.arrowSize
@@ -236,6 +243,7 @@ export default {
                 code: '',
                 lineWidth: '',
                 fillColor: '#fff',
+                fillBackground: '',
                 arrowShow: 'none',
                 arrowSize: 5,
                 points: [
diff --git a/src/views/iscs/iscsDraw/icscComponents/picture.vue b/src/views/iscs/iscsDraw/icscComponents/picture.vue
index 6e82f8cbb..213e5f14c 100644
--- a/src/views/iscs/iscsDraw/icscComponents/picture.vue
+++ b/src/views/iscs/iscsDraw/icscComponents/picture.vue
@@ -9,9 +9,9 @@
           <el-option v-for="(item, index) in typeList" :key="index" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
-	  <el-form-item label="旋转角度:" prop="rotation">
-        <el-input-number v-model="form.rotation" controls-position="right"  size="small" />
-	  </el-form-item>
+      <el-form-item label="旋转角度:" prop="rotation">
+        <el-input-number v-model="form.rotation" controls-position="right" size="small" />
+      </el-form-item>
       <el-form-item label="宽度:" prop="width">
         <el-input-number v-model="form.width" controls-position="right" :min="1" size="small" />
       </el-form-item>
@@ -50,36 +50,37 @@ export default {
                 type: '',
                 size: 10,
                 width: 50,
-				height: 50,
-				rotation: 0,
+                height: 50,
+                rotation: 0,
                 x: 10,
                 y: 10
             },
             typeList: [
                 { name: '车头', value: 'psdLeft' },
                 { name: '车尾', value: 'psdRight' },
-				{ name: '车厢', value: 'psdSystem' },
-				{ name: '人防门', value: 'envPersonDoor'},
-				{ name: '蓝色FIRE', value: 's'},
-				{ name: '红色FIRE', value: 'a'},
-				{ name: 'APF', value: 'APF'},
-				{ name: '手动阀', value: 'hand'},
-				{ name: '蓝色-阀门', value: 'fmBlue'},
-				{ name: '灰色-阀门', value: 'fmGray'},
-				{ name: '绿色-阀门', value: 'fmGreen'},
-				{ name: '空调', value: 'airCond'},
-				{ name: '多联空调', value: 'airCondMul'},
-				{ name: '管件', value: 'setting'},
-				{ name: '汽包', value: 'drum' },
-				{ name: '红色-左侧-鼓风机', value: 'blowerRedLeft'},
-				{ name: '灰色-左侧-鼓风机', value: 'blowerGrayLeft'},
-				{ name: '红色-右侧-鼓风机', value: 'blowerRedRight'},
-				{ name: '灰色-右侧-鼓风机', value: 'blowerGrayRight'},
-				{ name: '排风机', value: 'exhaustFan' },
-				{ name: '冷水机', value: 'waterCooler'},
-				{ name: '顶部排风机', value: 'ventilationFan'},
-				{ name: '文字蓝色背景', value: 'textBgBluePoint'}
-			],
+                { name: '车厢', value: 'psdSystem' },
+                { name: '人防门', value: 'envPersonDoor'},
+                { name: '蓝色FIRE', value: 's'},
+                { name: '红色FIRE', value: 'a'},
+                { name: 'APF', value: 'APF'},
+                { name: '手动阀', value: 'hand'},
+                { name: '蓝色-阀门', value: 'fmBlue'},
+                { name: '灰色-阀门', value: 'fmGray'},
+                { name: '绿色-阀门', value: 'fmGreen'},
+                { name: '空调', value: 'airCond'},
+                { name: '多联空调', value: 'airCondMul'},
+                { name: '管件', value: 'setting'},
+                { name: '汽包', value: 'drum' },
+                { name: '红色-左侧-鼓风机', value: 'blowerRedLeft'},
+                { name: '灰色-左侧-鼓风机', value: 'blowerGrayLeft'},
+                { name: '红色-右侧-鼓风机', value: 'blowerRedRight'},
+                { name: '灰色-右侧-鼓风机', value: 'blowerGrayRight'},
+                { name: '排风机', value: 'exhaustFan' },
+                { name: '冷水机', value: 'waterCooler'},
+                { name: '顶部排风机', value: 'ventilationFan'},
+                { name: '文字蓝色背景', value: 'textBgBluePoint'},
+                { name: '风井', value: 'kongzhixiang' }
+            ],
 
             rules: {
                 strokeColor: [
@@ -105,8 +106,8 @@ export default {
                 this.isUpdate = true;
                 this.form.code = model.code;
                 this.form.type = model.type;
-				this.form.size = model.size;
-				this.form.rotation = model.rotation;
+                this.form.size = model.size;
+                this.form.rotation = model.rotation;
                 this.form.width = model.width;
                 this.form.height = model.height;
                 this.form.x = model.point.x;
@@ -127,8 +128,8 @@ export default {
                         code: this.isUpdate ? this.form.code : getUID('IscsPicture', this.iscs.iscsPictureList),
                         _type: 'IscsPicture',
                         type: this.form.type,
-						size: this.form.size,
-						rotation: this.form.rotation,
+                        size: this.form.size,
+                        rotation: this.form.rotation,
                         width: this.form.width,
                         height: this.form.height
                     };
@@ -148,8 +149,8 @@ export default {
                 code: this.form.code,
                 _type: 'IscsPicture',
                 type: this.form.type,
-				size: this.form.size,
-				rotation: this.form.rotation,
+                size: this.form.size,
+                rotation: this.form.rotation
             };
             this.$emit('deleteDataModel', rectModel);
         },
@@ -160,8 +161,8 @@ export default {
             this.form = {
                 code: '',
                 type: '',
-				size: 10,
-				rotation: 0,
+                size: 10,
+                rotation: 0,
                 width: 50,
                 height: 50,
                 x: 10,