Merge remote-tracking branch 'origin/master'

gassafetyprogress-system/src/main/resources/mapper/system/PipeInterfaceMapper.xml

@@ -194,7 +194,7 @@
 
     <!--查询 场站/设备 列表信息方法-->
     <select id="selectSensingDevice" resultMap="TAssociatedEquipmentResult">
-      select a.device_code,a.device_name,b.detection_medium,a.linkman,a.phone,c.detector_status,c.alarm_time
+      select b.iot_no device_code,b.device_name device_name,b.detection_medium,a.linkman,a.phone,c.detector_status,c.alarm_time
       from t_device_info a
       left join t_relation_device_detail_info b on a.device_id=b.relation_device_id
       left join t_detector_info c on b.iot_no=c.detector_code

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

@@ -121,7 +121,7 @@ export default {
 };
 </script>
 
-<style lang="scss" >
+<style lang="scss" scoped>
 .myCenter {
   // width: 978px;
   max-height: 600px;

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

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-03-08 15:23:40
+ * @LastEditTime: 2022-03-10 10:33:35
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -105,12 +105,12 @@ export default {
     return {
       companyType,
       deviceType,
-      profile: "暂无",
+      profile: "暂无备注",
       typeList: {
         // 1压力表    2流量计  3探测器
         1: "压力表",
         2: "流量计",
-        3: "探测器",
+        3: "工业探测器",
       },
       list: [
         // {

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

 <!--
  * @Author: your name
  * @Date: 2022-01-26 20:07:52
- * @LastEditTime: 2022-03-08 15:22:20
+ * @LastEditTime: 2022-03-10 10:33:28
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 
@@ -104,12 +104,12 @@ export default {
     return {
       companyType,
       deviceType,
-      profile: "暂无",
+      profile: "暂无备注",
       typeList: {
         // 1压力表    2流量计  3探测器
         1: "压力表",
         2: "流量计",
-        3: "探测器",
+        3: "工业探测器",
       },
       list: [
         // {

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

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2022-03-08 17:27:26
+ * @LastEditTime: 2022-03-10 09:12:48
  * @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
@@ -185,7 +185,7 @@ export default {
   components: {
     leftBar,
     rightBar,
-    Center,
+    // Center,
     UserCenter,
     OtherCenter,
     PipeColor,

gassafetyprogress-web/vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.2.14:8903/gassafety`,
-        // target: `http://222.223.203.154:8092/gassafety`,
+        // target: `http://192.168.2.14:8903/gassafety`,
+        target: `http://222.223.203.154:8092/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''