feat:加油机档案、微信账号绑定页面部分配置优化

admin.ui.plus-master/package-lock.json

@@ -30,9 +30,11 @@
         "fs-extra": "^11.2.0",
         "js-cookie": "^3.0.5",
         "js-table2excel": "^1.1.2",
+        "jsonstream": "^1.0.3",
         "jsplumb": "^2.15.6",
         "lodash": "^4.17.21",
         "mitt": "^3.0.0",
+        "ndjson": "^2.0.0",
         "nprogress": "^0.2.0",
         "path": "^0.12.7",
         "pinia": "^2.1.4",
@@ -5121,6 +5123,12 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "license": "ISC"
+    },
     "node_modules/json5": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
@@ -5145,6 +5153,31 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsonparse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz",
+      "integrity": "sha512-X8/pl4Q98FceotM1YzNYRcdRpYKgKB6nOKW9oNZk4qssFGfSxA6tUyPgEYsZA+MAQ8nR6nBZwE2GKpeeOIeN3A==",
+      "engines": [
+        "node >= 0.2.0"
+      ],
+      "license": "MIT"
+    },
+    "node_modules/jsonstream": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/jsonstream/-/jsonstream-1.0.3.tgz",
+      "integrity": "sha512-yMDWHPGzQRwdiXy6itGgemEviwAoDp5i78y7rdzUa9RVe01vLJku+byVtqxwwSvp1y9LYHWYd+8MkYvbeilCug==",
+      "deprecated": "use JSONStream instead",
+      "dependencies": {
+        "jsonparse": "~1.0.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "jsonstream": "index.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/jsplumb": {
       "version": "2.15.6",
       "resolved": "https://registry.npmmirror.com/jsplumb/-/jsplumb-2.15.6.tgz",
@@ -5927,6 +5960,34 @@
       "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
       "dev": true
     },
+    "node_modules/ndjson": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ndjson/-/ndjson-2.0.0.tgz",
+      "integrity": "sha512-nGl7LRGrzugTtaFcJMhLbpzJM6XdivmbkdlaGcrk/LXg2KL/YBC6z1g70xh0/al+oFuVFP8N8kiWRucmeEH/qQ==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "json-stringify-safe": "^5.0.1",
+        "minimist": "^1.2.5",
+        "readable-stream": "^3.6.0",
+        "split2": "^3.0.0",
+        "through2": "^4.0.0"
+      },
+      "bin": {
+        "ndjson": "cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ndjson/node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
@@ -7717,6 +7778,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "license": "ISC",
+      "dependencies": {
+        "readable-stream": "^3.0.0"
+      }
+    },
     "node_modules/splitpanes": {
       "version": "3.1.5",
       "resolved": "https://registry.npmmirror.com/splitpanes/-/splitpanes-3.1.5.tgz",
@@ -8068,6 +8138,12 @@
         "node": ">=12.22"
       }
     },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "license": "MIT"
+    },
     "node_modules/through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",

admin.ui.plus-master/package.json

@@ -34,9 +34,11 @@
     "fs-extra": "^11.2.0",
     "js-cookie": "^3.0.5",
     "js-table2excel": "^1.1.2",
+    "jsonstream": "^1.0.3",
     "jsplumb": "^2.15.6",
     "lodash": "^4.17.21",
     "mitt": "^3.0.0",
+    "ndjson": "^2.0.0",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
     "pinia": "^2.1.4",

admin.ui.plus-master/src/views/admin/statement/alarmManagement/index.vue

@@ -16,11 +16,6 @@
                   <el-input v-model="Data.Filter.gasStation" placeholder="请输入加油站" clearable></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
-                <el-form-item label="油机号">
-                  <el-input v-model="Data.Filter.name" placeholder="请输入油机号" clearable></el-input>
-                </el-form-item>
-              </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="序列号">
                   <el-input v-model="Data.Filter.serialNumber" placeholder="请输入序列号" clearable></el-input>
@@ -36,22 +31,11 @@
                   <el-input v-model="Data.Filter.alarmType" placeholder="请输入报警类型" clearable></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
