管道管理

gassafety-web/src/views/device/pipe/index.vue

@@ -479,11 +479,17 @@
       handleDelete(row) {
         row.isDel = "1";
         var devices = " ";
+        var tip = '';
+        if (row.deviceInfoList != null){
           for(var i = 0; i < row.deviceInfoList.length; i++){
             var obj = row.deviceInfoList[i];
             devices = devices + obj.deviceName + " ";
           }
-        this.$confirm('请确认是否删除管道名称为"' + row.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告", {
+          tip = '请确认是否删除管道名称为"' + row.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告"
+        }else{
+          tip ='请确认是否删除管道名称为"' + row.pipeName + '"的数据项';
+        }
+        this.$confirm(tip , {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"

gassafety-web/src/views/device/pipeDetail/index.vue

@@ -332,11 +332,18 @@
       handleDelete(res) {
         res.isDel = "1";
         var devices = " ";
+        var tip = '';
+        if(res.deviceInfoList != null){
           for (var i = 0; i < res.deviceInfoList.length; i++) {
             var obj = res.deviceInfoList[i];
             devices = devices + obj.deviceName + " ";
           }
-        this.$confirm('请确认是否删除管道名称为"' + res.pipeName + '"的数据项，该管道下包含的设备（' + devices + '）将一并被删除', "警告", {
+          tip = '该管道下包含的设备（' + devices + '）将一并被删除', "警告"
+        }else{
+          tip = '请确认是否删除管道名称为"' + res.pipeName + '"的数据项'
+        }
+        
+        this.$confirm(tip, {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"