Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

8 天以前 10d4c82e729694bd49a29f589d607690dc4b71f8

 src/main.js

@@ -61,7 +61,7 @@
app.config.globalProperties.addDateRange = addDateRange

app.config.globalProperties.selectDictLabel = selectDictLabel

app.config.globalProperties.selectDictLabels = selectDictLabels

app.config.globalProperties.javaApi = 'http://192.168.1.35:8080'

app.config.globalProperties.javaApi = 'http://114.132.189.42:7003'

app.config.globalProperties.HaveJson = (val) => {

  return JSON.parse(JSON.stringify(val));

};