Merge branch 'develop_jzl'

gassafetyprogress-web/src/api/bigWindow/getDevice.js

 /*
  * @Author: your name
  * @Date: 2022-02-23 15:28:07
- * @LastEditTime: 2022-03-01 09:05:43
+ * @LastEditTime: 2022-03-01 15:54:19
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /newDev/gassafety-progress/gassafetyprogress-web/src/api/bigWindow/getdevice.js
@@ -60,6 +60,15 @@ export function getUser(query) {
     params: query
   })
 }
+// 企业接口
+export function getEnterprise(query) {
+  return request({
+    url: '/regulation/info/enterpriseInfoList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获取公司名称以及id
 export function getCompany(query) {
   return request({
@@ -75,4 +84,4 @@ export function userAlarm(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}

gassafetyprogress-web/src/assets/image/zcrq.svg

+<svg width="80" height="60" viewBox="0 0 80 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="40" cy="44" r="16" fill="url(#paint0_linear_214_31)"/>
+<path d="M36.3506 49.459C33.4894 54.9554 37.7938 58.6511 40.3036 59.8119C31.9271 61.0354 32.1154 53.2237 33.7154 47.106C35.3154 40.9884 41.0579 36.6854 41.0565 36.7531C41.0565 36.0001 41.5585 35.2472 41.8095 34.9648C41.2824 37.6754 43.9114 43.3099 45.2918 45.7884C49.5083 52.4895 45.7311 57.4276 43.3154 59.059C45.1977 56.6119 43.9742 52.4707 41.7154 48.3295C39.9083 45.0166 39.9585 40.8001 40.2095 39.106C39.0801 40.706 38.7036 46.5413 41.8095 51.3413C44.2942 55.1813 43.284 57.7727 42.4683 58.5884C42.9954 55.426 41.3075 54.1335 40.3977 53.8825C41.3765 55.4637 40.5546 56.4237 40.0212 56.706C39.8644 55.608 39.306 53.2801 38.3271 52.7531C37.3483 52.226 36.6016 50.3374 36.3506 49.459Z" fill="url(#paint1_linear_214_31)"/>
+<path d="M9.0625 7.17773V5.45898H10.8984V7.17773H15.5957C16.5918 7.17773 17.3568 7.3763 17.8906 7.77344C18.5807 8.29427 18.9258 9.00391 18.9258 9.90234L18.916 17.2363C18.916 18.1087 18.7402 18.776 18.3887 19.2383C17.8418 19.9609 17.0312 20.3223 15.957 20.3223H10.8984L10.9082 22.0215L9.0625 22.0117V20.3223H4.42383C3.48633 20.3223 2.78971 20.1888 2.33398 19.9219C1.50716 19.4401 1.09375 18.5254 1.09375 17.1777V10.2734C1.09375 9.27083 1.34766 8.51888 1.85547 8.01758C2.42188 7.45768 3.18685 7.17773 4.15039 7.17773H9.0625ZM9.0625 18.4863V9.01367H4.0918C3.62956 9.01367 3.30729 9.13737 3.125 9.38477C2.99479 9.56706 2.92969 9.85352 2.92969 10.2441V17.0312C2.92969 17.474 2.94596 17.7376 2.97852 17.8223C3.14128 18.2715 3.49935 18.4961 4.05273 18.4961L9.0625 18.4863ZM10.8984 18.4863L15.625 18.4961C16.6016 18.5026 17.0898 18.0924 17.0898 17.2656V10.3809C17.0898 9.82096 16.9792 9.45312 16.7578 9.27734C16.5495 9.11458 16.1979 9.02995 15.7031 9.02344L10.8984 9.00391V18.4863ZM21.0352 11.5918V9.78516H22.7539C23.4115 9.78516 23.8965 9.94792 24.209 10.2734C24.502 10.5794 24.6484 11.0612 24.6484 11.7188V19.248C24.6484 19.6191 24.6908 19.847 24.7754 19.9316C24.873 20.0358 25.0879 20.0879 25.4199 20.0879H25.8594V21.8945H24.9023C24.2643 21.8945 23.8281 21.8099 23.5938 21.6406C23.0924 21.276 22.8418 20.7682 22.8418 20.1172V12.4902C22.8418 12.0671 22.7669 11.8001 22.6172 11.6895C22.526 11.6243 22.3405 11.5918 22.0605 11.5918H21.0352ZM21.0352 7.29492V5.48828H24.9316V7.29492H21.0352ZM26.2695 21.8457V20.0488C26.4323 20.0228 26.543 19.9707 26.6016 19.8926C26.6862 19.7884 26.7285 19.5703 26.7285 19.2383V9.44336C26.7285 8.56445 26.9661 7.88086 27.4414 7.39258C27.9102 6.91732 28.5189 6.67969 29.2676 6.67969H33.5059L33.3496 5.33203H35.1855L35.3418 6.67969H36.6602V5.33203H38.4668V6.67969H38.8965V8.48633H35.5566L36.3184 14.7461C36.6178 14.3359 36.8099 13.9421 36.8945 13.5645C36.9596 13.2715 37.015 12.8451 37.0605 12.2852H38.8574C38.7923 13.3203 38.6914 14.0397 38.5547 14.4434C38.3854 14.9382 38.1608 15.3678 37.8809 15.7324C37.653 16.0319 37.2656 16.4225 36.7188 16.9043C37.0182 17.7181 37.3275 18.3626 37.6465 18.8379C37.959 19.3066 38.3757 19.7461 38.8965 20.1562V22.1094C37.9395 21.7122 37.194 21.2435 36.6602 20.7031C36.1003 20.1367 35.5892 19.3034 35.127 18.2031L33.3496 19.6484V17.2656L34.6289 16.2402L33.7109 8.48633H29.8438C28.9518 8.48633 28.5124 8.92904 28.5254 9.81445L28.5352 10.3906L30.7129 10.4004C31.377 10.4004 31.8457 10.5371 32.1191 10.8105C32.4316 11.1165 32.5879 11.6048 32.5879 12.2754V19.4824C32.5879 20.6999 32.002 21.3086 30.8301 21.3086H29.5508V19.4824H30.0098C30.3027 19.4824 30.5078 19.4173 30.625 19.2871C30.7487 19.1504 30.8105 18.9648 30.8105 18.7305V13.0762C30.8105 12.7376 30.7357 12.5033 30.5859 12.373C30.4753 12.2819 30.153 12.2363 29.6191 12.2363H28.5352V19.375C28.5352 19.9674 28.4342 20.4232 28.2324 20.7422C27.985 21.1393 27.6562 21.4355 27.2461 21.6309C27.0247 21.7415 26.6992 21.8132 26.2695 21.8457ZM40.9473 22.2656V20.0293C41.4746 19.6842 41.901 19.1178 42.2266 18.3301C42.5391 17.5684 42.6953 16.6634 42.6953 15.6152V5.50781H44.2871V15.7422C44.2871 16.7904 44.4727 17.6986 44.8438 18.4668C45.1628 19.1309 45.5599 19.6419 46.0352 20V21.9434C45.4232 21.6048 44.9219 21.2207 44.5312 20.791C44.1992 20.4264 43.89 19.9674 43.6035 19.4141C43.2259 20.1367 42.7734 20.752 42.2461 21.2598C41.9857 21.5202 41.5527 21.8555 40.9473 22.2656ZM40.9473 16.416V6.15234H42.0215V16.416H40.9473ZM45.0488 16.416V6.15234H46.123V16.416H45.0488ZM46.4062 22.0996V20.4199C46.5885 20.4069 46.709 20.3678 46.7676 20.3027C46.8327 20.2246 46.8652 20.0228 46.8652 19.6973V18.4961H48.6719V19.6094C48.6719 21.1523 47.9167 21.9824 46.4062 22.0996ZM46.582 9.89258V7.98828C46.9857 7.77344 47.2819 7.46745 47.4707 7.07031C47.6335 6.73828 47.7767 6.16536 47.9004 5.35156H49.7363L49.5703 6.16211H50.957C51.6016 6.16211 52.1061 6.28255 52.4707 6.52344C52.6335 6.6276 52.806 6.8099 52.9883 7.07031H54.7559V5.47852H56.6016V7.07031H57.2363V5.78125H58.8086V7.07031H59.0625L59.0527 8.87695H56.6016C56.6341 9.85352 56.6895 10.5697 56.7676 11.0254C56.9629 12.0866 57.3242 13.0664 57.8516 13.9648C58.1445 14.4727 58.5352 15.0228 59.0234 15.6152V17.8906C58.2227 17.2005 57.5651 16.4941 57.0508 15.7715C56.5951 15.1204 56.1589 14.3327 55.7422 13.4082C55.2995 14.5605 54.8405 15.472 54.3652 16.1426C53.929 16.7546 53.3561 17.3405 52.6465 17.9004V15.498C53.3496 14.6647 53.8704 13.7272 54.209 12.6855C54.502 11.7936 54.6875 10.5241 54.7656 8.87695H53.0176C52.4837 11.735 51.8262 13.7826 51.0449 15.0195C50.4004 16.0352 49.5931 16.7904 48.623 17.2852C48.1283 17.5391 47.4577 17.7604 46.6113 17.9492V16.2891C47.1908 16.1328 47.6237 15.9733 47.9102 15.8105C48.2747 15.6087 48.6589 15.2767 49.0625 14.8145H47.041V13.0078H50.166L50.5469 12.0215H47.0117V10.2246H51.0352C51.237 9.44987 51.3379 8.93555 51.3379 8.68164C51.3379 8.41471 51.2728 8.22266 51.1426 8.10547C51.0514 8.03385 50.8105 7.99805 50.4199 7.99805L49.0723 7.98828C48.7402 8.55469 48.3854 8.96484 48.0078 9.21875C47.5846 9.51172 47.1094 9.73633 46.582 9.89258ZM50.2344 22.0508V18.4961H52.041V22.0508H50.2344ZM53.7598 22.0508V18.4961H55.5566V22.0508H53.7598ZM57.2266 22.0508V18.4961H59.0332V22.0508H57.2266ZM60.9766 10.1758V8.53516C61.3411 8.43099 61.5918 8.30729 61.7285 8.16406C61.8717 8.01432 62.0573 7.51628 62.2852 6.66992C62.4089 6.22721 62.5195 5.81055 62.6172 5.41992H64.3359L64.1504 6.03516H78.0176V7.8418H63.6719C63.4896 8.48633 63.2031 9.01042 62.8125 9.41406H78.0176V11.2109H62.0801V9.90234C61.8978 9.98047 61.5299 10.0716 60.9766 10.1758ZM61.0352 14.5898V12.7734H75.2246C76.0384 12.7734 76.6178 12.8874 76.9629 13.1152C77.7507 13.6296 78.1413 14.3034 78.1348 15.1367V19.0723C78.1283 19.5996 78.4245 19.987 79.0234 20.2344V22.0703C78.3073 21.9336 77.7311 21.6536 77.2949 21.2305C76.8717 20.8203 76.5853 20.3613 76.4355 19.8535C76.3639 19.5931 76.3281 19.2057 76.3281 18.6914V15.9082C76.3281 15.472 76.2305 15.14 76.0352 14.9121C75.8398 14.6908 75.5957 14.5801 75.3027 14.5801L61.0352 14.5898Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_214_31" x1="40" y1="28" x2="40" y2="60" gradientUnits="userSpaceOnUse">
+<stop stop-color="#92D4F4"/>
+<stop offset="0.541667" stop-color="#38B4F0"/>
+<stop offset="1" stop-color="#0B618C"/>
+</linearGradient>
+<linearGradient id="paint1_linear_214_31" x1="40.0191" y1="34.9648" x2="40.0191" y2="59.9397" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FABB00"/>
+<stop offset="0.463542" stop-color="#F75001"/>
+<stop offset="1" stop-color="#E90712"/>
+</linearGradient>
+</defs>
+</svg>

gassafetyprogress-web/src/assets/image/zrxk.svg

+<svg width="80" height="60" viewBox="0 0 80 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.0625 7.17773V5.45898H10.8984V7.17773H15.5957C16.5918 7.17773 17.3568 7.3763 17.8906 7.77344C18.5807 8.29427 18.9258 9.00391 18.9258 9.90234L18.916 17.2363C18.916 18.1087 18.7402 18.776 18.3887 19.2383C17.8418 19.9609 17.0312 20.3223 15.957 20.3223H10.8984L10.9082 22.0215L9.0625 22.0117V20.3223H4.42383C3.48633 20.3223 2.78971 20.1888 2.33398 19.9219C1.50716 19.4401 1.09375 18.5254 1.09375 17.1777V10.2734C1.09375 9.27083 1.34766 8.51888 1.85547 8.01758C2.42188 7.45768 3.18685 7.17773 4.15039 7.17773H9.0625ZM9.0625 18.4863V9.01367H4.0918C3.62956 9.01367 3.30729 9.13737 3.125 9.38477C2.99479 9.56706 2.92969 9.85352 2.92969 10.2441V17.0312C2.92969 17.474 2.94596 17.7376 2.97852 17.8223C3.14128 18.2715 3.49935 18.4961 4.05273 18.4961L9.0625 18.4863ZM10.8984 18.4863L15.625 18.4961C16.6016 18.5026 17.0898 18.0924 17.0898 17.2656V10.3809C17.0898 9.82096 16.9792 9.45312 16.7578 9.27734C16.5495 9.11458 16.1979 9.02995 15.7031 9.02344L10.8984 9.00391V18.4863ZM20.9473 22.2656V20.0293C21.4746 19.6842 21.901 19.1178 22.2266 18.3301C22.5391 17.5684 22.6953 16.6634 22.6953 15.6152V5.50781H24.2871V15.7422C24.2871 16.7904 24.4727 17.6986 24.8438 18.4668C25.1628 19.1309 25.5599 19.6419 26.0352 20V21.9434C25.4232 21.6048 24.9219 21.2207 24.5312 20.791C24.1992 20.4264 23.89 19.9674 23.6035 19.4141C23.2259 20.1367 22.7734 20.752 22.2461 21.2598C21.9857 21.5202 21.5527 21.8555 20.9473 22.2656ZM20.9473 16.416V6.15234H22.0215V16.416H20.9473ZM25.0488 16.416V6.15234H26.123V16.416H25.0488ZM26.4062 22.0996V20.4199C26.5885 20.4069 26.709 20.3678 26.7676 20.3027C26.8327 20.2246 26.8652 20.0228 26.8652 19.6973V18.4961H28.6719V19.6094C28.6719 21.1523 27.9167 21.9824 26.4062 22.0996ZM26.582 9.89258V7.98828C26.9857 7.77344 27.2819 7.46745 27.4707 7.07031C27.6335 6.73828 27.7767 6.16536 27.9004 5.35156H29.7363L29.5703 6.16211H30.957C31.6016 6.16211 32.1061 6.28255 32.4707 6.52344C32.6335 6.6276 32.806 6.8099 32.9883 7.07031H34.7559V5.47852H36.6016V7.07031H37.2363V5.78125H38.8086V7.07031H39.0625L39.0527 8.87695H36.6016C36.6341 9.85352 36.6895 10.5697 36.7676 11.0254C36.9629 12.0866 37.3242 13.0664 37.8516 13.9648C38.1445 14.4727 38.5352 15.0228 39.0234 15.6152V17.8906C38.2227 17.2005 37.5651 16.4941 37.0508 15.7715C36.5951 15.1204 36.1589 14.3327 35.7422 13.4082C35.2995 14.5605 34.8405 15.472 34.3652 16.1426C33.929 16.7546 33.3561 17.3405 32.6465 17.9004V15.498C33.3496 14.6647 33.8704 13.7272 34.209 12.6855C34.502 11.7936 34.6875 10.5241 34.7656 8.87695H33.0176C32.4837 11.735 31.8262 13.7826 31.0449 15.0195C30.4004 16.0352 29.5931 16.7904 28.623 17.2852C28.1283 17.5391 27.4577 17.7604 26.6113 17.9492V16.2891C27.1908 16.1328 27.6237 15.9733 27.9102 15.8105C28.2747 15.6087 28.6589 15.2767 29.0625 14.8145H27.041V13.0078H30.166L30.5469 12.0215H27.0117V10.2246H31.0352C31.237 9.44987 31.3379 8.93555 31.3379 8.68164C31.3379 8.41471 31.2728 8.22266 31.1426 8.10547C31.0514 8.03385 30.8105 7.99805 30.4199 7.99805L29.0723 7.98828C28.7402 8.55469 28.3854 8.96484 28.0078 9.21875C27.5846 9.51172 27.1094 9.73633 26.582 9.89258ZM30.2344 22.0508V18.4961H32.041V22.0508H30.2344ZM33.7598 22.0508V18.4961H35.5566V22.0508H33.7598ZM37.2266 22.0508V18.4961H39.0332V22.0508H37.2266ZM41.0449 22.0312V20.6641C41.1882 20.6315 41.2826 20.5892 41.3281 20.5371C41.3542 20.498 41.3737 20.319 41.3867 20V11.4355H42.7637V20.0977C42.7637 21.2826 42.1908 21.9271 41.0449 22.0312ZM41.2305 10.1367V8.33984H47.8809V10.1367H45.4883V22.0703H43.6816V10.1367H41.2305ZM41.2207 7.25586V5.45898H47.8809V7.25586H41.2207ZM46.4062 21.9727V11.4648H47.8711V21.9727H46.4062ZM48.9453 19.0625V17.2656H53.1152V14.0625H49.1309V12.2559H53.1152V9.04297H48.9453V7.23633H50.2344V5.48828H52.0996V7.23633H55.8691V5.48828H57.7441V7.23633H59.0918V9.04297H54.9512V12.2559H58.9355V14.0625H54.9512V17.2656H59.0918V19.0625H54.9512V22.0312H53.1152V19.0625H48.9453ZM60.9863 21.9824V20.3027C61.0059 20.3027 61.0221 20.3027 61.0352 20.3027C61.276 20.3027 61.403 19.987 61.416 19.3555L61.5234 11.5723H63.1641L63.1152 18.6426C63.1087 19.5671 63.0566 20.2051 62.959 20.5566C62.7311 21.3965 62.0736 21.8717 60.9863 21.9824ZM61.1719 10.498V8.7207H63.8672V7.33398H61.2012V5.68359H68.0957V7.33398H65.6738V8.7207H68.1152V10.498H65.6738V22.0508H63.8672V10.498H61.1719ZM66.4746 22.0508V11.5332H68.0078V22.0508H66.4746ZM69.2285 18.8574V16.9922H75.9766V5.43945H77.7832V16.9922H79.0332V18.8574H77.7832V22.0801H75.9766V18.8574H69.2285ZM69.2578 14.0137V12.1191H74.6484V14.0137H69.2578ZM69.2578 8.89648V7.00195H74.6484V8.89648H69.2578Z" fill="white"/>
+<g filter="url(#filter0_i_214_32)">
+<path d="M39.3976 36.2643V28C26.9319 28.5381 23.9391 38.6026 24.0009 43.5676C24.5945 56.0216 34.5127 59.7117 39.3976 60V48.8529L36.2441 43.5676C35.0569 40.3387 37.8518 37.3534 39.3976 36.2643Z" fill="url(#paint0_linear_214_32)"/>
+<path d="M40.3251 29.7297V28C44.4062 28 46.6013 29.0571 47.1887 29.7297H40.3251Z" fill="#0534AD"/>
+<path d="M40.3251 33.7658V31.3634L50.435 31.5556L51.8263 33.0931L40.3251 33.7658Z" fill="#0534AD"/>
+<path d="M40.3251 37.6096V35.015L53.5885 35.5916L54.145 36.7447L40.3251 37.6096Z" fill="#0534AD"/>
+<path d="M42.0874 41.1652L40.9744 38.8589L55.0725 39.3393L55.7218 40.5886L42.0874 41.1652Z" fill="#0534AD"/>
+<path d="M44.0352 44.9129L43.1077 42.991L55.8146 43.4715L56.0001 44.3363L44.0352 44.9129Z" fill="#0534AD"/>
+<path d="M43.1077 48.5646L44.0352 46.7387L55.7218 47.4114L55.258 48.1802L43.1077 48.5646Z" fill="#0534AD"/>
+<path d="M42.3656 50.4865C40.5106 50.4096 40.2324 51.992 40.3251 52.7928L53.403 52.1201L54.145 51.0631C50.9915 50.9029 44.2207 50.5634 42.3656 50.4865Z" fill="#0534AD"/>
+<path d="M40.3251 56.4444L40.6034 54.1381L51.8263 54.7147L50.5278 55.964L40.3251 56.4444Z" fill="#0534AD"/>
+<path d="M40.3251 59.9039V57.8859L47.1887 58.3664C44.9627 59.5964 41.6855 59.9039 40.3251 59.9039Z" fill="#0534AD"/>
+</g>
+<defs>
+<filter id="filter0_i_214_32" x="24" y="28" width="32" height="32.2" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_214_32"/>
+</filter>
+<linearGradient id="paint0_linear_214_32" x1="31.6988" y1="28" x2="31.6988" y2="60" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EDB223"/>
+<stop offset="0.515625" stop-color="#D60501"/>
+<stop offset="1" stop-color="#D60501"/>
+</linearGradient>
+</defs>
+</svg>

gassafetyprogress-web/src/components/bigWindow/Company.vue

+<!--
+ * @Author: your name
+ * @Date: 2022-01-26 20:07:52
+ * @LastEditTime: 2022-03-01 16:17:34
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+
+ * @FilePath: /test/hello-world/src/views/components/deviceA.vue
+-->
+<template>
+  <div class="devicea-wrapper">
+    <div class="title">
+      {{ deviceData.enterpriseName }}
+    </div>
+    <div class="close" @click="close">
+      <img src="@/assets/mapImages/closeBtn.png" alt="" />
+    </div>
+
+    <div class="top flex">
+      <div class="group">
+        <div class="left">企业名称：</div>
+        <div class="right zzz">{{ deviceData.enterpriseName }}</div>
+      </div>
+      <div class="group">
+        <div class="left">法定代表人：</div>
+        <div v-unValue class="right zzz">
+          {{ deviceData.legalRepresentative }}
+        </div>
+      </div>
+      <div class="group">
+        <div class="left">经营区域：</div>
+        <div v-unValue :title="deviceData.deviceAddr" class="right last">
+          {{ deviceData.businessArea }}
+        </div>
+      </div>
+    </div>
+
+    <div class="middle">
+      <div class="left">
+        <div>注册地址：</div>
+      </div>
+      <div v-unValue title="123" class="right">
+        {{ deviceData.registerAddress }}
+      </div>
+    </div>
+
+    <div v-unValue class="foot">
+      {{ deviceData.remarks }}
+    </div>
+  </div>
+</template>
+
+<script>
+import { companyType, deviceType } from "@/utils/mapClass/config.js";
+export default {
+  data() {
+    return {
+      companyType,
+      deviceType,
+      profile: "暂无备注",
+    };
+  },
+  computed: {
+    prodTest() {
+      return this.vueRoot.$store.state.user.systemSetting.prod_test;
+    },
+    company() {
+      return this.vueRoot.$store.state.bigWindowCompany.company;
+    },
+  },
+  mounted() {
+    // 如果不是测试，而是真数据，就要用帧数据的东西
+    if (this.prodTest != "test") {
+      this.companyType = {};
+      this.company.forEach((item) => {
+        this.companyType[item.conpanyId] = item.companyName;
+      });
+    }
+    console.log(this.deviceData);
+  },
+  methods: {
+    close() {
+      this.mapClass.infowindowClose();
+    },
+    btnClick() {
+      this.vueRoot.centerDataFunc(this.deviceData.pressureFlows);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.devicea-wrapper {
+  background-color: rgba(9, 18, 32, 0.6);
+  padding: 10px;
+  position: relative;
+  width: 700px;
+  .title {
+    // padding-top: 10px;
+    // padding-left: 10px;
+    font-size: 14px;
+    line-height: 14px;
+    color: #ffffff;
+  }
+  .close {
+    position: absolute;
+    right: 10px;
+    top: 5px;
+    cursor: pointer;
+  }
+
+  .top {
+    margin-top: 10px;
+    // margin-bottom: 10px;
+    border: 1px solid #cccccc;
+    box-sizing: border-box;
+    .group {
+      height: 30px;
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      box-sizing: border-box;
+      div {
+        flex: 1;
+        box-sizing: border-box;
+        border-right: 1px solid #cccccc;
+        text-align: center;
+        font-size: 14px;
+        color: #ffffff;
+        line-height: 30px;
+        padding: 0 5px;
+        &.last {
+          border-right: none;
+        }
+      }
+      .left {
+        text-align: right;
+        background-color: rgba(255, 255, 255, 0.1);
+      }
+    }
+  }
+  .middle {
+    display: flex;
+    border: 1px solid #cccccc;
+    border-top: none;
+    margin-bottom: 10px;
+
+    & > div {
+      box-sizing: border-box;
+      border-right: 1px solid #cccccc;
+      text-align: center;
+      font-size: 14px;
+      color: #ffffff;
+      line-height: 30px;
+      padding: 0 5px;
+
+      &.left {
+        width: 113px;
+        display: flex;
+        align-items: center;
+        background-color: rgba(255, 255, 255, 0.1);
+        div {
+          text-align: right;
+          flex: 1;
+        }
+      }
+      &.right {
+        border: none;
+        flex: 1;
+        text-align: left;
+        text-indent: 2em;
+        line-height: normal;
+        padding: 5px;
+      }
+    }
+  }
+
+  .foot {
+    width: 100%;
+    padding: 5px;
+    border: 1px solid #ffffff;
+    box-sizing: border-box;
+    font-size: 14px;
+    color: #ffffff;
+    text-indent: 2em;
+    margin-bottom: 10px;
+  }
+
+  .flex {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>

gassafetyprogress-web/src/utils/mapClass/config.js

 /*
  * @Author: your name
  * @Date: 2022-01-26 10:47:44
- * @LastEditTime: 2022-02-28 20:33:47
+ * @LastEditTime: 2022-03-01 16:07:06
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/utils/config.js
@@ -26,6 +26,8 @@ export const svgUrl = {
   4: require("@/assets/image/changzhan1.svg"),
   5: require("@/assets/image/jiankong1.svg"),
   6: require("@/assets/image/user1.svg"),
+  7: require("@/assets/image/zrxk.svg"),
+  8: require("@/assets/image/zcrq.svg"),
 };
 export const svgAlarm = {
   2: require("@/assets/image/tiaoyaxiang1.svg"),

gassafetyprogress-web/src/utils/mapClass/map.js

 /*
  * @Author: your name
  * @Date: 2022-01-11 13:45:12
- * @LastEditTime: 2022-03-01 10:19:55
+ * @LastEditTime: 2022-03-01 16:16:19
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/utils/mapClass.js
@@ -479,11 +479,12 @@ export class EditorMap {
         // 设备过滤受到bigwindow页面的的两种制约，companyArr, typeArr 两个数组制约显示隐藏
         // 燃气没有公司，所以没有device.companyType不收到公司的控制
         const companyHas = companyArr.indexOf(data.companyType + "") >= 0;
-        // 设备存在
+        // 设备存在 受到设备按钮限制
         const deviceHas = typeArr.indexOf(+data.iconType) >= 0;
-        console.log(deviceHas);
+        // 如果是燃气公司的话，不受按钮限制
+        const enterprise = data.iconType ==7 || data.iconType ==8;
         // 必须设备存在数组里，才会显示设备 !data.companyType代表用户不受公司制约
-        if (deviceHas && (companyHas || !data.companyType)) {
+        if ( (deviceHas || enterprise) && (companyHas || !data.companyType)) {
           device.show();
         } else {
           device.hide();
@@ -506,8 +507,8 @@ export class EditorMap {
     // 将旧的值缓存一下
     device.oldData = device.getExtData();
     device.setExtData(obj);
-    // 如果infowindow是打开的，就改变里面的数据
-    if (this.infowindowComponent) {
+    // 如果infowindow是打开的，就改变里面的数据，必须是用户才行
+    if (this.infowindowComponent && this.infowindowComponent.deviceData.iconType==6) {
       this.infowindowComponentChange(obj);
     }
     if (!this.alarmObj[iconType]) {
@@ -546,7 +547,7 @@ export class EditorMap {
           device.setExtData(deviceData);
           device.oldData = null;
           // 如果infowindow是打开的
-          if (this.infowindowComponent) {
+          if (this.infowindowComponent && this.infowindowComponent.deviceData.iconType==6) {
             this.infowindowComponentChange(deviceData);
           }
           // 在arr中删掉

gassafetyprogress-web/src/views/bigWindow/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2022-03-01 09:51:34
+ * @LastEditTime: 2022-03-01 16:08:52
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/views/Home.vue
@@ -152,6 +152,7 @@ import {
   getCz,
   getVideo,
   getUser,
+  getEnterprise,
   userAlarm,
 } from "@/api/bigWindow/getDevice";
 import Line from "@/components/bigWindow/Line.vue";
@@ -160,6 +161,7 @@ import DeviceA from "@/components/bigWindow/DeviceA.vue";
 import User from "@/components/bigWindow/User.vue";
 import Center from "@/components/bigWindow/Center.vue";
 import UserCenter from "@/components/bigWindow/UserCenter.vue";
+import Company from "@/components/bigWindow/Company.vue";
 import PipeColor from "@/components/bigWindow/PipeColor.vue";
 
 // import markerInfoWindow from './components/markerInfoWindow.vue'
@@ -309,6 +311,9 @@ export default {
       this.goMap(getFm, this.addDevice, DeviceA);
       this.goMap(getCz, this.addDevice, DeviceA);
       this.goMap(getVideo, this.addDevice, VideoView);
+      this.goMap(getEnterprise, this.addDevice, Company);
+
+
       // 用户要等一下 因为有报警数据
       this.goMap(detectorUserList, this.addDevice, User).then((res) => {
         // 先查一下，然后开启定时器
@@ -356,7 +361,7 @@ export default {
         let config = {};
         if (Array.isArray(res)) {
           config = { data: res };
-          // 给视频设备的conpanyType变成null
+          // 给视频设备的conpanyType变成null,因为视频不受企业控制
           if (res[0].iconType == 5) {
             res.forEach((item) => {
               item.companyType = null;
@@ -380,7 +385,6 @@ export default {
           // 看看谁告消警
         }
         this.map.relieveAlarm(res.data);
-
       });
     },