diff --git a/build/extraResources/influxdb-1.7.0/influx.exe b/build/extraResources/influxdb-1.7.0/influx.exe new file mode 100644 index 0000000..fd779d4 Binary files /dev/null and b/build/extraResources/influxdb-1.7.0/influx.exe differ diff --git a/build/extraResources/influxdb-1.7.0/influx_inspect.exe b/build/extraResources/influxdb-1.7.0/influx_inspect.exe new file mode 100644 index 0000000..6d465bf Binary files /dev/null and b/build/extraResources/influxdb-1.7.0/influx_inspect.exe differ diff --git a/build/extraResources/influxdb-1.7.0/influx_stress.exe b/build/extraResources/influxdb-1.7.0/influx_stress.exe new file mode 100644 index 0000000..9520713 Binary files /dev/null and b/build/extraResources/influxdb-1.7.0/influx_stress.exe differ diff --git a/build/extraResources/influxdb-1.7.0/influx_tsm.exe b/build/extraResources/influxdb-1.7.0/influx_tsm.exe new file mode 100644 index 0000000..1e2e7d4 Binary files /dev/null and b/build/extraResources/influxdb-1.7.0/influx_tsm.exe differ diff --git a/build/extraResources/influxdb-1.7.0/influxd.exe b/build/extraResources/influxdb-1.7.0/influxd.exe new file mode 100644 index 0000000..a27cbf2 Binary files /dev/null and b/build/extraResources/influxdb-1.7.0/influxd.exe differ diff --git a/build/extraResources/influxdb-1.7.0/influxdb.conf b/build/extraResources/influxdb-1.7.0/influxdb.conf new file mode 100644 index 0000000..ff2f88c --- /dev/null +++ b/build/extraResources/influxdb-1.7.0/influxdb.conf @@ -0,0 +1,560 @@ +### Welcome to the InfluxDB configuration file. + +# The values in this file override the default values used by the system if +# a config option is not specified. The commented out lines are the configuration +# field and the default value used. Uncommenting a line and changing the value +# will change the value used at runtime when the process is restarted. + +# Once every 24 hours InfluxDB will report usage data to usage.influxdata.com +# The data includes a random ID, os, arch, version, the number of series and other +# usage data. No data from user databases is ever transmitted. +# Change this option to true to disable reporting. +# reporting-disabled = false + +# Bind address to use for the RPC service for backup and restore. +# bind-address = "127.0.0.1:8088" + +### +### [meta] +### +### Controls the parameters for the Raft consensus group that stores metadata +### about the InfluxDB cluster. +### + +[meta] + # Where the metadata/raft database is stored + dir = "/var/lib/influxdb/meta" + + # Automatically create a default retention policy when creating a database. + # retention-autocreate = true + + # If log messages are printed for the meta service + # logging-enabled = true + +### +### [data] +### +### Controls where the actual shard data for InfluxDB lives and how it is +### flushed from the WAL. "dir" may need to be changed to a suitable place +### for your system, but the WAL settings are an advanced configuration. The +### defaults should work for most systems. +### + +[data] + # The directory where the TSM storage engine stores TSM files. + dir = "/var/lib/influxdb/data" + + # The directory where the TSM storage engine stores WAL files. + wal-dir = "/var/lib/influxdb/wal" + + # The amount of time that a write will wait before fsyncing. A duration + # greater than 0 can be used to batch up multiple fsync calls. This is useful for slower + # disks or when WAL write contention is seen. A value of 0s fsyncs every write to the WAL. + # Values in the range of 0-100ms are recommended for non-SSD disks. + # wal-fsync-delay = "0s" + + + # The type of shard index to use for new shards. The default is an in-memory index that is + # recreated at startup. A value of "tsi1" will use a disk based index that supports higher + # cardinality datasets. + # index-version = "inmem" + + # Trace logging provides more verbose output around the tsm engine. Turning + # this on can provide more useful output for debugging tsm engine issues. + # trace-logging-enabled = false + + # Whether queries should be logged before execution. Very useful for troubleshooting, but will + # log any sensitive data contained within a query. + # query-log-enabled = true + + # Validates incoming writes to ensure keys only have valid unicode characters. + # This setting will incur a small overhead because every key must be checked. + # validate-keys = false + + # Settings for the TSM engine + + # CacheMaxMemorySize is the maximum size a shard's cache can + # reach before it starts rejecting writes. + # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k). + # Values without a size suffix are in bytes. + # cache-max-memory-size = "1g" + + # CacheSnapshotMemorySize is the size at which the engine will + # snapshot the cache and write it to a TSM file, freeing up memory + # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k). + # Values without a size suffix are in bytes. + # cache-snapshot-memory-size = "25m" + + # CacheSnapshotWriteColdDuration is the length of time at + # which the engine will snapshot the cache and write it to + # a new TSM file if the shard hasn't received writes or deletes + # cache-snapshot-write-cold-duration = "10m" + + # CompactFullWriteColdDuration is the duration at which the engine + # will compact all TSM files in a shard if it hasn't received a + # write or delete + # compact-full-write-cold-duration = "4h" + + # The maximum number of concurrent full and level compactions that can run at one time. A + # value of 0 results in 50% of runtime.GOMAXPROCS(0) used at runtime. Any number greater + # than 0 limits compactions to that value. This setting does not apply + # to cache snapshotting. + # max-concurrent-compactions = 0 + + # CompactThroughput is the rate limit in bytes per second that we + # will allow TSM compactions to write to disk. Note that short bursts are allowed + # to happen at a possibly larger value, set by CompactThroughputBurst + # compact-throughput = "48m" + + # CompactThroughputBurst is the rate limit in bytes per second that we + # will allow TSM compactions to write to disk. + # compact-throughput-burst = "48m" + + # The threshold, in bytes, when an index write-ahead log file will compact + # into an index file. Lower sizes will cause log files to be compacted more + # quickly and result in lower heap usage at the expense of write throughput. + # Higher sizes will be compacted less frequently, store more series in-memory, + # and provide higher write throughput. + # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k). + # Values without a size suffix are in bytes. + # max-index-log-file-size = "1m" + + # The maximum series allowed per database before writes are dropped. This limit can prevent + # high cardinality issues at the database level. This limit can be disabled by setting it to + # 0. + # max-series-per-database = 1000000 + + # The maximum number of tag values per tag that are allowed before writes are dropped. This limit + # can prevent high cardinality tag values from being written to a measurement. This limit can be + # disabled by setting it to 0. + # max-values-per-tag = 100000 + + # If true, then the mmap advise value MADV_WILLNEED will be provided to the kernel with respect to + # TSM files. This setting has been found to be problematic on some kernels, and defaults to off. + # It might help users who have slow disks in some cases. + # tsm-use-madv-willneed = false + +### +### [coordinator] +### +### Controls the clustering service configuration. +### + +[coordinator] + # The default time a write request will wait until a "timeout" error is returned to the caller. + # write-timeout = "10s" + + # The maximum number of concurrent queries allowed to be executing at one time. If a query is + # executed and exceeds this limit, an error is returned to the caller. This limit can be disabled + # by setting it to 0. + # max-concurrent-queries = 0 + + # The maximum time a query will is allowed to execute before being killed by the system. This limit + # can help prevent run away queries. Setting the value to 0 disables the limit. + # query-timeout = "0s" + + # The time threshold when a query will be logged as a slow query. This limit can be set to help + # discover slow or resource intensive queries. Setting the value to 0 disables the slow query logging. + # log-queries-after = "0s" + + # The maximum number of points a SELECT can process. A value of 0 will make + # the maximum point count unlimited. This will only be checked every second so queries will not + # be aborted immediately when hitting the limit. + # max-select-point = 0 + + # The maximum number of series a SELECT can run. A value of 0 will make the maximum series + # count unlimited. + # max-select-series = 0 + + # The maxium number of group by time bucket a SELECT can create. A value of zero will max the maximum + # number of buckets unlimited. + # max-select-buckets = 0 + +### +### [retention] +### +### Controls the enforcement of retention policies for evicting old data. +### + +[retention] + # Determines whether retention policy enforcement enabled. + # enabled = true + + # The interval of time when retention policy enforcement checks run. + # check-interval = "30m" + +### +### [shard-precreation] +### +### Controls the precreation of shards, so they are available before data arrives. +### Only shards that, after creation, will have both a start- and end-time in the +### future, will ever be created. Shards are never precreated that would be wholly +### or partially in the past. + +[shard-precreation] + # Determines whether shard pre-creation service is enabled. + # enabled = true + + # The interval of time when the check to pre-create new shards runs. + # check-interval = "10m" + + # The default period ahead of the endtime of a shard group that its successor + # group is created. + # advance-period = "30m" + +### +### Controls the system self-monitoring, statistics and diagnostics. +### +### The internal database for monitoring data is created automatically if +### if it does not already exist. The target retention within this database +### is called 'monitor' and is also created with a retention period of 7 days +### and a replication factor of 1, if it does not exist. In all cases the +### this retention policy is configured as the default for the database. + +[monitor] + # Whether to record statistics internally. + # store-enabled = true + + # The destination database for recorded statistics + # store-database = "_internal" + + # The interval at which to record statistics + # store-interval = "10s" + +### +### [http] +### +### Controls how the HTTP endpoints are configured. These are the primary +### mechanism for getting data into and out of InfluxDB. +### + +[http] + # Determines whether HTTP endpoint is enabled. + # enabled = true + + # Determines whether the Flux query endpoint is enabled. + # flux-enabled = false + + # The bind address used by the HTTP service. + bind-address = ":18086" + + # Determines whether user authentication is enabled over HTTP/HTTPS. + # auth-enabled = false + + # The default realm sent back when issuing a basic auth challenge. + # realm = "InfluxDB" + + # Determines whether HTTP request logging is enabled. + # log-enabled = true + + # Determines whether the HTTP write request logs should be suppressed when the log is enabled. + # suppress-write-log = false + + # When HTTP request logging is enabled, this option specifies the path where + # log entries should be written. If unspecified, the default is to write to stderr, which + # intermingles HTTP logs with internal InfluxDB logging. + # + # If influxd is unable to access the specified path, it will log an error and fall back to writing + # the request log to stderr. + # access-log-path = "" + + # Filters which requests should be logged. Each filter is of the pattern NNN, NNX, or NXX where N is + # a number and X is a wildcard for any number. To filter all 5xx responses, use the string 5xx. + # If multiple filters are used, then only one has to match. The default is to have no filters which + # will cause every request to be printed. + # access-log-status-filters = [] + + # Determines whether detailed write logging is enabled. + # write-tracing = false + + # Determines whether the pprof endpoint is enabled. This endpoint is used for + # troubleshooting and monitoring. + # pprof-enabled = true + + # Enables a pprof endpoint that binds to localhost:6060 immediately on startup. + # This is only needed to debug startup issues. + # debug-pprof-enabled = false + + # Determines whether HTTPS is enabled. + # https-enabled = false + + # The SSL certificate to use when HTTPS is enabled. + # https-certificate = "/etc/ssl/influxdb.pem" + + # Use a separate private key location. + # https-private-key = "" + + # The JWT auth shared secret to validate requests using JSON web tokens. + # shared-secret = "" + + # The default chunk size for result sets that should be chunked. + # max-row-limit = 0 + + # The maximum number of HTTP connections that may be open at once. New connections that + # would exceed this limit are dropped. Setting this value to 0 disables the limit. + # max-connection-limit = 0 + + # Enable http service over unix domain socket + # unix-socket-enabled = false + + # The path of the unix domain socket. + # bind-socket = "/var/run/influxdb.sock" + + # The maximum size of a client request body, in bytes. Setting this value to 0 disables the limit. + # max-body-size = 25000000 + + # The maximum number of writes processed concurrently. + # Setting this to 0 disables the limit. + # max-concurrent-write-limit = 0 + + # The maximum number of writes queued for processing. + # Setting this to 0 disables the limit. + # max-enqueued-write-limit = 0 + + # The maximum duration for a write to wait in the queue to be processed. + # Setting this to 0 or setting max-concurrent-write-limit to 0 disables the limit. + # enqueued-write-timeout = 0 + +### +### [logging] +### +### Controls how the logger emits logs to the output. +### + +[logging] + # Determines which log encoder to use for logs. Available options + # are auto, logfmt, and json. auto will use a more a more user-friendly + # output format if the output terminal is a TTY, but the format is not as + # easily machine-readable. When the output is a non-TTY, auto will use + # logfmt. + # format = "auto" + + # Determines which level of logs will be emitted. The available levels + # are error, warn, info, and debug. Logs that are equal to or above the + # specified level will be emitted. + # level = "info" + + # Suppresses the logo output that is printed when the program is started. + # The logo is always suppressed if STDOUT is not a TTY. + # suppress-logo = false + +### +### [subscriber] +### +### Controls the subscriptions, which can be used to fork a copy of all data +### received by the InfluxDB host. +### + +[subscriber] + # Determines whether the subscriber service is enabled. + # enabled = true + + # The default timeout for HTTP writes to subscribers. + # http-timeout = "30s" + + # Allows insecure HTTPS connections to subscribers. This is useful when testing with self- + # signed certificates. + # insecure-skip-verify = false + + # The path to the PEM encoded CA certs file. If the empty string, the default system certs will be used + # ca-certs = "" + + # The number of writer goroutines processing the write channel. + # write-concurrency = 40 + + # The number of in-flight writes buffered in the write channel. + # write-buffer-size = 1000 + + +### +### [[graphite]] +### +### Controls one or many listeners for Graphite data. +### + +[[graphite]] + # Determines whether the graphite endpoint is enabled. + # enabled = false + # database = "graphite" + # retention-policy = "" + # bind-address = ":2003" + # protocol = "tcp" + # consistency-level = "one" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # Flush if this many points get buffered + # batch-size = 5000 + + # number of batches that may be pending in memory + # batch-pending = 10 + + # Flush at least this often even if we haven't hit buffer limit + # batch-timeout = "1s" + + # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max. + # udp-read-buffer = 0 + + ### This string joins multiple matching 'measurement' values providing more control over the final measurement name. + # separator = "." + + ### Default tags that will be added to all metrics. These can be overridden at the template level + ### or by tags extracted from metric + # tags = ["region=us-east", "zone=1c"] + + ### Each template line requires a template pattern. It can have an optional + ### filter before the template and separated by spaces. It can also have optional extra + ### tags following the template. Multiple tags should be separated by commas and no spaces + ### similar to the line protocol format. There can be only one default template. + # templates = [ + # "*.app env.service.resource.measurement", + # # Default template + # "server.*", + # ] + +### +### [collectd] +### +### Controls one or many listeners for collectd data. +### + +[[collectd]] + # enabled = false + # bind-address = ":25826" + # database = "collectd" + # retention-policy = "" + # + # The collectd service supports either scanning a directory for multiple types + # db files, or specifying a single db file. + # typesdb = "/usr/local/share/collectd" + # + # security-level = "none" + # auth-file = "/etc/collectd/auth_file" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # Flush if this many points get buffered + # batch-size = 5000 + + # Number of batches that may be pending in memory + # batch-pending = 10 + + # Flush at least this often even if we haven't hit buffer limit + # batch-timeout = "10s" + + # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max. + # read-buffer = 0 + + # Multi-value plugins can be handled two ways. + # "split" will parse and store the multi-value plugin data into separate measurements + # "join" will parse and store the multi-value plugin as a single multi-value measurement. + # "split" is the default behavior for backward compatability with previous versions of influxdb. + # parse-multivalue-plugin = "split" +### +### [opentsdb] +### +### Controls one or many listeners for OpenTSDB data. +### + +[[opentsdb]] + # enabled = false + # bind-address = ":4242" + # database = "opentsdb" + # retention-policy = "" + # consistency-level = "one" + # tls-enabled = false + # certificate= "/etc/ssl/influxdb.pem" + + # Log an error for every malformed point. + # log-point-errors = true + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Only points + # metrics received over the telnet protocol undergo batching. + + # Flush if this many points get buffered + # batch-size = 1000 + + # Number of batches that may be pending in memory + # batch-pending = 5 + + # Flush at least this often even if we haven't hit buffer limit + # batch-timeout = "1s" + +### +### [[udp]] +### +### Controls the listeners for InfluxDB line protocol data via UDP. +### + +[[udp]] + # enabled = false + # bind-address = ":8089" + # database = "udp" + # retention-policy = "" + + # InfluxDB precision for timestamps on received points ("" or "n", "u", "ms", "s", "m", "h") + # precision = "" + + # These next lines control how batching works. You should have this enabled + # otherwise you could get dropped metrics or poor performance. Batching + # will buffer points in memory if you have many coming in. + + # Flush if this many points get buffered + # batch-size = 5000 + + # Number of batches that may be pending in memory + # batch-pending = 10 + + # Will flush at least this often even if we haven't hit buffer limit + # batch-timeout = "1s" + + # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max. + # read-buffer = 0 + +### +### [continuous_queries] +### +### Controls how continuous queries are run within InfluxDB. +### + +[continuous_queries] + # Determines whether the continuous query service is enabled. + # enabled = true + + # Controls whether queries are logged when executed by the CQ service. + # log-enabled = true + + # Controls whether queries are logged to the self-monitoring data store. + # query-stats-enabled = false + + # interval for how often continuous queries will be checked if they need to run + # run-interval = "1s" + +### +### [tls] +### +### Global configuration settings for TLS in InfluxDB. +### + +[tls] + # Determines the available set of cipher suites. See https://golang.org/pkg/crypto/tls/#pkg-constants + # for a list of available ciphers, which depends on the version of Go (use the query + # SHOW DIAGNOSTICS to see the version of Go used to build InfluxDB). If not specified, uses + # the default settings from Go's crypto/tls package. + # ciphers = [ + # "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", + # "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + # ] + + # Minimum version of the tls protocol that will be negotiated. If not specified, uses the + # default settings from Go's crypto/tls package. + # min-version = "tls1.2" + + # Maximum version of the tls protocol that will be negotiated. If not specified, uses the + # default settings from Go's crypto/tls package. + # max-version = "tls1.2" diff --git a/build/extraResources/influxdb-1.7.0/start-influxdb.bat b/build/extraResources/influxdb-1.7.0/start-influxdb.bat new file mode 100644 index 0000000..dfedd5d --- /dev/null +++ b/build/extraResources/influxdb-1.7.0/start-influxdb.bat @@ -0,0 +1,4 @@ +@echo off +cd /d "%~dp0" +influxd.exe -config "%~dp0influxdb.conf" +pause diff --git a/frontend/src/api/steady/steadyDataView/index.ts b/frontend/src/api/steady/steadyDataView/index.ts index 22d10fe..3a1f1ca 100644 --- a/frontend/src/api/steady/steadyDataView/index.ts +++ b/frontend/src/api/steady/steadyDataView/index.ts @@ -10,9 +10,9 @@ export const getSteadyTrendIndicatorTree = () => { } export const querySteadyTrend = (params: SteadyDataView.SteadyTrendQueryParams) => { - return http.post('/steady/data-view/trend/query', params) + return http.post('/steady/data-view/trend/query', params, { loading: false }) } export const querySteadyTrendDay = (params: SteadyDataView.SteadyTrendQueryParams) => { - return http.post('/steady/data-view/trend/day', params) + return http.post('/steady/data-view/trend/day', params, { loading: false }) } diff --git a/frontend/src/api/tools/addData/index.ts b/frontend/src/api/tools/addData/index.ts index 250e8ce..3375b82 100644 --- a/frontend/src/api/tools/addData/index.ts +++ b/frontend/src/api/tools/addData/index.ts @@ -6,6 +6,7 @@ type AddDataRequestMethod = 'get' | 'post' const ADD_DATA_ROUTE_PATHS = ['/addData', '/api/addData'] as const const ADD_DATA_BASE_URL = String(import.meta.env.VITE_API_URL || '').trim() +const ADD_DATA_INFLUX_STORAGE_TYPE = 'INFLUXDB' const resolveDevProxyTarget = () => { const proxyConfig = import.meta.env.VITE_PROXY @@ -81,16 +82,25 @@ const requestAddData = async ( throw lastError } +const resolveTaskPathPrefix = (storageType?: AddData.StorageType) => { + // MySQL 与 InfluxDB 任务接口相互独立，创建和状态轮询必须使用同一入库类型前缀。 + return storageType === ADD_DATA_INFLUX_STORAGE_TYPE ? '/influx/task' : '/task' +} + +export const getAddDataStorageTypeList = () => { + return requestAddData('get', '/storage-type/list') +} + export const getAddDataPreview = (params: AddData.TaskRequestParams) => { return requestAddData('post', '/task/preview', params) } -export const createAddDataTask = (params: AddData.TaskRequestParams) => { - return requestAddData('post', '/task/create', params) +export const createAddDataTask = (params: AddData.TaskRequestParams, storageType?: AddData.StorageType) => { + return requestAddData('post', `${resolveTaskPathPrefix(storageType)}/create`, params) } -export const getAddDataTaskStatus = (taskId: string | number) => { - return requestAddData('get', `/task/status/${taskId}`) +export const getAddDataTaskStatus = (taskId: string | number, storageType?: AddData.StorageType) => { + return requestAddData('get', `${resolveTaskPathPrefix(storageType)}/status/${taskId}`) } export const getAddDataTemplateList = () => { diff --git a/frontend/src/api/tools/addData/interface/index.ts b/frontend/src/api/tools/addData/interface/index.ts index c626e9a..b7fb511 100644 --- a/frontend/src/api/tools/addData/interface/index.ts +++ b/frontend/src/api/tools/addData/interface/index.ts @@ -1,6 +1,7 @@ export namespace AddData { export type LineMode = 'single' | 'multiple' export type IntervalMinutes = 1 | 3 | 5 | 10 + export type StorageType = 'MYSQL' | 'INFLUXDB' | (string & {}) export type TaskStatus = 'WAITING' | 'RUNNING' | 'SUCCESS' | 'FAILED' | (string & {}) export interface TaskRequestParams { @@ -12,12 +13,18 @@ export namespace AddData { export interface TaskFormModel { lineMode: LineMode + storageType: StorageType lineIds: string[] startTime: string endTime: string intervalMinutes: IntervalMinutes } + export interface StorageTypeItem { + code?: StorageType + name?: string + } + export interface PreviewTableStat { tableName?: string timePointCount?: number | string @@ -106,4 +113,9 @@ export namespace AddData { cp95ValueRule: string decimalScaleText: string } + + export interface StorageTypeOption { + code: StorageType + name: string + } } diff --git a/frontend/src/api/tools/addLedger/check-api-debug-contract.mjs b/frontend/src/api/tools/addLedger/check-api-debug-contract.mjs index 7822c77..f4b8e83 100644 --- a/frontend/src/api/tools/addLedger/check-api-debug-contract.mjs +++ b/frontend/src/api/tools/addLedger/check-api-debug-contract.mjs @@ -11,12 +11,23 @@ const apiSource = fs.readFileSync(apiFile, 'utf8') const interfaceSource = fs.readFileSync(interfaceFile, 'utf8') const expectations = [ + [ + 'equipment payload uses network param as single source for mac and ndid', + /const networkParam = resolveOptionalText\(params\.mac\)/.test(apiSource) && + /ndid:\s*networkParam/.test(apiSource) && + /mac:\s*networkParam/.test(apiSource) + ], ['equipment payload maps devType', /devType:\s*params\.dev_type/], ['equipment payload maps devModel', /devModel:\s*params\.dev_model/], ['equipment payload maps devAccessMethod', /devAccessMethod:\s*params\.dev_access_method/], ['equipment payload maps nodeId', /nodeId:\s*params\.node_id/], ['equipment payload maps nodeProcess', /nodeProcess:\s*resolveOptionalNumber\(params\.node_process\)/], - ['line payload maps lineId', /lineId:\s*resolveOptionalText\(params\.line_id\s*\|\|\s*params\.id\)/], + ['line payload resolves lineId only from existing line', /const lineId = resolveOptionalText\(params\.id\s*\|\|\s*params\.line_id\)/], + ['line payload omits empty lineId field', /if \(lineId\) \{\s*payload\.lineId = lineId\s*\}/], + [ + 'new line form does not generate lineId before backend save', + /line_id:\s*''/.test(fs.readFileSync(path.join(currentDir, '..', '..', '..', 'views', 'tools', 'addLedger', 'utils', 'ledgerData.ts'), 'utf8')) + ], ['line payload maps lineNo', /lineNo:\s*params\.line_no/], ['line payload maps volGrade', /volGrade:\s*params\.vol_grade/], ['line payload maps ctRatio', /ctRatio:\s*params\.ct_ratio/], @@ -26,7 +37,10 @@ const expectations = [ ['delete response type is boolean', /requestAddLedger\('delete',\s*'\/node'/] ] -const failures = expectations.filter(([, pattern]) => !pattern.test(`${apiSource}\n${interfaceSource}`)) +const source = `${apiSource}\n${interfaceSource}` +const failures = expectations.filter(([, expectation]) => + typeof expectation === 'boolean' ? !expectation : !expectation.test(source) +) if (failures.length) { console.error('addLedger API_DEBUG contract check failed:') diff --git a/frontend/src/api/tools/addLedger/index.ts b/frontend/src/api/tools/addLedger/index.ts index 30ef811..875b53d 100644 --- a/frontend/src/api/tools/addLedger/index.ts +++ b/frontend/src/api/tools/addLedger/index.ts @@ -27,41 +27,54 @@ const toAddLedgerProjectPayload = (params: AddLedger.ProjectForm) => ({ description: params.description }) -const toAddLedgerEquipmentPayload = (params: AddLedger.EquipmentForm) => ({ - id: resolveOptionalText(params.id), - projectId: resolveOptionalText(params.projectId || params.parentId), - name: params.name, - ndid: params.ndid, - mac: params.mac, - devType: params.dev_type, - devModel: params.dev_model, - devAccessMethod: params.dev_access_method, - nodeId: params.node_id, - nodeProcess: resolveOptionalNumber(params.node_process), - upgrade: params.upgrade -}) +const toAddLedgerEquipmentPayload = (params: AddLedger.EquipmentForm) => { + // 后端仍接收 mac/ndid 两个字段，前端统一用“装置网络参数”作为唯一来源。 + const networkParam = resolveOptionalText(params.mac) -const toAddLedgerLinePayload = (params: AddLedger.LineForm) => ({ - lineId: resolveOptionalText(params.line_id || params.id), - deviceId: resolveOptionalText(params.deviceId || params.parentId), - name: params.name, - lineNo: params.line_no, - conType: params.conType, - volGrade: params.vol_grade, - position: params.position, - ctRatio: params.ct_ratio, - ct2Ratio: params.ct2_ratio, - ptRatio: params.pt_ratio, - pt2Ratio: params.pt2_ratio, - shortCircuitCapacity: params.short_circuit_capacity, - basicCapacity: params.basic_capacity, - protocolCapacity: params.protocol_capacity, - devCapacity: params.dev_capacity, - monitorObj: params.monitor_obj, - isGovern: params.is_govern, - monitorUser: params.monitor_user, - isImportant: params.is_important -}) + return { + id: resolveOptionalText(params.id), + projectId: resolveOptionalText(params.projectId || params.parentId), + name: params.name, + ndid: networkParam, + mac: networkParam, + devType: params.dev_type, + devModel: params.dev_model, + devAccessMethod: params.dev_access_method, + nodeId: params.node_id, + nodeProcess: resolveOptionalNumber(params.node_process), + upgrade: params.upgrade + } +} + +const toAddLedgerLinePayload = (params: AddLedger.LineForm) => { + const lineId = resolveOptionalText(params.id || params.line_id) + const payload = { + deviceId: resolveOptionalText(params.deviceId || params.parentId), + name: params.name, + lineNo: params.line_no, + conType: params.conType, + volGrade: params.vol_grade, + position: params.position, + ctRatio: params.ct_ratio, + ct2Ratio: params.ct2_ratio, + ptRatio: params.pt_ratio, + pt2Ratio: params.pt2_ratio, + shortCircuitCapacity: params.short_circuit_capacity, + basicCapacity: params.basic_capacity, + protocolCapacity: params.protocol_capacity, + devCapacity: params.dev_capacity, + monitorObj: params.monitor_obj, + isGovern: params.is_govern, + monitorUser: params.monitor_user, + isImportant: params.is_important + } as Record + + if (lineId) { + payload.lineId = lineId + } + + return payload +} const resolveDevProxyTarget = () => { const proxyConfig = import.meta.env.VITE_PROXY diff --git a/frontend/src/constants/dictCodes.ts b/frontend/src/constants/dictCodes.ts index 7ed9f4e..48003d5 100644 --- a/frontend/src/constants/dictCodes.ts +++ b/frontend/src/constants/dictCodes.ts @@ -2,7 +2,8 @@ export const DICT_CODES = { USER_STATE: 'state', EVENT_TYPE: 'event_type', LEDGER_DEVICE_TYPE: 'ledger_device_type', - LEDGER_DEVICE_MODEL: 'Ex-factory_Dev_Type' + LEDGER_DEVICE_MODEL: 'Ex-factory_Dev_Type', + LEDGER_TERMINAL_MODEL: 'Dev_Type' } as const export type DictCode = (typeof DICT_CODES)[keyof typeof DICT_CODES] diff --git a/frontend/src/views/steady/steadyDataView/components/SteadyIndicatorFloatingPanel.vue b/frontend/src/views/steady/steadyDataView/components/SteadyIndicatorFloatingPanel.vue index 4a70e59..0414b3f 100644 --- a/frontend/src/views/steady/steadyDataView/components/SteadyIndicatorFloatingPanel.vue +++ b/frontend/src/views/steady/steadyDataView/components/SteadyIndicatorFloatingPanel.vue @@ -6,14 +6,6 @@ circle @click="emit('update:collapsed', !collapsed)" /> -
() - -const collapsedLabel = '\u7a33\u6001\u6307\u6807' diff --git a/frontend/src/views/steady/steadyDataView/components/SteadyIndicatorTree.vue b/frontend/src/views/steady/steadyDataView/components/SteadyIndicatorTree.vue index 1f4d349..cbca465 100644 --- a/frontend/src/views/steady/steadyDataView/components/SteadyIndicatorTree.vue +++ b/frontend/src/views/steady/steadyDataView/components/SteadyIndicatorTree.vue @@ -96,7 +96,6 @@ watch( padding: 12px; } -.panel-header, .tree-node { display: flex; align-items: center; @@ -104,6 +103,13 @@ watch( gap: 8px; } +.panel-header { + display: flex; + align-items: center; + justify-content: flex-start; + gap: 14px; +} + .panel-title { font-size: 14px; font-weight: 600; diff --git a/frontend/src/views/steady/steadyDataView/components/SteadyLedgerTree.vue b/frontend/src/views/steady/steadyDataView/components/SteadyLedgerTree.vue index b3b7635..ff8b721 100644 --- a/frontend/src/views/steady/steadyDataView/components/SteadyLedgerTree.vue +++ b/frontend/src/views/steady/steadyDataView/components/SteadyLedgerTree.vue @@ -34,8 +34,8 @@ {{ data.name }} -