1.16

package-lock.json

@@ -1444,6 +1444,11 @@
       "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==",
       "dev": true
     },
+    "@popperjs/core": {
+      "version": "npm:@sxzz/popperjs-es@2.11.7",
+      "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+    },
     "@sideway/address": {
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
@@ -2191,112 +2196,49 @@
       }
     },
     "@vue/compiler-core": {
-      "version": "3.4.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.13.tgz",
-      "integrity": "sha512-zGUdmB3j3Irn9z51GXLJ5s0EAHxmsm5/eXl0y6MBaajMeOAaiT4+zaDoxui4Ets98dwIRr8BBaqXXHtHSfm+KA==",
+      "version": "3.4.14",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.14.tgz",
+      "integrity": "sha512-ro4Zzl/MPdWs7XwxT7omHRxAjMbDFRZEEjD+2m3NBf8YzAe3HuoSEZosXQo+m1GQ1G3LQ1LdmNh1RKTYe+ssEg==",
       "requires": {
         "@babel/parser": "^7.23.6",
-        "@vue/shared": "3.4.13",
+        "@vue/shared": "3.4.14",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.0.2"
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.4.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.13.tgz",
-      "integrity": "sha512-XSNbpr5Rs3kCfVAmBqMu/HDwOS+RL6y28ZZjDlnDUuf146pRWt2sQkwhsOYc9uu2lxjjJy2NcyOkK7MBLVEc7w==",
+      "version": "3.4.14",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.14.tgz",
+      "integrity": "sha512-nOZTY+veWNa0DKAceNWxorAbWm0INHdQq7cejFaWM1WYnoNSJbSEKYtE7Ir6lR/+mo9fttZpPVI9ZFGJ1juUEQ==",
       "requires": {
-        "@vue/compiler-core": "3.4.13",
-        "@vue/shared": "3.4.13"
+        "@vue/compiler-core": "3.4.14",
+        "@vue/shared": "3.4.14"
       }
     },
     "@vue/compiler-sfc": {
-<<<<<<< HEAD
-      "version": "3.4.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.13.tgz",
-      "integrity": "sha512-SkpmQN8xIFBd5onT413DFSDdjxULJf6jmJg/t3w/DZ9I8ZzyNlLIBLO0qFLewVHyHCiAgpPZlWqSRZXYrawk3Q==",
-      "requires": {
-        "@babel/parser": "^7.23.6",
-        "@vue/compiler-core": "3.4.13",
-        "@vue/compiler-dom": "3.4.13",
-        "@vue/compiler-ssr": "3.4.13",
-        "@vue/shared": "3.4.13",
-=======
-      "version": "3.4.5",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.5.tgz",
-      "integrity": "sha512-jauvkDuSSUbP0ebhfNqljhShA90YEfX/0wZ+w40oZF43IjGyWYjqYaJbvMJwGOd+9+vODW6eSvnk28f0SGV7OQ==",
-      "dev": true,
+      "version": "3.4.14",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.14.tgz",
+      "integrity": "sha512-1vHc9Kv1jV+YBZC/RJxQJ9JCxildTI+qrhtDh6tPkR1O8S+olBUekimY0km0ZNn8nG1wjtFAe9XHij+YLR8cRQ==",
       "requires": {
         "@babel/parser": "^7.23.6",
-        "@vue/compiler-core": "3.4.5",
-        "@vue/compiler-dom": "3.4.5",
-        "@vue/compiler-ssr": "3.4.5",
-        "@vue/shared": "3.4.5",
->>>>>>> e77a1a678e920f1c41d2e04743ec4232b72ae6ff
+        "@vue/compiler-core": "3.4.14",
+        "@vue/compiler-dom": "3.4.14",
+        "@vue/compiler-ssr": "3.4.14",
+        "@vue/shared": "3.4.14",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.5",
-        "postcss": "^8.4.32",
+        "postcss": "^8.4.33",
         "source-map-js": "^1.0.2"
-<<<<<<< HEAD
-=======
-      },
-      "dependencies": {
-        "@vue/compiler-core": {
-          "version": "3.4.5",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.5.tgz",
-          "integrity": "sha512-Daka7P1z2AgKjzuueWXhwzIsKu0NkLB6vGbNVEV2iJ8GJTrzraZo/Sk4GWCMRtd/qVi3zwnk+Owbd/xSZbwHtQ==",
-          "dev": true,
-          "requires": {
-            "@babel/parser": "^7.23.6",
-            "@vue/shared": "3.4.5",
-            "entities": "^4.5.0",
-            "estree-walker": "^2.0.2",
-            "source-map-js": "^1.0.2"
-          }
-        },
-        "@vue/compiler-dom": {
-          "version": "3.4.5",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.5.tgz",
-          "integrity": "sha512-J8YlxknJVd90SXFJ4HwGANSAXsx5I0lK30sO/zvYV7s5gXf7gZR7r/1BmZ2ju7RGH1lnc6bpBc6nL61yW+PsAQ==",
-          "dev": true,
-          "requires": {
-            "@vue/compiler-core": "3.4.5",
-            "@vue/shared": "3.4.5"
-          }
-        },
-        "@vue/compiler-ssr": {
-          "version": "3.4.5",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.5.tgz",
-          "integrity": "sha512-DDdEcDzj2lWTMfUMMtEpLDhURai9LhM0zSZ219jCt7b2Vyl0/jy3keFgCPMitG0V1S1YG4Cmws3lWHWdxHQOpg==",
-          "dev": true,
-          "requires": {
-            "@vue/compiler-dom": "3.4.5",
-            "@vue/shared": "3.4.5"
-          }
-        },
-        "@vue/shared": {
-          "version": "3.4.5",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.5.tgz",
-          "integrity": "sha512-6XptuzlMvN4l4cDnDw36pdGEV+9njYkQ1ZE0Q6iZLwrKefKaOJyiFmcP3/KBDHbt72cJZGtllAc1GaHe6XGAyg==",
-          "dev": true
-        },
-        "entities": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-          "dev": true
-        }
->>>>>>> e77a1a678e920f1c41d2e04743ec4232b72ae6ff
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.4.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.13.tgz",
-      "integrity": "sha512-rwnw9SVBgD6eGKh8UucnwztieQo/R3RQrEGpE0b0cxb2xxvJeLs/fe7DoYlhEfaSyzM/qD5odkK87hl3G3oW+A==",
+      "version": "3.4.14",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.14.tgz",
+      "integrity": "sha512-bXT6+oAGlFjTYVOTtFJ4l4Jab1wjsC0cfSfOe2B4Z0N2vD2zOBSQ9w694RsCfhjk+bC2DY5Gubb1rHZVii107Q==",
       "requires": {
-        "@vue/compiler-dom": "3.4.13",
-        "@vue/shared": "3.4.13"
+        "@vue/compiler-dom": "3.4.14",
+        "@vue/shared": "3.4.14"
       }
     },
     "@vue/component-compiler-utils": {
@@ -2362,64 +2304,58 @@
       "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA=="
     },
     "@vue/reactivity": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.13.tgz",
-      "integrity": "sha512-j3ByCiRgrr4uEZpXJM8XowrbYKeNHMHlbmMZE/2QpVzVPIfrQWS2fpLmbchJeMrnwIrzEl+dub3hgwkV4KRn4w==",
+      "version": "3.2.26",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.26.tgz",
+      "integrity": "sha512-h38bxCZLW6oFJVDlCcAiUKFnXI8xP8d+eO0pcDxx+7dQfSPje2AO6M9S9QO6MrxQB7fGP0DH0dYQ8ksf6hrXKQ==",
       "dev": true,
       "requires": {
-        "@vue/shared": "3.2.13"
+        "@vue/shared": "3.2.26"
       },
       "dependencies": {
         "@vue/shared": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz",
-          "integrity": "sha512-F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.26.tgz",
+          "integrity": "sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==",
           "dev": true
         }
       }
     },