-                <el-form-item label="报警描述">
-                  <el-input v-model="Data.Filter.alarmDescription" placeholder="请输入报警描述" clearable></el-input>
-                </el-form-item>
-              </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="报警设备">
                   <el-input v-model="Data.Filter.alarmDevice" placeholder="请输入报警设备" clearable></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
-                <el-form-item label="油枪">
-                  <el-input v-model="Data.Filter.nozzleControlName" placeholder="请输入油枪" clearable></el-input>
-                </el-form-item>
-              </el-col>
-
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="报警时间">
                   <el-date-picker v-model="Data.time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
@@ -101,9 +85,16 @@
               </el-table-column>
           </el-table>
           <div class="my-flex my-flex-end" style="margin-top: 20px">
-            <el-pagination v-model:currentPage="Data.pageInput.currentPage" v-model:page-size="Data.pageInput.pageSize"
-              :total="Data.total" :page-sizes="[5, 15, 25, 50, 100]" small background @size-change="onSizeChange"
-              @current-change="onCurrentChange" layout="total, sizes, prev, pager, next, jumper" />
+            <el-pagination 
+            v-model:currentPage="pageState.pageInput.currentPage" 
+            v-model:page-size="pageState.pageInput.pageSize"
+            :total="Data.total" 
+            :page-sizes="[5, 10, 15, 25, 50, 100]" 
+            small 
+            background 
+            @size-change="onSizeChange"
+            @current-change="onCurrentChange" 
+            layout="total, sizes, prev, pager, next, jumper" />
           </div>
         </el-card>
       </el-col>
@@ -230,8 +221,6 @@ const resetQuery = () => {
   Data.Filter.CreateBeginTime = ''
   Data.Filter.CreateEndTime = ''
   Data.time = ''
-  Data.pageInput.currentPage = 1
-  Data.pageInput.pageSize = 10000
 }
 
 /**重置 */

admin.ui.plus-master/src/views/admin/statement/listOfOilEngines/index.vue

@@ -23,7 +23,7 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="设备状态">
-                  <el-select v-model="oilEngineData.filterModel.deviceStatus" placeholder="请输入设备状态">
+                  <el-select v-model="oilEngineData.filterModel.deviceStatus" placeholder="请选择设备状态">
                     <el-option label="所有" :value="''"></el-option>
                     <el-option v-for="(value, key) in FuelDispenserEnum" :key="key" :label="value" :value="key" />
                   </el-select>
@@ -32,17 +32,30 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="在线状态">
-                  <el-select v-model="oilEngineData.filterModel.onlineStatus" placeholder="请输入在线状态">
+                  <el-select v-model="oilEngineData.filterModel.onlineStatus" placeholder="请选择在线状态">
                     <el-option label="所有" :value="''"></el-option>
                     <el-option v-for="(value, key) in OnlineStatus" :key="key" :label="value" :value="key" />
                   </el-select>
                   <!-- <el-input v-model="oilEngineData.filterModel.onlineStatus" placeholder="请输入在线状态" clearable></el-input> -->
                 </el-form-item>
+              </el-col>
+                             <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="平台类型">
+                  <el-select v-model="oilEngineData.filterModel.platformType" placeholder="请选择平台类型">
+                    <el-option label="所有" :value="''"></el-option>
+                    <el-option v-for="(value, key) in platformType" :key="key" :label="value" :value="key" />
+                  </el-select>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="序列号">
                   <el-input v-model="oilEngineData.filterModel.serialNumber" placeholder="请输入序列号" clearable></el-input>
                 </el-form-item>
+              </el-col>
+               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="法制软件版本">
+                  <el-input  placeholder="请输入版本号" clearable></el-input>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="安装时间">
@@ -83,7 +96,8 @@
             <el-table-column prop="gasStation" label="加油站" />
             <el-table-column prop="serialNumber" label="序列号" />
             <el-table-column prop="model" label="加油机机型" />
