openatc-components 0.4.83 → 0.4.85
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 -4
package/package.json
CHANGED
package/src/utils/conflct.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
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
7
|
let uploadData = await UploadTscParam(id)
|
|
8
|
+
console.log('computedRelation', uploadData)
|
|
8
9
|
if (!uploadData) return
|
|
9
10
|
let results = []
|
|
10
11
|
let channel = uploadData.channelList
|
|
@@ -212,7 +213,7 @@ export function getDefaul (data) {
|
|
|
212
213
|
export function UploadTscParam (id) {
|
|
213
214
|
return getIntersectionInfo(id).then(res => {
|
|
214
215
|
if (!res.data.success) {
|
|
215
|
-
let commomMsg =
|
|
216
|
+
let commomMsg = i18n.t('openatccomponents.overview.signalID') + ' : ' + id
|
|
216
217
|
let msg = getMessageByCode(res.data.code, i18n.locale)
|
|
217
218
|
if (res.data.data) {
|
|
218
219
|
// 子类型错误
|
|
@@ -223,13 +224,13 @@ export function UploadTscParam (id) {
|
|
|
223
224
|
}
|
|
224
225
|
}
|
|
225
226
|
msg = msg + ' - ' + commomMsg
|
|
226
|
-
|
|
227
|
+
Message.error(msg)
|
|
227
228
|
return
|
|
228
229
|
}
|
|
229
230
|
const param = res.data.data.param
|
|
230
231
|
|
|
231
232
|
if (Object.keys(param).length === 0) {
|
|
232
|
-
Message.error(
|
|
233
|
+
Message.error(i18n.t('edge.errorTip.noSchemeUpload'))
|
|
233
234
|
return
|
|
234
235
|
}
|
|
235
236
|
let allTscParam = param
|