-    "@vue/ref-transform": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.13.tgz",
-      "integrity": "sha512-q6GXHZFzXjpx1K3UFRF8fa+xSmD9xV/FjhGzTNnfrryBr8tBUNYgP2f0s5K5N+21Ay7+MlQ1XXMUp8McGvsryQ==",
+    "@vue/reactivity-transform": {
+      "version": "3.2.26",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.26.tgz",
+      "integrity": "sha512-XKMyuCmzNA7nvFlYhdKwD78rcnmPb7q46uoR00zkX6yZrUmcCQ5OikiwUEVbvNhL5hBJuvbSO95jB5zkUon+eQ==",
       "dev": true,
       "requires": {
-        "@babel/parser": "^7.15.0",
-        "@vue/compiler-core": "3.2.13",
-        "@vue/shared": "3.2.13",
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.26",
+        "@vue/shared": "3.2.26",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7"
       },
       "dependencies": {
-<<<<<<< HEAD
         "@vue/compiler-core": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.13.tgz",
-          "integrity": "sha512-H8MUuKVCfAT6C0vth/+1LAriKnM+RTFo/5MoFycwRPwworTvkpWq/EuGoIXdLBblo8Y2/bNsOmIBEEoOtrb/bQ==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.26.tgz",
+          "integrity": "sha512-N5XNBobZbaASdzY9Lga2D9Lul5vdCIOXvUMd6ThcN8zgqQhPKfCV+wfAJNNJKQkSHudnYRO2gEB+lp0iN3g2Tw==",
           "dev": true,
           "requires": {
-            "@babel/parser": "^7.15.0",
-            "@vue/shared": "3.2.13",
+            "@babel/parser": "^7.16.4",
+            "@vue/shared": "3.2.26",
             "estree-walker": "^2.0.2",
             "source-map": "^0.6.1"
           }
         },
         "@vue/shared": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz",
-          "integrity": "sha512-F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.26.tgz",
+          "integrity": "sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==",
           "dev": true
         },
-=======
->>>>>>> e77a1a678e920f1c41d2e04743ec4232b72ae6ff
         "magic-string": {
           "version": "0.25.9",
           "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
           "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-<<<<<<< HEAD
           "dev": true,
-=======
->>>>>>> e77a1a678e920f1c41d2e04743ec4232b72ae6ff
           "requires": {
             "sourcemap-codec": "^1.4.8"
           }
@@ -2427,96 +2363,96 @@
       }
     },
     "@vue/runtime-core": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.13.tgz",
-      "integrity": "sha512-VQedL9Wa7yWMPVDrIkxzLCm6cWCDBoXcXc+jrsOJkqpWhEeA7+zGOsDsHzhLH8aaJD6vdnUR5Cy0EKvoJDqEWQ==",
+      "version": "3.2.26",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.26.tgz",
+      "integrity": "sha512-BcYi7qZ9Nn+CJDJrHQ6Zsmxei2hDW0L6AB4vPvUQGBm2fZyC0GXd/4nVbyA2ubmuhctD5RbYY8L+5GUJszv9mQ==",
       "dev": true,
       "requires": {
-        "@vue/reactivity": "3.2.13",
-        "@vue/shared": "3.2.13"
+        "@vue/reactivity": "3.2.26",
+        "@vue/shared": "3.2.26"
       },
       "dependencies": {
         "@vue/shared": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz",
-          "integrity": "sha512-F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.26.tgz",
+          "integrity": "sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==",
           "dev": true
         }
       }
     },
     "@vue/runtime-dom": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.13.tgz",
