diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index be26f03..02a8be3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11304"',
-  BASE_API: '"http://192.168.8.102:11643"',
+  BASE_API: '"http://123.60.16.43:8081"',
 }

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index be26f03..02a8be3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11304"',
-  BASE_API: '"http://192.168.8.102:11643"',
+  BASE_API: '"http://123.60.16.43:8081"',
 }
diff --git a/src/icons/svg/fire.svg b/src/icons/svg/fire.svg
new file mode 100644
index 0000000..b5f34d9
--- /dev/null
+++ b/src/icons/svg/fire.svg
@@ -0,0 +1 @@
+<svg t="1651040099743" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2325" width="64" height="64"><path d="M793.088 307.2v-10.24a5.12 5.12 0 0 0-5.632-5.12h-5.632a184.832 184.832 0 0 0-77.824-158.72 181.248 181.248 0 0 0-105.472-36.352 12.8 12.8 0 0 1-7.168-4.096 9.728 9.728 0 0 0-10.24-9.216h-31.744a60.416 60.416 0 0 0-51.2-28.672 61.952 61.952 0 0 0-45.056 18.944c-29.184 0-139.264 0-220.16-3.072-12.8 0-12.8 0-19.456 6.144a40.96 40.96 0 0 0 0 35.84 11.264 11.264 0 0 0 7.68 3.072A744.448 744.448 0 0 1 398.848 102.4c4.096 0 8.704 5.632 0 10.24-26.112 15.36-106.496 41.984-134.656 51.2a19.968 19.968 0 0 0-12.288 12.288 108.032 108.032 0 0 0 0 22.528 9.728 9.728 0 0 0 13.824 7.68 879.104 879.104 0 0 1 157.184-71.68 43.008 43.008 0 0 1 19.456 0v107.52a144.896 144.896 0 0 0-140.8 138.752v554.496c0 27.136 6.144 36.864 24.064 36.864h349.696c17.92 0 24.064-9.728 24.064-36.864V387.584v-3.072a145.92 145.92 0 0 0-145.408-138.752v-102.4h28.16a9.728 9.728 0 0 0 10.24-9.216s4.608-5.12 6.656-5.12a146.432 146.432 0 0 1 83.456 24.576 153.6 153.6 0 0 1 68.608 135.68h-4.096a5.12 5.12 0 0 0-5.632 5.12V307.2a51.2 51.2 0 0 0-28.672 44.032v135.68a5.12 5.12 0 0 0 5.632 5.12H819.2a5.12 5.12 0 0 0 5.12-5.12V350.208a51.2 51.2 0 0 0-31.232-43.008z" p-id="2326"></path></svg>

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index be26f03..02a8be3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11304"',
-  BASE_API: '"http://192.168.8.102:11643"',
+  BASE_API: '"http://123.60.16.43:8081"',
 }
diff --git a/src/icons/svg/fire.svg b/src/icons/svg/fire.svg
new file mode 100644
index 0000000..b5f34d9
--- /dev/null
+++ b/src/icons/svg/fire.svg
@@ -0,0 +1 @@
+<svg t="1651040099743" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2325" width="64" height="64"><path d="M793.088 307.2v-10.24a5.12 5.12 0 0 0-5.632-5.12h-5.632a184.832 184.832 0 0 0-77.824-158.72 181.248 181.248 0 0 0-105.472-36.352 12.8 12.8 0 0 1-7.168-4.096 9.728 9.728 0 0 0-10.24-9.216h-31.744a60.416 60.416 0 0 0-51.2-28.672 61.952 61.952 0 0 0-45.056 18.944c-29.184 0-139.264 0-220.16-3.072-12.8 0-12.8 0-19.456 6.144a40.96 40.96 0 0 0 0 35.84 11.264 11.264 0 0 0 7.68 3.072A744.448 744.448 0 0 1 398.848 102.4c4.096 0 8.704 5.632 0 10.24-26.112 15.36-106.496 41.984-134.656 51.2a19.968 19.968 0 0 0-12.288 12.288 108.032 108.032 0 0 0 0 22.528 9.728 9.728 0 0 0 13.824 7.68 879.104 879.104 0 0 1 157.184-71.68 43.008 43.008 0 0 1 19.456 0v107.52a144.896 144.896 0 0 0-140.8 138.752v554.496c0 27.136 6.144 36.864 24.064 36.864h349.696c17.92 0 24.064-9.728 24.064-36.864V387.584v-3.072a145.92 145.92 0 0 0-145.408-138.752v-102.4h28.16a9.728 9.728 0 0 0 10.24-9.216s4.608-5.12 6.656-5.12a146.432 146.432 0 0 1 83.456 24.576 153.6 153.6 0 0 1 68.608 135.68h-4.096a5.12 5.12 0 0 0-5.632 5.12V307.2a51.2 51.2 0 0 0-28.672 44.032v135.68a5.12 5.12 0 0 0 5.632 5.12H819.2a5.12 5.12 0 0 0 5.12-5.12V350.208a51.2 51.2 0 0 0-31.232-43.008z" p-id="2326"></path></svg>
diff --git a/src/router/index.js b/src/router/index.js
index 9546e12..808ada2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,6 +97,19 @@
     ]
   },
   {
+    path: '/fire',
+    component: Layout,
+    redirect: '/firelist',
+    children: [
+      {
+        path: '/firelist',
+        component: () => import('@/views/fire/listFireInfo'),
+        name: 'fire',
+        meta: { title: '灭火装备管理', icon: 'fire', permission: ['/overview/wellList'] }
+      }
+    ]
+  },
+  {
     path: 'markerManager',
     component: Layout,
     redirect: '/markerList',

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index be26f03..02a8be3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11304"',
-  BASE_API: '"http://192.168.8.102:11643"',
+  BASE_API: '"http://123.60.16.43:8081"',
 }