-            <el-table-column prop="gunCount" label="加油机枪数量" />
+            <el-table-column prop="" label="平台" align="center"/>       
+            <el-table-column prop="gunCount" label="加油机枪数量" align="center" />
             <!-- <el-table-column prop="manufacturer"  label="加油机厂商" /> -->
             <el-table-column prop="manufactureDate" label="出厂时间" />
             <el-table-column prop="startupDate" label="启动时间" />
@@ -177,6 +191,8 @@ const oilEngineData = reactive({
     deviceStatus: "",
     /**在线状态*/
     onlineStatus: "",
+    // 平台类型
+    platformType:'',
     /**序列号*/
     serialNumber: "",
     /**开始时间*/
@@ -205,6 +221,12 @@ enum OnlineStatus {
   online = '在线',
   offline = '离线'
 }
+// 平台类型
+enum platformType {
+    TQC= 'TQC',
+    TQCPro='TQC+',
+    Unknown='未知'
+}
 /**将filterModel对象成.的连接方式*/
 const flattenObject = (obj, parentKey = '') => {
   const result = {};
@@ -373,7 +395,7 @@ onBeforeMount(() => {
 /* 输入框标签固定四个字符宽度 */
 ::v-deep .el-form-item__label {
   // 字体大小14，5个字符，12px右间距
-  width: 14*5px+12px;
+  width: 14*6px+12px;
   justify-content: start;
 }
 

admin.ui.plus-master/yarn.lock

@@ -3036,6 +3036,11 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
+json-stringify-safe@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
 json5@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"
@@ -3052,6 +3057,19 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonparse@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.0.0.tgz"
+  integrity sha512-X8/pl4Q98FceotM1YzNYRcdRpYKgKB6nOKW9oNZk4qssFGfSxA6tUyPgEYsZA+MAQ8nR6nBZwE2GKpeeOIeN3A==
+
+jsonstream@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/jsonstream/-/jsonstream-1.0.3.tgz"
+  integrity sha512-yMDWHPGzQRwdiXy6itGgemEviwAoDp5i78y7rdzUa9RVe01vLJku+byVtqxwwSvp1y9LYHWYd+8MkYvbeilCug==
+  dependencies:
+    jsonparse "~1.0.0"
+    through ">=2.2.7 <3"
+
 jsplumb@^2.15.6:
   version "2.15.6"
   resolved "https://registry.npmmirror.com/jsplumb/-/jsplumb-2.15.6.tgz"
@@ -3454,7 +3472,7 @@ minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -3564,6 +3582,17 @@ natural-compare@^1.4.0:
   resolved "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
+ndjson@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/ndjson/-/ndjson-2.0.0.tgz"
+  integrity sha512-nGl7LRGrzugTtaFcJMhLbpzJM6XdivmbkdlaGcrk/LXg2KL/YBC6z1g70xh0/al+oFuVFP8N8kiWRucmeEH/qQ==
+  dependencies:
+    json-stringify-safe "^5.0.1"
+    minimist "^1.2.5"
+    readable-stream "^3.6.0"
+    split2 "^3.0.0"
+    through2 "^4.0.0"
+
 neo-async@^2.5.0:
   version "2.6.2"
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
@@ -4234,7 +4263,7 @@ readable-stream@^2.3.8:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@3:
   version "3.6.2"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -4720,6 +4749,13 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
+split2@^3.0.0:
+  version "3.2.2"
+  resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"
+  integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
+  dependencies:
+    readable-stream "^3.0.0"
+
 splitpanes@^3.1.5:
   version "3.1.5"
   resolved "https://registry.npmmirror.com/splitpanes/-/splitpanes-3.1.5.tgz"
@@ -4894,6 +4930,11 @@ throttle-debounce@5.0.0:
   resolved "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-5.0.0.tgz"
   integrity sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==
 
+"through@>=2.2.7 <3":
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
@@ -4902,6 +4943,13 @@ through2@^2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
+through2@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"
+  integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
+  dependencies:
+    readable-stream "3"
+
 timers-browserify@^2.0.4:
   version "2.0.12"
   resolved "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz"