openatc-components 0.4.83 → 0.4.84
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package/kissui.min.js +1 -1
- package/package.json +1 -1
- package/src/utils/conflct.js +5 -5
package/package.json
CHANGED
package/src/utils/conflct.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
// import store from '../store'
|
|
2
|
-
import { getIntersectionInfo } from '../api/
|
|
2
|
+
import { getIntersectionInfo } from '../api/template.js'
|
|
3
3
|
import { Message } from 'element-ui'
|
|
4
4
|
import { getMessageByCode } from '../utils/responseMessage'
|
|
5
5
|
import i18n from '../i18n/index'
|
|
6
6
|
export async function computedRelation (id) {
|
|
7
|
-
let uploadData = await
|
|
7
|
+
let uploadData = await getIntersectionInfo(id)
|
|
8
8
|
if (!uploadData) return
|
|
9
9
|
let results = []
|
|
10
10
|
let channel = uploadData.channelList
|
|
@@ -212,7 +212,7 @@ export function getDefaul (data) {
|
|
|
212
212
|
export function UploadTscParam (id) {
|
|
213
213
|
return getIntersectionInfo(id).then(res => {
|
|
214
214
|
if (!res.data.success) {
|
|
215
|
-
let commomMsg =
|
|
215
|
+
let commomMsg = i18n.t('openatccomponents.overview.signalID') + ' : ' + id
|
|
216
216
|
let msg = getMessageByCode(res.data.code, i18n.locale)
|
|
217
217
|
if (res.data.data) {
|
|
218
218
|
// 子类型错误
|
|
@@ -223,13 +223,13 @@ export function UploadTscParam (id) {
|
|
|
223
223
|
}
|
|
224
224
|
}
|
|
225
225
|
msg = msg + ' - ' + commomMsg
|
|
226
|
-
|
|
226
|
+
Message.error(msg)
|
|
227
227
|
return
|
|
228
228
|
}
|
|
229
229
|
const param = res.data.data.param
|
|
230
230
|
|
|
231
231
|
if (Object.keys(param).length === 0) {
|
|
232
|
-
Message.error(
|
|
232
|
+
Message.error(i18n.t('edge.errorTip.noSchemeUpload'))
|
|
233
233
|
return
|
|
234
234
|
}
|
|
235
235
|
let allTscParam = param
|