Browse Source

Merge branch 'master' of http://1.190.195.54:3000/ctf/visualization

Morales 5 months ago
parent
commit
a5e2ab8fe5
2 changed files with 1296 additions and 371 deletions
  1. 1274 366
      heida/pnpm-lock.yaml
  2. 22 5
      heida/src/views/material/index.vue

File diff suppressed because it is too large
+ 1274 - 366
heida/pnpm-lock.yaml


+ 22 - 5
heida/src/views/material/index.vue

@@ -62,11 +62,24 @@ export default {
         align: ['center', 'center', 'center', 'center'],
         headerBGC: '#0b375d',
         header: ['材料名称', '规格', '单位', '数量'],
+        // columnWidth: [300, 140, 60, 100],
         data: [
-
+          ['聚苯板', '容重20kg/m³、B1级。600*600*100mm厚,导热系数不大于0.037w/(m.k),容重20kg/m³,燃烧性能B1级,外墙用', 'm³', '44455.64 '],
+          ['挤塑板', 'B1级、容重30kg/m³。600*1200*60mm厚,导热系数不大于0.030w/(m.k),压缩强度不小于150KPa,燃烧性能B1级,屋面保温用。', 'm³', '15604.13 '],
+          ['岩棉板', '100mm厚岩棉条(竖丝,纤维垂直于墙面),导热系数不大于0.045w/(m.k),容重不小于100kg/m³,外墙防火隔离带用。', 'm3', '5227.87 '],
+          ['TR15岩棉板', 'TR15硬质岩棉板。导热系数不大于0.040w/(m.k),容重不小于140kg/m³,屋面用。500mm宽,120mm厚', 'm3', '1798.25 '],
+          ['玻璃纤维网格布', '160g/㎡,外墙用,耐碱玻纤网', 'm2', '1029237.70 '],
+          ['聚合物胶结料', '分抹面胶、粘结胶两种', 'kg', '3424742.05 '],
+          ['塑料锚栓', '自带压盘直径不小于60mm,膨胀套管直径不小于8mm。配合100mm保温板使用。锚栓有效锚固深度不小于25mm(不包含找平层及饰面层),岩棉板用锚栓配110mm直径的扩压盘(可拆卸的单独圆盘)', '套', '3668952.91 '],
+          ['塑料锚栓', '加长。锚栓有效锚固深度不小于25mm(不包含找平层及饰面层),岩棉板用锚栓配110mm直径的扩压盘(可拆卸的单独圆盘)', '套', '680557.87 '],
+          ['SBS改性沥青防水卷材', '3.0mm厚Ⅱ型', 'm2', '328119.67'],
+          ['SBS改性沥青防水卷材', '页岩保护层、3mm厚Ⅱ型聚酯胎SBS改性沥青防水卷材顶层自带页岩保护层(低温柔度-25°C)', 'm2', '227798.94'],
+          ['SBS弹性沥青防水胶', '', 'kg', '86842.4482'],
+          ['水泥基渗透结晶防水涂料', '', 'kg', '27472.9752'],
           ['复合硅质密实剂', 'JJ91', 'kg', '1041.8715'],
           ['87型雨水口', '参见12J201页A18-1;此型雨水口可安装在钢结构天沟、混凝土天沟上', '座', '240'],
           ['不锈钢排水管', 'Φ108,壁厚不小于2.0mm,含上端接水斗和固定卡具', 'm', '10770'],
+
           ['焊接钢管', 'DN200', 'm', '782'],
           ['焊接钢管', 'DN250', 'm', '276'],
           ['焊接钢管', 'DN70', 'm', '210'],
@@ -91,6 +104,7 @@ export default {
           ['无缝钢管', 'D22×2', 'm', '3'],
           ['无缝钢管', 'φ22×2.5', 'm', '14'],
           ['铝合金方板', '1mm厚哑光暗色铝合金女儿墙压顶(含龙骨)', 'm2', '24000'],
+
           ['密目网', '宽度1.5米,重量2.5斤', 'm2', '786762'],
           ['安全网', '宽度1.5米,重量2.5斤', 'm2', '405547'],
           ['偏口', '1000*500*100', '个', '800'],
@@ -301,6 +315,9 @@ export default {
           ['无缝钢管', 'DN65', 'm', '1536'],
           ['焊接钢管', 'DN100', 'm', '1108'],
           ['PE100聚乙烯给水', 'De90', 'm', '1327']
+          ['复合硅质密实剂', 'JJ91', 'kg', '1041.8715'],
+          ['87型雨水口', '参见12J201页A18-1;此型雨水口可安装在钢结构天沟、混凝土天沟上', '座', '240'],
+          ['不锈钢排水管', 'Φ108,壁厚不小于2.0mm,含上端接水斗和固定卡具', 'm', '10770']
         ]
       },
       chuku_config: {
@@ -322,7 +339,7 @@ export default {
           ['焊接钢管', 'DN100', 'm', '1108'],
           ['无缝钢管', 'DN125', 'm', '37'],
           ['无缝钢管', 'DN80', 'm', '643'],
-          ['无缝钢管', 'DN150', 'm', '5'],
+          ['无缝钢管', 'DN150', 'm', '5']
         ]
       }
     }
@@ -342,7 +359,7 @@ export default {
         data2.push({ value: parseInt(ruku_data[i][3]), name: ruku_data[i][0] })
       }
       for (let i = 0; i < ruku_data.length; i++) {
-        data.push(parseInt(ruku_data[i][3]) / total)
+        data.push((parseInt(ruku_data[i][3]) / total) * 100)
       }
       const chuku_data = this.chuku_config.data
       var data3 = []
@@ -367,7 +384,7 @@ export default {
             textStyle: {
               color: '#fff'
             },
-            formatter: '{value}%'
+            formatter: '{value} %'
           }
         },
         series: [
@@ -416,7 +433,7 @@ export default {
             top: '10%',
             bottom: '5%',
             label: {
-              formatter: '{c}'
+              formatter: '{c}……'
             },
             emphasis: {
               itemStyle: {

Some files were not shown because too many files changed in this diff