-      "integrity": "sha512-DVG+ItkrnCOEa9HSrmGBTLwv/gBVYCO8wkm/yv+d5ChoTnyIILxP0oCiZEPJsgWZfUSRPNi5rXozwo7F99MiwQ==",
+      "version": "3.2.26",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.26.tgz",
+      "integrity": "sha512-dY56UIiZI+gjc4e8JQBwAifljyexfVCkIAu/WX8snh8vSOt/gMSEGwPRcl2UpYpBYeyExV8WCbgvwWRNt9cHhQ==",
       "dev": true,
       "requires": {
-        "@vue/runtime-core": "3.2.13",
-        "@vue/shared": "3.2.13",
+        "@vue/runtime-core": "3.2.26",
+        "@vue/shared": "3.2.26",
         "csstype": "^2.6.8"
       },
       "dependencies": {
         "@vue/shared": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz",
-          "integrity": "sha512-F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.26.tgz",
+          "integrity": "sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==",
           "dev": true
         }
       }
     },
     "@vue/server-renderer": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.13.tgz",
-      "integrity": "sha512-KI+JFV+vRb95+Jb6IwRRm4Vhvj8wrJTNs+OlATfqwwIRpBGAyxn/4knDJYzlnUf/mrKAkrbw751mHhi+pEwILQ==",
+      "version": "3.2.26",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.26.tgz",
+      "integrity": "sha512-Jp5SggDUvvUYSBIvYEhy76t4nr1vapY/FIFloWmQzn7UxqaHrrBpbxrqPcTrSgGrcaglj0VBp22BKJNre4aA1w==",
       "dev": true,
       "requires": {
-        "@vue/compiler-ssr": "3.2.13",
-        "@vue/shared": "3.2.13"
+        "@vue/compiler-ssr": "3.2.26",
+        "@vue/shared": "3.2.26"
       },
       "dependencies": {
         "@vue/compiler-core": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.13.tgz",
-          "integrity": "sha512-H8MUuKVCfAT6C0vth/+1LAriKnM+RTFo/5MoFycwRPwworTvkpWq/EuGoIXdLBblo8Y2/bNsOmIBEEoOtrb/bQ==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.26.tgz",
+          "integrity": "sha512-N5XNBobZbaASdzY9Lga2D9Lul5vdCIOXvUMd6ThcN8zgqQhPKfCV+wfAJNNJKQkSHudnYRO2gEB+lp0iN3g2Tw==",
           "dev": true,
           "requires": {
-            "@babel/parser": "^7.15.0",
-            "@vue/shared": "3.2.13",
+            "@babel/parser": "^7.16.4",
+            "@vue/shared": "3.2.26",
             "estree-walker": "^2.0.2",
             "source-map": "^0.6.1"
           }
         },
         "@vue/compiler-dom": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.13.tgz",
-          "integrity": "sha512-5+2dYgQyNzM97EEgbdAusUpLjulcKkvLM26jOGpd14+qwEcW/KCnns5DGjlZD/tsdEwToOoTDCm+mjx7cO/G1Q==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.26.tgz",
+          "integrity": "sha512-smBfaOW6mQDxcT3p9TKT6mE22vjxjJL50GFVJiI0chXYGU/xzC05QRGrW3HHVuJrmLTLx5zBhsZ2dIATERbarg==",
           "dev": true,
           "requires": {
-            "@vue/compiler-core": "3.2.13",
-            "@vue/shared": "3.2.13"
+            "@vue/compiler-core": "3.2.26",
+            "@vue/shared": "3.2.26"
           }
         },
         "@vue/compiler-ssr": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.13.tgz",
-          "integrity": "sha512-ZbO6uDhUWTdKBRguYNEZXj2FU3nh1cudoHBiidbxj9q5J0tVT+j1PSVFAXPq6SquUBdJpa4HvGkQ5kQzv6upXg==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.26.tgz",
+          "integrity": "sha512-2mywLX0ODc4Zn8qBoA2PDCsLEZfpUGZcyoFRLSOjyGGK6wDy2/5kyDOWtf0S0UvtoyVq95OTSGIALjZ4k2q/ag==",
           "dev": true,
           "requires": {
-            "@vue/compiler-dom": "3.2.13",
-            "@vue/shared": "3.2.13"
+            "@vue/compiler-dom": "3.2.26",
+            "@vue/shared": "3.2.26"
           }
         },
         "@vue/shared": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz",
-          "integrity": "sha512-F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.26.tgz",
+          "integrity": "sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==",
           "dev": true
         }
       }
     },
     "@vue/shared": {
-      "version": "3.4.13",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.13.tgz",
-      "integrity": "sha512-56crFKLPpzk85WXX1L1c0QzPOuoapWlPVys8eMG8kkRmqdMjWUqK8KpFdE2d7BQA4CEbXwyyHPq6MpFr8H9rcg=="
+      "version": "3.4.14",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.14.tgz",
+      "integrity": "sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q=="
     },
     "@vue/vue-loader-v15": {
       "version": "npm:vue-loader@15.11.1",
@@ -2536,27 +2472,6 @@
           "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
           "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
           "dev": true
-        }
-      }
-    },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.11.1",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
-      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-          "dev": true
         },
         "json5": {
           "version": "1.0.2",
@@ -4265,13 +4180,6 @@
         "lodash-unified": "^1.0.2",
         "memoize-one": "^6.0.0",
         "normalize-wheel-es": "^1.2.0"
-      },
-      "dependencies": {
-        "@popperjs/core": {
-          "version": "npm:@sxzz/popperjs-es@2.11.7",
-          "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-          "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
-        }
       }
     },
     "emoji-regex": {
@@ -4679,7 +4587,7 @@
     },
     "estree-walker": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
     },
     "esutils": {
@@ -6165,10 +6073,6 @@
       "version": "0.30.5",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
       "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-<<<<<<< HEAD
-=======
-      "dev": true,
->>>>>>> e77a1a678e920f1c41d2e04743ec4232b72ae6ff
       "requires": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
       }
@@ -8576,106 +8480,79 @@
       "dev": true
     },
     "vue": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.13.tgz",
