Merge remote-tracking branch 'origin/master'

src/views/modules/common/Chooselist.vue

@@ -111,8 +111,8 @@ export default {
       getChooselist({"tagNo": tagNo}).then(({data}) => {
         this.columnList = []
         this.baseListData = data.data
-        let start = data.data.sqlcode.indexOf("Select")
-        let end = data.data.sqlcode.indexOf("from")
+        let start = data.data.sqlcode.toUpperCase().indexOf("Select".toUpperCase())
+        let end = data.data.sqlcode.toUpperCase().indexOf("from".toUpperCase())
         let length = end - start
         let columns = data.data.sqlcode.trim().substring(start + 6, length).trim()
         let props = columns.split(",")

src/views/modules/common/Chooselist_eam.vue

@@ -111,8 +111,8 @@ export default {
       getChooselistEam({"tagNo": tagNo}).then(({data}) => {
         this.columnList = []
         this.baseListData = data.data
-        let start = data.data.sqlcode.indexOf("Select")
-        let end = data.data.sqlcode.indexOf("from")
+        let start = data.data.sqlcode.toUpperCase().indexOf("Select".toUpperCase())
+        let end = data.data.sqlcode.toUpperCase().indexOf("from".toUpperCase())
         let length = end - start
         let columns = data.data.sqlcode.trim().substring(start + 6, length).trim()
         let props = columns.split(",")