diff --git a/src/icons/svg/fire.svg b/src/icons/svg/fire.svg
new file mode 100644
index 0000000..b5f34d9
--- /dev/null
+++ b/src/icons/svg/fire.svg
@@ -0,0 +1 @@
+<svg t="1651040099743" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2325" width="64" height="64"><path d="M793.088 307.2v-10.24a5.12 5.12 0 0 0-5.632-5.12h-5.632a184.832 184.832 0 0 0-77.824-158.72 181.248 181.248 0 0 0-105.472-36.352 12.8 12.8 0 0 1-7.168-4.096 9.728 9.728 0 0 0-10.24-9.216h-31.744a60.416 60.416 0 0 0-51.2-28.672 61.952 61.952 0 0 0-45.056 18.944c-29.184 0-139.264 0-220.16-3.072-12.8 0-12.8 0-19.456 6.144a40.96 40.96 0 0 0 0 35.84 11.264 11.264 0 0 0 7.68 3.072A744.448 744.448 0 0 1 398.848 102.4c4.096 0 8.704 5.632 0 10.24-26.112 15.36-106.496 41.984-134.656 51.2a19.968 19.968 0 0 0-12.288 12.288 108.032 108.032 0 0 0 0 22.528 9.728 9.728 0 0 0 13.824 7.68 879.104 879.104 0 0 1 157.184-71.68 43.008 43.008 0 0 1 19.456 0v107.52a144.896 144.896 0 0 0-140.8 138.752v554.496c0 27.136 6.144 36.864 24.064 36.864h349.696c17.92 0 24.064-9.728 24.064-36.864V387.584v-3.072a145.92 145.92 0 0 0-145.408-138.752v-102.4h28.16a9.728 9.728 0 0 0 10.24-9.216s4.608-5.12 6.656-5.12a146.432 146.432 0 0 1 83.456 24.576 153.6 153.6 0 0 1 68.608 135.68h-4.096a5.12 5.12 0 0 0-5.632 5.12V307.2a51.2 51.2 0 0 0-28.672 44.032v135.68a5.12 5.12 0 0 0 5.632 5.12H819.2a5.12 5.12 0 0 0 5.12-5.12V350.208a51.2 51.2 0 0 0-31.232-43.008z" p-id="2326"></path></svg>
diff --git a/src/router/index.js b/src/router/index.js
index 9546e12..808ada2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,6 +97,19 @@
     ]
   },
   {
+    path: '/fire',
+    component: Layout,
+    redirect: '/firelist',
+    children: [
+      {
+        path: '/firelist',
+        component: () => import('@/views/fire/listFireInfo'),
+        name: 'fire',
+        meta: { title: '灭火装备管理', icon: 'fire', permission: ['/overview/wellList'] }
+      }
+    ]
+  },
+  {
     path: 'markerManager',
     component: Layout,
     redirect: '/markerList',
diff --git a/src/views/car/editCarInfo.vue b/src/views/car/editCarInfo.vue
index 1f56f8b..1ff0c49 100644
--- a/src/views/car/editCarInfo.vue
+++ b/src/views/car/editCarInfo.vue
@@ -220,7 +220,7 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       getDictCode('carType').then(response => {
-        this.cartypelist = response.data
+        this.cartypelist = response.data.filter(item => { return item.value === '1' || item.value === '2' })
       })
       getDeviceListByType('2').then(response => {
         this.liquidlist = response.data

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index be26f03..02a8be3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11304"',
-  BASE_API: '"http://192.168.8.102:11643"',
+  BASE_API: '"http://123.60.16.43:8081"',
 }
diff --git a/src/icons/svg/fire.svg b/src/icons/svg/fire.svg
new file mode 100644
index 0000000..b5f34d9
--- /dev/null
+++ b/src/icons/svg/fire.svg
@@ -0,0 +1 @@
+<svg t="1651040099743" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2325" width="64" height="64"><path d="M793.088 307.2v-10.24a5.12 5.12 0 0 0-5.632-5.12h-5.632a184.832 184.832 0 0 0-77.824-158.72 181.248 181.248 0 0 0-105.472-36.352 12.8 12.8 0 0 1-7.168-4.096 9.728 9.728 0 0 0-10.24-9.216h-31.744a60.416 60.416 0 0 0-51.2-28.672 61.952 61.952 0 0 0-45.056 18.944c-29.184 0-139.264 0-220.16-3.072-12.8 0-12.8 0-19.456 6.144a40.96 40.96 0 0 0 0 35.84 11.264 11.264 0 0 0 7.68 3.072A744.448 744.448 0 0 1 398.848 102.4c4.096 0 8.704 5.632 0 10.24-26.112 15.36-106.496 41.984-134.656 51.2a19.968 19.968 0 0 0-12.288 12.288 108.032 108.032 0 0 0 0 22.528 9.728 9.728 0 0 0 13.824 7.68 879.104 879.104 0 0 1 157.184-71.68 43.008 43.008 0 0 1 19.456 0v107.52a144.896 144.896 0 0 0-140.8 138.752v554.496c0 27.136 6.144 36.864 24.064 36.864h349.696c17.92 0 24.064-9.728 24.064-36.864V387.584v-3.072a145.92 145.92 0 0 0-145.408-138.752v-102.4h28.16a9.728 9.728 0 0 0 10.24-9.216s4.608-5.12 6.656-5.12a146.432 146.432 0 0 1 83.456 24.576 153.6 153.6 0 0 1 68.608 135.68h-4.096a5.12 5.12 0 0 0-5.632 5.12V307.2a51.2 51.2 0 0 0-28.672 44.032v135.68a5.12 5.12 0 0 0 5.632 5.12H819.2a5.12 5.12 0 0 0 5.12-5.12V350.208a51.2 51.2 0 0 0-31.232-43.008z" p-id="2326"></path></svg>
diff --git a/src/router/index.js b/src/router/index.js
index 9546e12..808ada2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,6 +97,19 @@
     ]
   },
   {
+    path: '/fire',
+    component: Layout,
+    redirect: '/firelist',
+    children: [
+      {
+        path: '/firelist',
+        component: () => import('@/views/fire/listFireInfo'),
+        name: 'fire',
+        meta: { title: '灭火装备管理', icon: 'fire', permission: ['/overview/wellList'] }
+      }
+    ]
+  },
+  {
     path: 'markerManager',
     component: Layout,
     redirect: '/markerList',
diff --git a/src/views/car/editCarInfo.vue b/src/views/car/editCarInfo.vue
index 1f56f8b..1ff0c49 100644
--- a/src/views/car/editCarInfo.vue
+++ b/src/views/car/editCarInfo.vue
@@ -220,7 +220,7 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       getDictCode('carType').then(response => {
-        this.cartypelist = response.data
+        this.cartypelist = response.data.filter(item => { return item.value === '1' || item.value === '2' })
       })
       getDeviceListByType('2').then(response => {
         this.liquidlist = response.data
diff --git a/src/views/car/listCarInfo.vue b/src/views/car/listCarInfo.vue
index 4e9deb1..e03acab 100644
--- a/src/views/car/listCarInfo.vue
+++ b/src/views/car/listCarInfo.vue
@@ -19,9 +19,9 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <!--</el-form-item>-->
-        <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
-        <!--<dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>-->
-        <!--</el-form-item>-->
+        <el-form-item class="selectForm-container-item" prop="keywords">
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
+        </el-form-item>
 
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
         <!--<el-button class="filter-item" type="primary" icon="el-icon-edit" @click="add">新 增</el-button>-->
@@ -83,7 +83,7 @@
       listQuery: {
         description: '',
         carCode: '',
-        carType: '',
+        carType: '1,2',
         deptId: '',
         offset: 1,
         limit: 15

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index be26f03..02a8be3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11304"',
-  BASE_API: '"http://192.168.8.102:11643"',
+  BASE_API: '"http://123.60.16.43:8081"',
 }
diff --git a/src/icons/svg/fire.svg b/src/icons/svg/fire.svg
new file mode 100644
index 0000000..b5f34d9
--- /dev/null
+++ b/src/icons/svg/fire.svg
@@ -0,0 +1 @@
+<svg t="1651040099743" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2325" width="64" height="64"><path d="M793.088 307.2v-10.24a5.12 5.12 0 0 0-5.632-5.12h-5.632a184.832 184.832 0 0 0-77.824-158.72 181.248 181.248 0 0 0-105.472-36.352 12.8 12.8 0 0 1-7.168-4.096 9.728 9.728 0 0 0-10.24-9.216h-31.744a60.416 60.416 0 0 0-51.2-28.672 61.952 61.952 0 0 0-45.056 18.944c-29.184 0-139.264 0-220.16-3.072-12.8 0-12.8 0-19.456 6.144a40.96 40.96 0 0 0 0 35.84 11.264 11.264 0 0 0 7.68 3.072A744.448 744.448 0 0 1 398.848 102.4c4.096 0 8.704 5.632 0 10.24-26.112 15.36-106.496 41.984-134.656 51.2a19.968 19.968 0 0 0-12.288 12.288 108.032 108.032 0 0 0 0 22.528 9.728 9.728 0 0 0 13.824 7.68 879.104 879.104 0 0 1 157.184-71.68 43.008 43.008 0 0 1 19.456 0v107.52a144.896 144.896 0 0 0-140.8 138.752v554.496c0 27.136 6.144 36.864 24.064 36.864h349.696c17.92 0 24.064-9.728 24.064-36.864V387.584v-3.072a145.92 145.92 0 0 0-145.408-138.752v-102.4h28.16a9.728 9.728 0 0 0 10.24-9.216s4.608-5.12 6.656-5.12a146.432 146.432 0 0 1 83.456 24.576 153.6 153.6 0 0 1 68.608 135.68h-4.096a5.12 5.12 0 0 0-5.632 5.12V307.2a51.2 51.2 0 0 0-28.672 44.032v135.68a5.12 5.12 0 0 0 5.632 5.12H819.2a5.12 5.12 0 0 0 5.12-5.12V350.208a51.2 51.2 0 0 0-31.232-43.008z" p-id="2326"></path></svg>
diff --git a/src/router/index.js b/src/router/index.js
index 9546e12..808ada2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,6 +97,19 @@
     ]
   },
   {
+    path: '/fire',
+    component: Layout,
+    redirect: '/firelist',
+    children: [
+      {
+        path: '/firelist',
+        component: () => import('@/views/fire/listFireInfo'),
+        name: 'fire',
+        meta: { title: '灭火装备管理', icon: 'fire', permission: ['/overview/wellList'] }
+      }
+    ]
+  },
+  {
     path: 'markerManager',
     component: Layout,
     redirect: '/markerList',
diff --git a/src/views/car/editCarInfo.vue b/src/views/car/editCarInfo.vue
index 1f56f8b..1ff0c49 100644
--- a/src/views/car/editCarInfo.vue
+++ b/src/views/car/editCarInfo.vue
@@ -220,7 +220,7 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       getDictCode('carType').then(response => {
-        this.cartypelist = response.data
+        this.cartypelist = response.data.filter(item => { return item.value === '1' || item.value === '2' })
       })
       getDeviceListByType('2').then(response => {
         this.liquidlist = response.data
diff --git a/src/views/car/listCarInfo.vue b/src/views/car/listCarInfo.vue
index 4e9deb1..e03acab 100644
--- a/src/views/car/listCarInfo.vue
+++ b/src/views/car/listCarInfo.vue
@@ -19,9 +19,9 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <!--</el-form-item>-->
-        <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
-        <!--<dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>-->
-        <!--</el-form-item>-->
+        <el-form-item class="selectForm-container-item" prop="keywords">
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
+        </el-form-item>
 
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
         <!--<el-button class="filter-item" type="primary" icon="el-icon-edit" @click="add">新 增</el-button>-->
@@ -83,7 +83,7 @@
       listQuery: {
         description: '',
         carCode: '',
-        carType: '',
+        carType: '1,2',
         deptId: '',
         offset: 1,
         limit: 15
diff --git a/src/views/car/listoverview.vue b/src/views/car/listoverview.vue
index 7a07b4c..01b9e11 100644
--- a/src/views/car/listoverview.vue
+++ b/src/views/car/listoverview.vue
@@ -97,6 +97,10 @@
               <el-image :src="require('../../assets/global_images/hydrant.png')" fit="contain" style="width: 35px;height: 35px;"/>
               <div>消防栓</div>
             </el-radio-button>
+            <el-radio-button label="灭火器">
+              <el-image :src="require('../../assets/global_images/hydrant.png')" fit="contain" style="width: 35px;height: 35px;"/>
+              <div>灭火器</div>
+            </el-radio-button>
           </el-radio-group>
         </div>
       </div>

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index be26f03..02a8be3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11304"',
-  BASE_API: '"http://192.168.8.102:11643"',
+  BASE_API: '"http://123.60.16.43:8081"',
 }
diff --git a/src/icons/svg/fire.svg b/src/icons/svg/fire.svg
new file mode 100644
index 0000000..b5f34d9
--- /dev/null
+++ b/src/icons/svg/fire.svg
@@ -0,0 +1 @@
+<svg t="1651040099743" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2325" width="64" height="64"><path d="M793.088 307.2v-10.24a5.12 5.12 0 0 0-5.632-5.12h-5.632a184.832 184.832 0 0 0-77.824-158.72 181.248 181.248 0 0 0-105.472-36.352 12.8 12.8 0 0 1-7.168-4.096 9.728 9.728 0 0 0-10.24-9.216h-31.744a60.416 60.416 0 0 0-51.2-28.672 61.952 61.952 0 0 0-45.056 18.944c-29.184 0-139.264 0-220.16-3.072-12.8 0-12.8 0-19.456 6.144a40.96 40.96 0 0 0 0 35.84 11.264 11.264 0 0 0 7.68 3.072A744.448 744.448 0 0 1 398.848 102.4c4.096 0 8.704 5.632 0 10.24-26.112 15.36-106.496 41.984-134.656 51.2a19.968 19.968 0 0 0-12.288 12.288 108.032 108.032 0 0 0 0 22.528 9.728 9.728 0 0 0 13.824 7.68 879.104 879.104 0 0 1 157.184-71.68 43.008 43.008 0 0 1 19.456 0v107.52a144.896 144.896 0 0 0-140.8 138.752v554.496c0 27.136 6.144 36.864 24.064 36.864h349.696c17.92 0 24.064-9.728 24.064-36.864V387.584v-3.072a145.92 145.92 0 0 0-145.408-138.752v-102.4h28.16a9.728 9.728 0 0 0 10.24-9.216s4.608-5.12 6.656-5.12a146.432 146.432 0 0 1 83.456 24.576 153.6 153.6 0 0 1 68.608 135.68h-4.096a5.12 5.12 0 0 0-5.632 5.12V307.2a51.2 51.2 0 0 0-28.672 44.032v135.68a5.12 5.12 0 0 0 5.632 5.12H819.2a5.12 5.12 0 0 0 5.12-5.12V350.208a51.2 51.2 0 0 0-31.232-43.008z" p-id="2326"></path></svg>
diff --git a/src/router/index.js b/src/router/index.js
index 9546e12..808ada2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,6 +97,19 @@
     ]
   },
   {
+    path: '/fire',
+    component: Layout,
+    redirect: '/firelist',
+    children: [
+      {
+        path: '/firelist',
+        component: () => import('@/views/fire/listFireInfo'),
+        name: 'fire',
+        meta: { title: '灭火装备管理', icon: 'fire', permission: ['/overview/wellList'] }
+      }
+    ]
+  },
+  {
     path: 'markerManager',
     component: Layout,
     redirect: '/markerList',
diff --git a/src/views/car/editCarInfo.vue b/src/views/car/editCarInfo.vue
index 1f56f8b..1ff0c49 100644
--- a/src/views/car/editCarInfo.vue
+++ b/src/views/car/editCarInfo.vue
@@ -220,7 +220,7 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       getDictCode('carType').then(response => {
-        this.cartypelist = response.data
+        this.cartypelist = response.data.filter(item => { return item.value === '1' || item.value === '2' })
       })
       getDeviceListByType('2').then(response => {
         this.liquidlist = response.data
diff --git a/src/views/car/listCarInfo.vue b/src/views/car/listCarInfo.vue
index 4e9deb1..e03acab 100644
--- a/src/views/car/listCarInfo.vue
+++ b/src/views/car/listCarInfo.vue
@@ -19,9 +19,9 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <!--</el-form-item>-->
-        <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
-        <!--<dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>-->
-        <!--</el-form-item>-->
+        <el-form-item class="selectForm-container-item" prop="keywords">
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
+        </el-form-item>
 
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
         <!--<el-button class="filter-item" type="primary" icon="el-icon-edit" @click="add">新 增</el-button>-->
@@ -83,7 +83,7 @@
       listQuery: {
         description: '',
         carCode: '',
-        carType: '',
+        carType: '1,2',
         deptId: '',
         offset: 1,
         limit: 15
diff --git a/src/views/car/listoverview.vue b/src/views/car/listoverview.vue
index 7a07b4c..01b9e11 100644
--- a/src/views/car/listoverview.vue
+++ b/src/views/car/listoverview.vue
@@ -97,6 +97,10 @@
               <el-image :src="require('../../assets/global_images/hydrant.png')" fit="contain" style="width: 35px;height: 35px;"/>
               <div>消防栓</div>
             </el-radio-button>
+            <el-radio-button label="灭火器">
+              <el-image :src="require('../../assets/global_images/hydrant.png')" fit="contain" style="width: 35px;height: 35px;"/>
+              <div>灭火器</div>
+            </el-radio-button>
           </el-radio-group>
         </div>
       </div>
diff --git a/src/views/fire/editFireInfo.vue b/src/views/fire/editFireInfo.vue
new file mode 100644
index 0000000..0b41b24
--- /dev/null
+++ b/src/views/fire/editFireInfo.vue
@@ -0,0 +1,358 @@
+<template>
+  <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body >
+    <el-form ref="dataForm" :rules="rules" :model="carInfoForm" size="small" label-position="right" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
+            <el-input v-model.trim="carInfoForm.carCode" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'车牌号'" type="text"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="carType">
+            <el-select v-model="carInfoForm.carType" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'必填'" filterable clearable value="">
+              <el-option
+                v-for="item in cartypelist"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="灭火器描述" prop="description">
+            <el-input v-model.trim="carInfoForm.description" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'必填'" type="text"/>
+          </el-form-item>
+        </el-col>
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="车载液位" prop="deptId">-->
+        <!--<el-select v-model="carInfoForm.liquidCode" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'车载液位'" filterable clearable value="">-->
+        <!--<el-option-->
+        <!--v-for="item in liquidlist"-->
+        <!--:key="item.devcode"-->
+        <!--:label="item.deviceName"-->
+        <!--:value="item.devcode"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="使用单位" prop="deptId">
+            <dept-select v-model="carInfoForm.deptId" :disabled="dialogStatus=='detail'" :dept-show="deptShow" :placeholder="dialogStatus=='detail'?'':'必填'" style="width: 100%" clearable value=""/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="品牌型号">
+            <el-input v-model.trim="carInfoForm.brandModel" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'品牌型号'" type="text"/>
+          </el-form-item>
+        </el-col>
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="准乘人数" >-->
+        <!--<el-input v-model.trim="carInfoForm.peopleNumber" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'准乘人数'" type="text" oninput="value=value.replace(/^\.+|[^\d.]/g,'')"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="使用人">
+            <el-input v-model.trim="carInfoForm.userPerson" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'使用人'" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="使用人电话" prop="userPhone">
+            <el-input v-model.trim="carInfoForm.userPhone" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'使用人电话'" type="text"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人">
+            <el-input v-model.trim="carInfoForm.chargePerson" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'责任人'" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="责任人电话" prop="chargePhone">
+            <el-input v-model.trim="carInfoForm.chargePhone" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'责任人电话'" type="text"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!--<el-row :gutter="20">-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item label="发动机号">-->
+      <!--<el-input v-model.trim="carInfoForm.engine" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'发动机号'" type="text" />-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item label="车载摄像头编号">-->
+      <!--<el-input v-model.trim="carInfoForm.camera" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'车载摄像头编号'" type="text" />-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--</el-row>-->
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="购入日期">
+            <el-date-picker
+              :placeholder="dialogStatus=='detail'?'':'购入日期'"
+              v-model="carInfoForm.purchaseDate"
+              :disabled="dialogStatus=='detail'"
+              style="width: 100%"
+              type="date"
+              value-format="yyyy-MM-dd"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="登记日期">
+            <el-date-picker
+              v-model="carInfoForm.registerDate"
+              :placeholder="dialogStatus=='detail'?'': '登记日期'"
+              :disabled="dialogStatus=='detail'"
+              style="width: 100%"
+              type="date"
+              value-format="yyyy-MM-dd"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input v-model.trim="carInfoForm.remarks" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'': '备注'" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="table-title">
+        <el-col :span="20">
+          <div class="title-header">
+            <i class="el-icon-menu" />灭火器GPS定位模块信息
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20" style="margin-top: 15px">
+        <el-col :span="12">
+          <el-form-item label="IMEI">
+            <el-select v-model="carInfoForm.imei" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'IMEI'" filterable clearable value="" @change="changeiot">
+              <el-option
+                v-for="item in imeilist"
+                :key="item.imei"
+                :label="item.imei"
+                :value="item.imei"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="物联网卡号">
+            <el-input v-model.trim="carInfoForm.iot" :placeholder="dialogStatus=='detail'?'':'物联网卡号'" disabled type="text"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
+      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo'
+import DeptSelect from '@/components/DeptSelect'
+import { getDictCode } from '@/api/dict'
+import { listNoBind, getDeviceListByType } from '@/api/device'
+export default {
+  name: 'EditFireInfo',
+  components: { DeptSelect },
+  data() {
+    return {
+      deptShow: true,
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      cartypelist: [],
+      imeilist: [],
+      liquidlist: [],
+      carInfoForm: {
+        id: '',
+        carCode: '',
+        carType: '',
+        description: '',
+        deptId: '',
+        brandModel: '',
+        liquidCode: '',
+        peopleNumber: '',
+        userPerson: '',
+        userPhone: '',
+        chargePerson: '',
+        chargePhone: '',
+        engine: '',
+        camera: '',
+        purchaseDate: '',
+        registerDate: '',
+        remarks: '',
+        imei: '',
+        iot: '',
+        deviceId: ''
+      }, // 表单
+      textMap: {
+        update: '编辑灭火器信息',
+        create: '新增灭火器信息',
+        detail: '灭火器信息详情'
+      }, // 表头显示标题
+      rules: {
+        description: [{ required: true, message: '灭火器描述不能为空', trigger: ['blur', 'change'] }],
+        carType: [{ required: true, message: '灭火器类型必选', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '使用单位必选', trigger: ['blur', 'change'] }],
+        userPhone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式
+          message: '请输入正确的手机号',
+          trigger: ['blur', 'change'] }],
+        chargePhone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式
+          message: '请输入正确的手机号',
+          trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      getDictCode('carType').then(response => {
+        this.cartypelist = response.data.filter(item => { return item.value === '3' || item.value === '4' })
+      })
+      getDeviceListByType('2').then(response => {
+        this.liquidlist = response.data
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        listNoBind(null).then(response => {
+          this.imeilist = response.data
+        })
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
+        listNoBind(row.id).then(response => {
+          this.imeilist = response.data
+          console.log(this.imeilist)
+        })
+        getCarInfo(row.id).then(response => {
+          console.log(response.data)
+          this.carInfoForm = {
+            id: response.data.id,
+            carCode: response.data.carCode,
+            carType: response.data.carType,
+            description: response.data.description,
+            deptId: response.data.deptId,
+            brandModel: response.data.brandModel,
+            liquidCode: response.data.liquidCode,
+            peopleNumber: response.data.peopleNumber,
+            userPerson: response.data.userPerson,
+            userPhone: response.data.userPhone,
+            chargePerson: response.data.chargePerson,
+            chargePhone: response.data.chargePhone,
+            engine: response.data.engine,
+            camera: response.data.camera,
+            purchaseDate: response.data.purchaseDate,
+            registerDate: response.data.registerDate,
+            remarks: response.data.remarks,
+            imei: response.data.imei,
+            iot: response.data.iot,
+            deviceId: response.data.deviceId
+          }
+        })
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.carInfoForm = {
+        id: '',
+        carCode: '',
+        carType: '',
+        description: '',
+        deptId: '',
+        brandModel: '',
+        liquidCode: '',
+        peopleNumber: '',
+        userPerson: '',
+        userPhone: '',
+        chargePerson: '',
+        chargePhone: '',
+        engine: '',
+        camera: '',
+        purchaseDate: '',
+        registerDate: '',
+        remarks: '',
+        deviceId: '',
+        imei: '',
+        iot: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.carInfoForm)
+        if (valid) {
+          addCarInfo(this.carInfoForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          console.log(this.carInfoForm)
+          updateCarInfo(this.carInfoForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    changeiot(val) {
+      for (var i = 0; i < this.imeilist.length; i++) {
+        if (val === this.imeilist[i].imei) {
+          this.carInfoForm.iot = this.imeilist[i].iot
+          this.carInfoForm.deviceId = this.imeilist[i].id
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

diff --git a/.gitignore b/.gitignore
index 78a0ead..ec7281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
-node_modules/
+
 dist/
 npm-debug.log*
 yarn-debug.log*
diff --git a/config/dev.env.js b/config/dev.env.js
index 0ef3d12..6552545 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,11 +6,6 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
-  // BASE_API: '"http://106.74.146.218:2031"'
-  BASE_API: '"http://192.168.8.102:11643"'
-  // BASE_API: '"http://111.198.10.15:11304"'
-  // BASE_API: '"http://42.81.160.165:2022/smartwell"'
-  // BASE_API: '"http://192.168.0.225:8083"'
-  // BASE_API: '"http://127.0.0.1:8083"'
+  // BASE_API: '"http://111.198.10.15:11304"',
+  BASE_API: '"http://123.60.16.43:8081"',
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index be26f03..02a8be3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_API: '"http://111.198.10.15:11304"',
-  BASE_API: '"http://192.168.8.102:11643"',
+  BASE_API: '"http://123.60.16.43:8081"',
 }
diff --git a/src/icons/svg/fire.svg b/src/icons/svg/fire.svg
new file mode 100644
index 0000000..b5f34d9
--- /dev/null
+++ b/src/icons/svg/fire.svg
@@ -0,0 +1 @@
+<svg t="1651040099743" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2325" width="64" height="64"><path d="M793.088 307.2v-10.24a5.12 5.12 0 0 0-5.632-5.12h-5.632a184.832 184.832 0 0 0-77.824-158.72 181.248 181.248 0 0 0-105.472-36.352 12.8 12.8 0 0 1-7.168-4.096 9.728 9.728 0 0 0-10.24-9.216h-31.744a60.416 60.416 0 0 0-51.2-28.672 61.952 61.952 0 0 0-45.056 18.944c-29.184 0-139.264 0-220.16-3.072-12.8 0-12.8 0-19.456 6.144a40.96 40.96 0 0 0 0 35.84 11.264 11.264 0 0 0 7.68 3.072A744.448 744.448 0 0 1 398.848 102.4c4.096 0 8.704 5.632 0 10.24-26.112 15.36-106.496 41.984-134.656 51.2a19.968 19.968 0 0 0-12.288 12.288 108.032 108.032 0 0 0 0 22.528 9.728 9.728 0 0 0 13.824 7.68 879.104 879.104 0 0 1 157.184-71.68 43.008 43.008 0 0 1 19.456 0v107.52a144.896 144.896 0 0 0-140.8 138.752v554.496c0 27.136 6.144 36.864 24.064 36.864h349.696c17.92 0 24.064-9.728 24.064-36.864V387.584v-3.072a145.92 145.92 0 0 0-145.408-138.752v-102.4h28.16a9.728 9.728 0 0 0 10.24-9.216s4.608-5.12 6.656-5.12a146.432 146.432 0 0 1 83.456 24.576 153.6 153.6 0 0 1 68.608 135.68h-4.096a5.12 5.12 0 0 0-5.632 5.12V307.2a51.2 51.2 0 0 0-28.672 44.032v135.68a5.12 5.12 0 0 0 5.632 5.12H819.2a5.12 5.12 0 0 0 5.12-5.12V350.208a51.2 51.2 0 0 0-31.232-43.008z" p-id="2326"></path></svg>
diff --git a/src/router/index.js b/src/router/index.js
index 9546e12..808ada2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,6 +97,19 @@
     ]
   },
   {
+    path: '/fire',
+    component: Layout,
+    redirect: '/firelist',
+    children: [
+      {
+        path: '/firelist',
+        component: () => import('@/views/fire/listFireInfo'),
+        name: 'fire',
+        meta: { title: '灭火装备管理', icon: 'fire', permission: ['/overview/wellList'] }
+      }
+    ]
+  },
+  {
     path: 'markerManager',
     component: Layout,
     redirect: '/markerList',
diff --git a/src/views/car/editCarInfo.vue b/src/views/car/editCarInfo.vue
index 1f56f8b..1ff0c49 100644
--- a/src/views/car/editCarInfo.vue
+++ b/src/views/car/editCarInfo.vue
@@ -220,7 +220,7 @@
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
       getDictCode('carType').then(response => {
-        this.cartypelist = response.data
+        this.cartypelist = response.data.filter(item => { return item.value === '1' || item.value === '2' })
       })
       getDeviceListByType('2').then(response => {
         this.liquidlist = response.data
diff --git a/src/views/car/listCarInfo.vue b/src/views/car/listCarInfo.vue
index 4e9deb1..e03acab 100644
--- a/src/views/car/listCarInfo.vue
+++ b/src/views/car/listCarInfo.vue
@@ -19,9 +19,9 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <!--</el-form-item>-->
-        <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
-        <!--<dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>-->
-        <!--</el-form-item>-->
+        <el-form-item class="selectForm-container-item" prop="keywords">
+        <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
+        </el-form-item>
 
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
         <!--<el-button class="filter-item" type="primary" icon="el-icon-edit" @click="add">新 增</el-button>-->
@@ -83,7 +83,7 @@
       listQuery: {
         description: '',
         carCode: '',
-        carType: '',
+        carType: '1,2',
         deptId: '',
         offset: 1,
         limit: 15
diff --git a/src/views/car/listoverview.vue b/src/views/car/listoverview.vue
index 7a07b4c..01b9e11 100644
--- a/src/views/car/listoverview.vue
+++ b/src/views/car/listoverview.vue
@@ -97,6 +97,10 @@
               <el-image :src="require('../../assets/global_images/hydrant.png')" fit="contain" style="width: 35px;height: 35px;"/>
               <div>消防栓</div>
             </el-radio-button>
+            <el-radio-button label="灭火器">
+              <el-image :src="require('../../assets/global_images/hydrant.png')" fit="contain" style="width: 35px;height: 35px;"/>
+              <div>灭火器</div>
+            </el-radio-button>
           </el-radio-group>
         </div>
       </div>
diff --git a/src/views/fire/editFireInfo.vue b/src/views/fire/editFireInfo.vue
new file mode 100644
index 0000000..0b41b24
--- /dev/null
+++ b/src/views/fire/editFireInfo.vue
@@ -0,0 +1,358 @@
+<template>
+  <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body >
+    <el-form ref="dataForm" :rules="rules" :model="carInfoForm" size="small" label-position="right" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
+            <el-input v-model.trim="carInfoForm.carCode" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'车牌号'" type="text"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="carType">
+            <el-select v-model="carInfoForm.carType" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'必填'" filterable clearable value="">
+              <el-option
+                v-for="item in cartypelist"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="灭火器描述" prop="description">
+            <el-input v-model.trim="carInfoForm.description" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'必填'" type="text"/>
+          </el-form-item>
+        </el-col>
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="车载液位" prop="deptId">-->
+        <!--<el-select v-model="carInfoForm.liquidCode" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'车载液位'" filterable clearable value="">-->
+        <!--<el-option-->
+        <!--v-for="item in liquidlist"-->
+        <!--:key="item.devcode"-->
+        <!--:label="item.deviceName"-->
+        <!--:value="item.devcode"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="使用单位" prop="deptId">
+            <dept-select v-model="carInfoForm.deptId" :disabled="dialogStatus=='detail'" :dept-show="deptShow" :placeholder="dialogStatus=='detail'?'':'必填'" style="width: 100%" clearable value=""/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="品牌型号">
+            <el-input v-model.trim="carInfoForm.brandModel" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'品牌型号'" type="text"/>
+          </el-form-item>
+        </el-col>
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="准乘人数" >-->
+        <!--<el-input v-model.trim="carInfoForm.peopleNumber" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'准乘人数'" type="text" oninput="value=value.replace(/^\.+|[^\d.]/g,'')"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="使用人">
+            <el-input v-model.trim="carInfoForm.userPerson" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'使用人'" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="使用人电话" prop="userPhone">
+            <el-input v-model.trim="carInfoForm.userPhone" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'使用人电话'" type="text"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="责任人">
+            <el-input v-model.trim="carInfoForm.chargePerson" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'责任人'" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="责任人电话" prop="chargePhone">
+            <el-input v-model.trim="carInfoForm.chargePhone" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'责任人电话'" type="text"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!--<el-row :gutter="20">-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item label="发动机号">-->
+      <!--<el-input v-model.trim="carInfoForm.engine" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'发动机号'" type="text" />-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item label="车载摄像头编号">-->
+      <!--<el-input v-model.trim="carInfoForm.camera" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'车载摄像头编号'" type="text" />-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--</el-row>-->
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="购入日期">
+            <el-date-picker
+              :placeholder="dialogStatus=='detail'?'':'购入日期'"
+              v-model="carInfoForm.purchaseDate"
+              :disabled="dialogStatus=='detail'"
+              style="width: 100%"
+              type="date"
+              value-format="yyyy-MM-dd"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="登记日期">
+            <el-date-picker
+              v-model="carInfoForm.registerDate"
+              :placeholder="dialogStatus=='detail'?'': '登记日期'"
+              :disabled="dialogStatus=='detail'"
+              style="width: 100%"
+              type="date"
+              value-format="yyyy-MM-dd"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input v-model.trim="carInfoForm.remarks" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'': '备注'" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="table-title">
+        <el-col :span="20">
+          <div class="title-header">
+            <i class="el-icon-menu" />灭火器GPS定位模块信息
+          </div>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20" style="margin-top: 15px">
+        <el-col :span="12">
+          <el-form-item label="IMEI">
+            <el-select v-model="carInfoForm.imei" :disabled="dialogStatus=='detail'" :placeholder="dialogStatus=='detail'?'':'IMEI'" filterable clearable value="" @change="changeiot">
+              <el-option
+                v-for="item in imeilist"
+                :key="item.imei"
+                :label="item.imei"
+                :value="item.imei"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="物联网卡号">
+            <el-input v-model.trim="carInfoForm.iot" :placeholder="dialogStatus=='detail'?'':'物联网卡号'" disabled type="text"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-if="dialogStatus !== 'detail'" slot="footer" class="dialog-footer">
+      <el-button type="primary" style="width: 100px;font-size: 16px;" @click="saveData">保 存</el-button>
+      <el-button style="width: 100px;font-size: 16px" @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo'
+import DeptSelect from '@/components/DeptSelect'
+import { getDictCode } from '@/api/dict'
+import { listNoBind, getDeviceListByType } from '@/api/device'
+export default {
+  name: 'EditFireInfo',
+  components: { DeptSelect },
+  data() {
+    return {
+      deptShow: true,
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      cartypelist: [],
+      imeilist: [],
+      liquidlist: [],
+      carInfoForm: {
+        id: '',
+        carCode: '',
+        carType: '',
+        description: '',
+        deptId: '',
+        brandModel: '',
+        liquidCode: '',
+        peopleNumber: '',
+        userPerson: '',
+        userPhone: '',
+        chargePerson: '',
+        chargePhone: '',
+        engine: '',
+        camera: '',
+        purchaseDate: '',
+        registerDate: '',
+        remarks: '',
+        imei: '',
+        iot: '',
+        deviceId: ''
+      }, // 表单
+      textMap: {
+        update: '编辑灭火器信息',
+        create: '新增灭火器信息',
+        detail: '灭火器信息详情'
+      }, // 表头显示标题
+      rules: {
+        description: [{ required: true, message: '灭火器描述不能为空', trigger: ['blur', 'change'] }],
+        carType: [{ required: true, message: '灭火器类型必选', trigger: ['blur', 'change'] }],
+        deptId: [{ required: true, message: '使用单位必选', trigger: ['blur', 'change'] }],
+        userPhone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式
+          message: '请输入正确的手机号',
+          trigger: ['blur', 'change'] }],
+        chargePhone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式
+          message: '请输入正确的手机号',
+          trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      getDictCode('carType').then(response => {
+        this.cartypelist = response.data.filter(item => { return item.value === '3' || item.value === '4' })
+      })
+      getDeviceListByType('2').then(response => {
+        this.liquidlist = response.data
+      })
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        listNoBind(null).then(response => {
+          this.imeilist = response.data
+        })
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
+        listNoBind(row.id).then(response => {
+          this.imeilist = response.data
+          console.log(this.imeilist)
+        })
+        getCarInfo(row.id).then(response => {
+          console.log(response.data)
+          this.carInfoForm = {
+            id: response.data.id,
+            carCode: response.data.carCode,
+            carType: response.data.carType,
+            description: response.data.description,
+            deptId: response.data.deptId,
+            brandModel: response.data.brandModel,
+            liquidCode: response.data.liquidCode,
+            peopleNumber: response.data.peopleNumber,
+            userPerson: response.data.userPerson,
+            userPhone: response.data.userPhone,
+            chargePerson: response.data.chargePerson,
+            chargePhone: response.data.chargePhone,
+            engine: response.data.engine,
+            camera: response.data.camera,
+            purchaseDate: response.data.purchaseDate,
+            registerDate: response.data.registerDate,
+            remarks: response.data.remarks,
+            imei: response.data.imei,
+            iot: response.data.iot,
+            deviceId: response.data.deviceId
+          }
+        })
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.carInfoForm = {
+        id: '',
+        carCode: '',
+        carType: '',
+        description: '',
+        deptId: '',
+        brandModel: '',
+        liquidCode: '',
+        peopleNumber: '',
+        userPerson: '',
+        userPhone: '',
+        chargePerson: '',
+        chargePhone: '',
+        engine: '',
+        camera: '',
+        purchaseDate: '',
+        registerDate: '',
+        remarks: '',
+        deviceId: '',
+        imei: '',
+        iot: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.carInfoForm)
+        if (valid) {
+          addCarInfo(this.carInfoForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          console.log(this.carInfoForm)
+          updateCarInfo(this.carInfoForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    changeiot(val) {
+      for (var i = 0; i < this.imeilist.length; i++) {
+        if (val === this.imeilist[i].imei) {
+          this.carInfoForm.iot = this.imeilist[i].iot
+          this.carInfoForm.deviceId = this.imeilist[i].id
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>
diff --git a/src/views/fire/listFireInfo.vue b/src/views/fire/listFireInfo.vue
new file mode 100644
index 0000000..35425df
--- /dev/null
+++ b/src/views/fire/listFireInfo.vue
@@ -0,0 +1,261 @@
+<template xmlns:align="">
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-form-item class="selectForm-container-item" prop="keywords">
+          <el-input v-model.trim="listQuery.description" placeholder="灭火器描述" clearable/>
+        </el-form-item>
+        <el-form-item class="selectForm-container-item" prop="keywords">
+          <el-input v-model="listQuery.carCode" placeholder="设备编号" clearable/>
+        </el-form-item>
+
+        <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+        <!--<el-select v-model="listQuery.carType" filterable placeholder="灭火器类型" clearable value="" @change="fetchData()">-->
+        <!--<el-option-->
+        <!--v-for="item in cartypelist"-->
+        <!--:key="item.value"-->
+        <!--:label="item.name"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <el-form-item class="selectForm-container-item" prop="keywords">
+          <dept-select v-model="listQuery.deptId" :dept-show="deptShow" placeholder="使用单位" clearable value=""/>
+        </el-form-item>
+
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查 询</el-button>
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-edit" @click="add">新 增</el-button>-->
+        <!--<el-button class="edit_btn" type="primary" icon="el-icon-receiving" @click="batchExport">导 出</el-button>-->
+      </el-form>
+    </div>
+    <el-row class="table-title">
+      <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      <el-col :span="12" :offset="6" class="edit_btns">
+        <el-button class="edit_btn" size="small" @click="add">新 增</el-button>
+        <!--<el-button class="edit_btn" size="small" @click="batchExport">导 出</el-button>-->
+      </el-col>
+    </el-row>
+    <!--查询结果Table显示-->
+    <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+      <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+      <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span :class="column.class">{{ scope.row[column.value] }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="180" align="center">
+        <template slot-scope="scope">
+          <el-button type="primary" size="mini" @click="detail(scope.row)">详情</el-button>
+          <el-button type="warning" size="mini" @click="edit(scope.row)">修改</el-button>
+          <el-button type="danger" size="mini" @click="del(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[15,20,30]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <!--编辑资源的对话框-->
+    <edit-fire-info v-show="dialogFormVisible" ref="editFireInfo" @watchChild="fetchData"/>
+  </div>
+</template>
+<script>
+import editFireInfo from '@/views/fire/editFireInfo'
+import { getCarInfoList, delCarInfo, exportCar } from '@/api/carInfo'
+import { getDictCode } from '@/api/dict'
+import DeptSelect from '@/components/DeptSelect'
+import { downloadFile } from '@/utils/downloadUtils'
+export default {
+  name: 'ListFireInfo',
+  components: { DeptSelect, editFireInfo },
+  data() {
+    return {
+      deptShow: true,
+      listQuery: {
+        description: '',
+        carCode: '',
+        carType: '',
+        deptId: '',
+        offset: 1,
+        limit: 15
+      }, // 查询条件
+      columns: [
+        {
+          text: '灭火器描述',
+          value: 'description',
+          align: 'center'
+        },
+        {
+          text: '灭火器类型',
+          value: 'carTypeName',
+          align: 'center'
+        },
+        {
+          text: '品牌型号',
+          value: 'brandModel',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'carCode',
+          align: 'center'
+        },
+        {
+          text: '使用单位',
+          value: 'deptName',
+          align: 'center',
+          width: 180
+        }
+      ], // 动态加载的表头
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false, // 是否显示编辑框
+      cartypelist: [], // 类型列表
+      deptlist: [] // 类型列表
+    }
+  },
+  created() {
+    getDictCode('carType').then(response => {
+      this.cartypelist = response.data
+    })
+    this.fetchData()
+  },
+  methods: {
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      exportCar(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        downloadFile(res.data, '车辆基础信息表')
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    add() {
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$refs.editFireInfo.initDialog(this.dialogStatus, this.dialogFormVisible)
+    },
+    edit(row) {
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$refs.editFireInfo.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.dialogStatus = 'detail'
+      this.dialogFormVisible = true
+      this.$refs.editFireInfo.initDialog(this.dialogStatus, this.dialogFormVisible, row)
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除' + row.description + '吗？',
+        '确认删除',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delCarInfo(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    search() {
+      this.fetchData(false)
+    },
+    fetchData(isNowPage = true) {
+      console.log('fetchData')
+      this.listLoading = true
+      if (!isNowPage) {
+        this.listQuery.offset = 1
+      }
+      getCarInfoList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        // 如果当前页码数据为空，重新请求末页
+        if (this.listQuery.offset > Math.ceil(this.total / this.listQuery.limit)) {
+          this.listQuery.offset = Math.ceil(this.total / this.listQuery.limit)
+          getCarInfoList(this.listQuery).then(response => {
+            this.list = response.data.rows
+            this.total = parseInt(response.data.total)
+            this.listLoading = false
+          })
+        }
+        this.listLoading = false
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .el-table__header tr,
+  .el-table__header th {
+    padding: 0;
+    height: 40px;
+    background-color: #f8f8f8;
+  }
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 100px;
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+</style>