-      "integrity": "sha512-raTGvLXXTdMxrhQKY1r1YFXZMmjbjTe7QHBW9EU4CgCBhq8DbgyLqgILcSUZmeFyazk5WY7a7xu0VYmHElf4lA==",
+      "version": "3.2.26",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.26.tgz",
+      "integrity": "sha512-KD4lULmskL5cCsEkfhERVRIOEDrfEL9CwAsLYpzptOGjaGFNWo3BQ9g8MAb7RaIO71rmVOziZ/uEN/rHwcUIhg==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
-        "@vue/compiler-dom": "3.2.13",
-        "@vue/compiler-sfc": "3.2.13",
-        "@vue/runtime-dom": "3.2.13",
-        "@vue/server-renderer": "3.2.13",
-        "@vue/shared": "3.2.13"
+        "@vue/compiler-dom": "3.2.26",
+        "@vue/compiler-sfc": "3.2.26",
+        "@vue/runtime-dom": "3.2.26",
+        "@vue/server-renderer": "3.2.26",
+        "@vue/shared": "3.2.26"
       },
       "dependencies": {
         "@vue/compiler-core": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.13.tgz",
-          "integrity": "sha512-H8MUuKVCfAT6C0vth/+1LAriKnM+RTFo/5MoFycwRPwworTvkpWq/EuGoIXdLBblo8Y2/bNsOmIBEEoOtrb/bQ==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.26.tgz",
+          "integrity": "sha512-N5XNBobZbaASdzY9Lga2D9Lul5vdCIOXvUMd6ThcN8zgqQhPKfCV+wfAJNNJKQkSHudnYRO2gEB+lp0iN3g2Tw==",
           "dev": true,
           "requires": {
-            "@babel/parser": "^7.15.0",
-            "@vue/shared": "3.2.13",
+            "@babel/parser": "^7.16.4",
+            "@vue/shared": "3.2.26",
             "estree-walker": "^2.0.2",
             "source-map": "^0.6.1"
           }
         },
         "@vue/compiler-dom": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.13.tgz",
-          "integrity": "sha512-5+2dYgQyNzM97EEgbdAusUpLjulcKkvLM26jOGpd14+qwEcW/KCnns5DGjlZD/tsdEwToOoTDCm+mjx7cO/G1Q==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.26.tgz",
+          "integrity": "sha512-smBfaOW6mQDxcT3p9TKT6mE22vjxjJL50GFVJiI0chXYGU/xzC05QRGrW3HHVuJrmLTLx5zBhsZ2dIATERbarg==",
           "dev": true,
           "requires": {
-            "@vue/compiler-core": "3.2.13",
-            "@vue/shared": "3.2.13"
+            "@vue/compiler-core": "3.2.26",
+            "@vue/shared": "3.2.26"
           }
         },
         "@vue/compiler-sfc": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.13.tgz",
-          "integrity": "sha512-3j970d969aOILykcTstdihP33xH1Onm0wsvcl+rGv9AGxivB9xicRxBw93HCIA4dAPivr42WjHEoci9q2/85uw==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.26.tgz",
+          "integrity": "sha512-ePpnfktV90UcLdsDQUh2JdiTuhV0Skv2iYXxfNMOK/F3Q+2BO0AulcVcfoksOpTJGmhhfosWfMyEaEf0UaWpIw==",
           "dev": true,
-          "requires": {
-            "@babel/parser": "^7.15.0",
-            "@vue/compiler-core": "3.2.13",
-            "@vue/compiler-dom": "3.2.13",
-            "@vue/compiler-ssr": "3.2.13",
-            "@vue/ref-transform": "3.2.13",
-            "@vue/shared": "3.2.13",
-=======
-        "@vue/compiler-dom": "3.2.36",
-        "@vue/compiler-sfc": "3.2.36",
-        "@vue/runtime-dom": "3.2.36",
-        "@vue/server-renderer": "3.2.36",
-        "@vue/shared": "3.2.36"
-      },
-      "dependencies": {
-        "@vue/compiler-sfc": {
-          "version": "3.2.36",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz",
-          "integrity": "sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==",
           "requires": {
             "@babel/parser": "^7.16.4",
-            "@vue/compiler-core": "3.2.36",
-            "@vue/compiler-dom": "3.2.36",
-            "@vue/compiler-ssr": "3.2.36",
-            "@vue/reactivity-transform": "3.2.36",
-            "@vue/shared": "3.2.36",
->>>>>>> e77a1a678e920f1c41d2e04743ec4232b72ae6ff
+            "@vue/compiler-core": "3.2.26",
+            "@vue/compiler-dom": "3.2.26",
+            "@vue/compiler-ssr": "3.2.26",
+            "@vue/reactivity-transform": "3.2.26",
+            "@vue/shared": "3.2.26",
             "estree-walker": "^2.0.2",
             "magic-string": "^0.25.7",
             "postcss": "^8.1.10",
             "source-map": "^0.6.1"
           }
         },
-<<<<<<< HEAD
         "@vue/compiler-ssr": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.13.tgz",
-          "integrity": "sha512-ZbO6uDhUWTdKBRguYNEZXj2FU3nh1cudoHBiidbxj9q5J0tVT+j1PSVFAXPq6SquUBdJpa4HvGkQ5kQzv6upXg==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.26.tgz",
+          "integrity": "sha512-2mywLX0ODc4Zn8qBoA2PDCsLEZfpUGZcyoFRLSOjyGGK6wDy2/5kyDOWtf0S0UvtoyVq95OTSGIALjZ4k2q/ag==",
           "dev": true,
           "requires": {
-            "@vue/compiler-dom": "3.2.13",
-            "@vue/shared": "3.2.13"
+            "@vue/compiler-dom": "3.2.26",
+            "@vue/shared": "3.2.26"
           }
         },
         "@vue/shared": {
-          "version": "3.2.13",
-          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.13.tgz",
-          "integrity": "sha512-F/gs3kHQ8Xeo24F6EImOvBiIoYQsBjF9qoLzvk+LHxYN6ZhIDEL1NWrBFYzdFQ7NphjEYd4EvPZ+Qee+WX8P6w==",
+          "version": "3.2.26",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.26.tgz",
+          "integrity": "sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==",
           "dev": true
         },
