Merge branch 'dev_cbx' of http://47.97.161.140:10080/zhangchuang/ocean-engineer into dev_cbx

src/views/WarningSettings/index.vue

@@ -402,7 +402,7 @@ const saveEdit = (row, column) => {
     text-align: center;
     overflow: hidden;
     text-overflow: ellipsis;
-    width: 270px;
+    width: 245px;
     display: block;
     line-height: 9px;
     white-space: nowrap;