设备所属公司添加

huaxin-system/src/main/resources/mapper/system/TScreenStatisticMapper.xml

@@ -108,13 +108,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 设备分类型统计 -->
     <select id="deviceStatisticByType" resultType="Map">
         SELECT
-            COUNT(1) as value,
-            dict.dict_label as name
+                COUNT(1) as value,
+                dict.dict_label as name,
+                (case device.beyond_enterprise_id
+                  when 0 then '唐山华鑫天然气有限公司'
+                  when 1 then '唐山鸿海科技有限公司'
+                  else '默认'
+                end)as beyondCompany
         FROM
-            t_device_info device
+                t_device_info device
         LEFT JOIN sys_dict_data dict ON dict.dict_value = device.device_type AND dict_type = 't_device_type'
         GROUP BY
-            device.device_type
+                device.device_type,device.beyond_enterprise_id
         ORDER BY device.device_type DESC;
     </select>
 

huaxin-web/src/views/baseinfo/deviceinfo/index.vue

@@ -232,6 +232,19 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="所属公司" prop="beyondEnterpriseId">
+              <el-select
+                v-model="form.beyondEnterpriseId"
+                placeholder="请选择所属公司"
+                style="width: 100%"
+              >
+                <el-option label="唐山华鑫天然气有限公司" :value="0" />
+                <el-option label="唐山鸿海科技有限公司" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -351,6 +364,9 @@ export default {
         ],
         installationTime:[
           { required: true, message: "请选择安装时间", trigger: "change" },
+        ],
+        beyondEnterpriseId:[
+          { required: true, message: "请选择所属公司", trigger: "change" },
         ]
       },
       dialogTableVisibles: false,