-=======
->>>>>>> e77a1a678e920f1c41d2e04743ec4232b72ae6ff
         "magic-string": {
           "version": "0.25.9",
           "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
           "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-<<<<<<< HEAD
           "dev": true,
-=======
->>>>>>> e77a1a678e920f1c41d2e04743ec4232b72ae6ff
           "requires": {
             "sourcemap-codec": "^1.4.8"
           }
@@ -8763,7 +8640,7 @@
     },
     "vue-hot-reload-api": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
       "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
       "dev": true
     },

package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@kitware/vtk.js": "^29.3.0",
-    "@vue/compiler-sfc": "^3.4.13",
+    "@vue/compiler-sfc": "^3.4.14",
     "axios": "^1.6.3",
     "core-js": "^3.8.3",
     "element-plus": "^2.5.1",
@@ -30,7 +30,7 @@
     "eslint": "^5.15.3",
     "eslint-plugin-vue": "^8.0.3",
     "html-webpack-plugin": "^5.6.0",
-    "vue": "^3.2.13"
+    "vue": "^3.2.26"
   },
   "eslintConfig": {
     "root": true,

src/utils/request.js

@@ -154,9 +154,10 @@ function getParams(params, channelNo) {
 // 请求
 const request = (params, channelNo = 'service', method = 'post') => {
   let url = getUrl(channelNo);//完善请求url
+  console.log(url);
   params = getParams(params, channelNo);//配置上行报文公共包头
   return new Promise((resolve, reject) => {
-    if (method == 'post') {
+    if (method == 'post') {//'http://192.168.131:8187/TransServlet'
       axios.post(url, params).then(res => {
         resolve(res)
       }).catch(err => {

src/view/evolutionView.vue

@@ -18,12 +18,12 @@
        @tab-click="handleClick"
      >
      <!-- 火灾 -->
-       <el-tab-pane label="火灾" name="111">
+       <el-tab-pane label="火灾" name="Fire">
          <div class="demo-input-suffix firsttitle">
            <el-form-item label="火灾源" label-width="formLabelWidth5">
          <el-input  v-model="input2"
            class="w-50 m-2"
-           placeholder="节点名称"
+           placeholder="管道名称"
            :prefix-icon="Search"   />
        </el-form-item>
        <div class="btn2">
@@ -34,21 +34,21 @@
        <el-button type="success">开始演化</el-button></div>
      </div>
    <!-- table表 -->
-   <el-table :data="tableData" style="width: 100%">
-       <el-table-column fixed prop="date" label="时间序列名" width="100" />
-       <el-table-column prop="name" label="节点名称" width="80" />
-       <el-table-column prop="state" label="值" width="90" />
+   <div class="btn2" style="text-align: right;">
+       <el-button @click="newaddshow=true">新建</el-button>
+     </div>
+   <el-table :data="tableData"  :max-height="tableHeight"  @row-click="rowclick"  style="width: 100%" >
+       <el-table-column property="sid" label="编号" width="60"/>
+       <el-table-column property="pname" label="管道名称"/>
+       <el-table-column property="pid" label="管道编号" width="80" />
+       <el-table-column property="site" label="位置"/>
        <el-table-column label="操作" width="220">
-     
          <template #default="scope">
-           <el-button size="small" @click="handleEdit(scope.$index, scope.row)"
-             >添加</el-button
-           >
            <el-button
              size="small"
              type="success"
-             @click="handleDelete(scope.$index, scope.row)"
-             >Delete</el-button
+             @click="handlexiugai(scope.$index, scope.row)"
+             >修改</el-button
            >
            <el-button
              size="small"
@@ -59,59 +59,64 @@
          </template>
        </el-table-column>
      </el-table>
-     <div class="demo-pagination-block">
-    <!-- <div class="demonstration">All combined</div> -->
-    <!-- <el-pagination
-      v-model:current-page="currentPage4"
-      v-model:page-size="pageSize4"
-      :page-sizes="[4, 8, 16, 50]"
-      :small="small"
-      :disabled="disabled"
-      :background="background"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="400"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    /> -->
-    <el-pagination
-    v-model:current-page="currentPage4"
-      v-model:page-size="pageSize4"
-      :page-sizes="[100, 200, 300, 400]"
-    small
-    background
-    layout="prev, pager, next, jumpe,"      
-    :total="total"
-    class="mt-4"
-    @size-change="handleSizeChange"
-    @current-change="handleCurrentChange"
-  />
-  </div>
+     <div v-show="newaddshow">
+     <div class="demo-input-suffix firsttitle magintop">
+         <el-form-item label="管道名称" :label-width="formLabelWidth5">
+       <el-input  v-model="selectstr"
+         class="w-50 m-2"
+         placeholder="管道名称"
+         :prefix-icon="Search"   />
+     </el-form-item>
+     <div class="btn2">
+     <el-button type="primary"  @click="fireclick(); dialogVisiblenode = true;selenum=1">选择管道</el-button></div>
+     </div>
      <div class="input">
-     <el-form-item label="时间序列名" :label-width="formLabelWidth5">
-         <el-input  v-model="input2"
+     <el-form-item label="位置" :label-width="formLabelWidth5">
+         <el-input-number v-model="source.site" :min="0" :max="1" 
+         :precision="2" :step="0.1"
+         controls-position="right"
            class="w-50 m-2"
-           placeholder="节点名称"
+           placeholder="位置"
            />
        </el-form-item>
      </div>
-       <div class="demo-input-suffix firsttitle">
-         
-           <el-form-item label="节点名称" :label-width="formLabelWidth5">
-         <el-input  v-model="input3"
-           class="w-50 m-2"
-           placeholder="节点名称"
-           :prefix-icon="Search"   />
-       </el-form-item>
-       <div class="btn2">
-       <el-button type="primary"  @click="dialogVisiblenode = true;selenum=1">选择节点</el-button></div>
-       </div>
-       <div class="input " style="margin-top: -2px;">
+     <el-button type="primary"  @click="handleEditfire()">保存</el-button>
+    </div>
+       <!-- <div class="input " style="margin-top: -2px;">
          <el-form-item  label="值"  :label-width="formLabelWidth5" >
          <el-input v-model="des1" :autosize="{ minRows: 5, maxRows: 10}" type="textarea" />
        </el-form-item>
      </div>
-   
-   
+    -->
+    <div>
+    <h2 style="text-align: left;">灾情源检查表</h2>
+    <div class="btn2" style="text-align: right;">
+       <el-button >新建</el-button>
+     </div>
+  </div>
+    <el-table :data="tableDatafir"   @row-click="rowclick"  style="width: 100%" >
+       <el-table-column property="timeline" label="时间线" width="100"/>
+       <el-table-column property="val1" label="v1"/>
+       <el-table-column property="val2" label="v2" width="80" />
+       <el-table-column property="val3" label="v3"/>
+       <el-table-column property="val4" label="v3"/>
+       <el-table-column label="操作" width="220">
+         <template #default="scope">
+           <el-button
+             size="small"
+             type="success"
+             @click="handlexiugai(scope.$index, scope.row)"
+             >修改</el-button
+           >
+           <el-button
+             size="small"
+             type="danger"
+             @click="handleDelete(scope.$index, scope.row)"
+             >删除</el-button
+           >
+         </template>
+       </el-table-column>
+     </el-table>
        </el-tab-pane>
          <!-- 选择节点弹出框 -->
        <el-dialog
@@ -121,12 +126,14 @@
      >
      <div class="demo-input-suffix firsttitle">
            <el-form-item label="节点选择" :label-width="formLabelWidth5">
-         <el-input  v-model="input2"
+         <el-input  v-model="searchtaggd"
            class="w-50 m-2"
-           placeholder="节点名称"
+           placeholder="管道名称"
            :prefix-icon="Search"   />
        </el-form-item>
        <div class="btn2">
+       <el-button type="success" @click="searchgd">搜索</el-button></div>
+       <div class="btn2">
        <el-button type="success">导入</el-button></div>
      
      </div>
@@ -134,19 +141,41 @@
        ref="multipleTableRef"
        :data="tableData2"
        style="width: 100%"
+       highlight-current-row
        @selection-change="handleSelectionChange"
+       @select="projectsSelectionSelect"
      >
        <el-table-column type="selection" width="55" />
        <!-- <el-table-column label="Date" width="120">
        <template #default="scope">{{ scope.row.date }}</template>
        </el-table-column> -->
-       <el-table-column type="index" width="50" />
-       <el-table-column property="name" label="名称" width="120" />
-       <el-table-column property="chuk" label="位置坐标"/>
-       <el-table-column property="chuk" label="出口"/>
-       <el-table-column property="w1" label="初始水位(升)" width="120"/>
-       <el-table-column property="w2" label="初始温度（K）" width="120"/>
+       <el-table-column property="snId" label="开始节点"/>
+       <el-table-column property="enId" label="结束节点"/>
+       <el-table-column property="id" label="编号" width="70"/>
+       <el-table-column property="name" label="名称" width="70"/>
+       <el-table-column property="sectionType" label="截面类型" width="120"/>
+       <el-table-column property="roughCoe" label="粗糙系数"/>
+       <el-table-column property="sectionPara1" label="截面参数1" width="90"/>
+       <el-table-column property="sectionPara2" label="截面参数2" width="90" />
+       <el-table-column property="sectionPara3" label="截面参数3" width="90"/>
+       <el-table-column property="sectionPara4" label="截面参数4" width="90"/>
+       <el-table-column property="sectionPara5" label="截面参数5" width="90"/>
+       
      </el-table>
+       <div class="demo-pagination-block">
+    <el-pagination
+    v-model:current-page="currentPage4"
+      v-model:page-size="pageSize4"
+    
+    small
+    background
+    layout="prev, pager, next, jumpe,"      
+    :total="total"
+    class="mt-4"
+    @size-change="handleSizeChange"
+    @current-change="handleCurrentChange"
+  />
+  </div>
        <template #footer>
          <span class="dialog-footer">
            <el-button @click="dialogVisiblenode = false">取消</el-button>
@@ -157,7 +186,7 @@
        </template>
      </el-dialog>
        <!--水灾  -->
-       <el-tab-pane label="水灾" name="222" >
+       <el-tab-pane label="水灾" name="Water" >
          <div class="demo-input-suffix firsttitle">
            <el-form-item label="突水源" label-width="formLabelWidth5">
          <el-input  v-model="input4"
@@ -171,21 +200,21 @@
        <el-button type="success">开始演化</el-button></div>
      </div>
    <!-- table表 -->
-   <el-table :data="tableData" style="width: 100%">
-       <el-table-column fixed prop="date" label="时间序列名" width="100" />
-       <el-table-column prop="name" label="节点名称" width="80" />
-       <el-table-column prop="state" label="值" width="90" />
+   <div class="btn2" style="text-align: right;">
+       <el-button @click="newaddshow=true">新建</el-button>
+     </div>
+   <el-table :data="tableDataw"   @row-click="rowclick"  style="width: 100%" >
+       <el-table-column property="sid" label="编号" width="60"/>
+       <el-table-column property="pname" label="管道名称"/>
+       <el-table-column property="pid" label="管道编号" width="80" />
+       <el-table-column property="site" label="位置"/>
        <el-table-column label="操作" width="220">
-     
          <template #default="scope">
-           <el-button size="small" @click="handleEdit(scope.$index, scope.row)"
-             >添加</el-button
-           >
            <el-button
              size="small"
              type="success"
-             @click="handleDelete(scope.$index, scope.row)"
-             >Delete</el-button
+             @click="handlexiugai(scope.$index, scope.row)"
+             >修改</el-button
            >
            <el-button
              size="small"
@@ -196,30 +225,36 @@
          </template>
        </el-table-column>
      </el-table>
+     <div v-show="newaddshow">
+     <div class="demo-input-suffix firsttitle magintop">
+         <el-form-item label="管道名称" :label-width="formLabelWidth5">
+       <el-input  v-model="selectstr"
+         class="w-50 m-2"
+         placeholder="管道名称"
+         :prefix-icon="Search"   />
+     </el-form-item>
+     <div class="btn2">
+     <el-button type="primary"  @click="fireclick(); dialogVisiblenode = true;selenum=1">选择管道</el-button></div>
+     </div>
      <div class="input">
-     <el-form-item label="时间序列名" :label-width="formLabelWidth5">
-         <el-input  v-model="input2"
+     <el-form-item label="位置" :label-width="formLabelWidth5">
+         <el-input-number v-model="source.site" :min="0" :max="1" 
+         :precision="2" :step="0.1"
+         controls-position="right"
            class="w-50 m-2"
-           placeholder="节点名称"
+           placeholder="位置"
            />
        </el-form-item>
      </div>
-       <div class="demo-input-suffix firsttitle">
-         
-           <el-form-item label="节点名称" :label-width="formLabelWidth5">
-         <el-input  v-model="input4"
-           class="w-50 m-2"
-           placeholder="节点名称"
-           :prefix-icon="Search"   />
-       </el-form-item>
-       <div class="btn2">
-       <el-button type="primary"  @click="dialogVisiblenode = true;selenum=2">选择节点</el-button></div>
-       </div>
-       <div class="input " style="margin-top: -2px;">
+     <el-button type="primary"  @click="handleEditfire()">保存</el-button>
+    </div>
+     
+   
+       <!-- <div class="input " style="margin-top: -2px;">
          <el-form-item label="值" :label-width="formLabelWidth5" >
          <el-input v-model="des2"   :autosize="{ minRows: 5, maxRows: 10}" type="textarea" />
        </el-form-item>
-     </div>
+     </div> -->
    
        </el-tab-pane>
        <el-tab-pane label="瓦斯爆炸" name="333">还在开发中.....</el-tab-pane>
@@ -240,14 +275,25 @@
    import { ref, onMounted, reactive,defineProps,defineExpose } from "vue";
    import { Calendar, Search } from '@element-plus/icons-vue'
    import { request, uploadFile } from "@/utils/request";
+   import {RouterView,RouterLink,useRouter } from "vue-router"
+   const {currentRouter}=useRouter();
+   let tableHeight=ref(300)
    const props= defineProps(['title1']);
+   let userId=ref("5f06c8bc77234f969d13e160b54c27e3");
    let isshow=ref(false);
    let sum=ref('1')
+   let url=ref("http://localhost:8080/?aid=1")
    let title=ref()
-   let selectstr=ref('')
-   let input3=ref("")
-   let input4=ref("")
-   let selenum=ref(1)
+   let selectstr=ref('');
+   let input3=ref("");
+   let input4=ref("");
+   let selenum=ref(1);
+   let aid=ref("");
+   let firepid=ref("");
+   let firesid=ref("");
+   let searchtaggd=ref("");
+   let newaddshow=ref(false)
+   let source=reactive({pname:"",site:"0.1"})
    const dialogVisiblenode = ref(false)
    
    const tabPosition = ref('left')
@@ -265,71 +311,26 @@
    let input2=ref("")
    let des1=ref("  0   373 0.1 0.1    \n 10  373 0.1 0.1\n 20  373 0.1 0.1")
    let des2=ref("  0 100\n 10 100 \n 20 100")
-   const tableData = [
-     {
-       date: '2022-05-03',
-       name: 'Tom',
-       state: 'California',
-       city: 'Los Angeles',
-       address: 'No. 189, Grove St, Los Angeles',
-       zip: 'CA 90036',
-       tag: 'Home',
-     },
-     {
-       date: '2023-05-02',
-       name: 'Tom',
-       state: 'California',
-       city: 'Los Angeles',
-       address: 'No. 189, Grove St, Los Angeles',
-       zip: 'CA 90036',
-       tag: 'Office',
-     },
+   const tableData = ref([
      {
-       date: '2016-05-04',
-       name: 'Tom',
-       state: 'California',
-       city: 'Los Angeles',
-       address: 'No. 189, Grove St, Los Angeles',
-       zip: 'CA 90036',
-       tag: 'Home',
+      sid: '2022-05-03',
+      pname: 'Tom0',
+      pid: 'No. 189, Grove St, Los Angeles',
+      site:"30",
      },
-     {
-       date: '2016-05-01',
-       name: 'Tom',
-       state: 'California',
-       city: 'Los Angeles',
-       address: 'No. 189, Grove St, Los Angeles',
-       zip: 'CA 90036',
-       tag: 'Office',
-     },
-   ]
-   const tableData2= [
-     {
-       date: '2022-05-03',
-       name: 'Tom0',
-       address: 'No. 189, Grove St, Los Angeles',
-       chuk: '是',
-       w1:"30",
-       w2:'10'
-     },
-     {
-       date: '2023-05-02',
-       name: 'Tom1',
-       address: 'No. 189, Grove St, Los Angeles',
-       chuk: '否',
-       w1:"20",
-       w2:'10'
-     },
-    
-   ]
-const activeName = ref('111');
+   
+   ]);
+   const tableDataw = ref([]);
+   const tableDatafir= ref([])
+   const tableData2= ref([])
+const activeName = ref('Fire');
 
-const currentPage4 = ref(4)
-const pageSize4 = ref(1)
+const currentPage4 = ref(1)
+const pageSize4 = ref(5)
 const small = ref(false)
 const background = ref(false)
 const disabled = ref(false)
-let total=ref(100)
+let total=ref("")
 let paginationConfig=reactive({
         hideSinglePage: false,
         page: 1,
@@ -345,25 +346,60 @@ let paginationConfig=reactive({
 }
 function handleCurrentChange(val){ 
   console.log("22222"+val)
+  currentPage4.value=val
+  pipelinedata(searchtaggd.value)
 }
    function handleClick(tab, event){
      activeName.value=tab.props.name;
-    // console.log( activeName.value);
+     console.log(activeName.value);
+     getdata();
    }
-  //火灾接口
+  //火灾接口查询
+  //let aidurl=
+
   function getdata(){
-    console.log(1111);
- 
+    const params = {
+        transCode: 'D00005',
+        aid:aid.value,
+        stype:activeName.value,
+        userId:userId.value
+        }
+        request(params)
+          .then((res) => { 
+            console.log(res)
+           
+            if(activeName.value=='Fire'){
+              tableData.value=res.rows
+            }else{
+              tableDataw.value=res.rows
+            }
+          })
+          .catch((err) => {
+          })
+  }
+  function fireclick(){
+    pipelinedata('');
+
+  }
+  function searchgd(){
+    pipelinedata(searchtaggd.value);
+  }
+//管道数据查询
+function pipelinedata(searchtag){
     const params = {
         transCode: 'D00001',
-        count:currentPage4.value,
-        page:pageSize4.value,
-        searchtag:'',
-        userId:"5f06c8bc77234f969d13e160b54c27e3"
+        count:pageSize4.value,
+        page:currentPage4.value,
+        searchtag:searchtag,
+        userId:userId.value
         }
         request(params)
           .then((res) => { 
             console.log(res)
+            tableData2.value=res.rows
+            total.value=res.total
+
+        
           })
           .catch((err) => {
           })
@@ -372,45 +408,129 @@ function handleCurrentChange(val){
      console.log('click')
    }
    function handleSelectionChange(val){
-     multipleSelection.value = val
-     console.log(  multipleSelection.value );
+
+      }
+
+   function projectsSelectionSelect(selection, row) {
+     if(selection.length>1){
+      multipleTableRef.value.clearSelection();
+      multipleTableRef.value.toggleRowSelection(row,true);
+      multipleSelection.value=selection[1];
+      return;
+     }
+      if(selection.length==1){
+        multipleSelection.value=selection;
+      
+     }else if(selection.length==0){
+    
+     }
+      
+    // console.log(row)
    }
-   function handleEdit(index,row){
-     console.log(index, row)
+   //新建fire
+   function handleEditfire(){
+    const params = {
+        transCode: 'D00004',
+        pid:firepid.value,
+        aid:aid.value,
+        stype:activeName.value,
+        site:source.site,
+        userId:userId.value
+        }
+        request(params)
+          .then((res) => { 
+            getdata();
+          })
+          .catch((err) => {
+          })
+
+   // newaddshow.value=false;
+
    }
+   function handlexiugai(index,row){
+    newaddshow.value=true;
+    firepid.value=row.pid;
+   }
+
    function handleDelete(index,row) {
      console.log(index, row)
    }
    function queding(){
      selectfun();
-     if(selenum.value==1){
-       input3.value=selectstr.value
    
-     }else{
-       input4.value=selectstr.value
-     }
+    //  if(selenum.value==1){
+    //    input3.value=selectstr.value
+   
+    //  }else{
+    //    input4.value=selectstr.value
+    //  }
    
    
    }
    function selectfun(){
-     selectstr.value='';
+   selectstr.value='';
+   currentPage4.value=1;
+   console.log(multipleSelection.value)
      if(multipleSelection.value.length!=0){
        //selectstr.value='';
-     for(let i=0;i<=multipleSelection.value.length-1;i++){
-        selectstr.value+=multipleSelection.value[i].name;
-        selectstr.value+=','
-      console.log(multipleSelection.value[i].name)
-     }
+    //  for(let i=0;i<=multipleSelection.value.length-1;i++){
+    //     selectstr.value+=multipleSelection.value[i].name;
+    //     selectstr.value+=','
+    //   console.log(multipleSelection.value[i].name)
+    //  }
+    console.log(multipleSelection.value[0].id)
+    firepid.value=multipleSelection.value[0].id;
+    selectstr.value=multipleSelection.value[0].name;
+
+    // console.log( sid.value)
+    // console.log(2222)
+    // console.log(selectstr.value)
+
      }else{
    
        selectstr.value='';
       
      }
    }
+   function init(){
+     //  this.project.projectId = this.$route.query.projectId; //获取url 参数
+        //  window.location.href=logUrl
+     let urlarr=(url.value).split("?aid=");
+     aid.value=parseInt(urlarr[1]);
+
+   }
+   function rowclick(row, column, even){
+   
+     selectstr.value=row.pname;
+      source.site=row.site;
+      firesid.value=row.sid;
+      
+       testdata()
+   }
+  //检测数据
+   function testdata(){
+    const params = {
+        transCode: 'D00007',
+        sid:firesid.value,
+        userId:userId.value
+        }
+        request(params)
+          .then((res) => { 
+            console.log(res.rows);
+            tableDatafir.value=res.rows;
+            console.log(1111)
+            console.log(tableDatafir.value)
+
+          })
+          .catch((err) => {
+          })
+  }
    onMounted(()=>{
-    getdata();
+    // let  route=currentRouter.value
+    init();
+   getdata();
    })
-   defineExpose({isshow})
+   defineExpose({isshow,})
    </script>
    <style scoped>
    .demo-pagination-block + .demo-pagination-block {
@@ -421,7 +541,9 @@ function handleCurrentChange(val){
 }
    .left_container {
      padding: 15px;
-     width: 600px;
+     width: 800px;
+     height: 775px;
+    overflow: hidden;
      position: relative;
      top: 49px;
      left: 89px;
@@ -443,9 +565,10 @@ function handleCurrentChange(val){
    }
    .input{
      width: 400px;
-     margin-top: 10px;
    }
-   
+   .magintop{
+     margin-top: 15px;
+   }
    </style>
    <style>
    .yanshib .el-tabs__content{

vue.config.js

@@ -27,7 +27,7 @@ module.exports = defineConfig({
     proxy: {
       '/api': {
         // target: 'http://localhost:8081/', // 后端接口地址
-        target: 'http://192.168.131:8187/TransServlet',
+        target: 'http://192.168.0.131:8187/TransServlet',
         //target: 'http://192.168.0.131:8087/TransServlet',
         // target: 'https://www.gzchain.org.cn/managersvc/', //后端接口地址
         secure: false, //接受使用https