Browse Source

Merge branch 'master' of git.sagacloud.cn:web/ibms into apiupdate-zy

zhangyu 5 years ago
parent
commit
9496672100

+ 2 - 1
config/dev.env.js

@@ -6,5 +6,6 @@ module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
     NODE_ENV: '"development"',
     BASE_URL: '"http://192.168.20.215"', //测试iframe地址
     BASE_URL: '"http://192.168.20.215"', //测试iframe地址
     SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
     SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
-    // SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境
+    // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
+    // BASE_URL: '"http://mbi.sagacloud.cn"' //线上iframe地址
 })
 })

+ 4 - 2
src/components/config_point/examine_main.vue

@@ -43,10 +43,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         data() {
         data() {
             return {
             return {

+ 4 - 2
src/components/config_point/find_keyword.vue

@@ -75,10 +75,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         components: {
         components: {
             cutString,
             cutString,

+ 4 - 2
src/components/config_point/location_flag.vue

@@ -47,10 +47,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         created() {},
         created() {},
         mounted() {
         mounted() {

+ 4 - 2
src/components/config_point/step3_point/3_identify.vue

@@ -59,10 +59,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         methods: {
         methods: {
             aiHandle(value) {
             aiHandle(value) {

+ 4 - 2
src/components/config_point/step3_point/3_temps.vue

@@ -93,10 +93,12 @@
         name: "tempsThree",
         name: "tempsThree",
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         props: {
         props: {
             renderData: {
             renderData: {

+ 4 - 2
src/components/config_point/step3_point/dialog_main.vue

@@ -48,10 +48,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         created() {
         created() {
             this.getData()
             this.getData()

+ 4 - 2
src/components/config_point/step3_point/steps3_main.vue

@@ -38,10 +38,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         created() {
         created() {
             this.getData()
             this.getData()

+ 2 - 2
src/store/modules/proMess.js

@@ -1,8 +1,8 @@
 const project_mess = {
 const project_mess = {
     namespaced: true,
     namespaced: true,
     state: {
     state: {
-        projectId: "Pj4201050001", //项目id
-        secret: "saga123456", //数据源id
+        projectId: "", //项目id
+        secret: "", //数据源id
         userId: "test", //数据源类型
         userId: "test", //数据源类型
     },
     },
     mutations: {
     mutations: {

+ 0 - 13
src/store/modules/project.js

@@ -1,15 +1,11 @@
 const project_mess = {
 const project_mess = {
     namespaced: true,
     namespaced: true,
     state: {
     state: {
-        projectId: "", //项目id
         datasourceId: "", //数据源id
         datasourceId: "", //数据源id
         protocolType: "", //数据源类型
         protocolType: "", //数据源类型
         dataName: ""
         dataName: ""
     },
     },
     mutations: {
     mutations: {
-        set_project(state, val) {
-            state.projectId = val
-        },
         set_datasource(state, val) {
         set_datasource(state, val) {
             state.datasourceId = val
             state.datasourceId = val
         },
         },
@@ -24,19 +20,10 @@ const project_mess = {
 
 
     },
     },
     getters: {
     getters: {
-        projectId: state => state.projectId,
         datasourceId: state => state.datasourceId,
         datasourceId: state => state.datasourceId,
         protocolType: state => state.protocolType,
         protocolType: state => state.protocolType,
         dataName: state => state.dataName
         dataName: state => state.dataName
     }
     }
 }
 }
 
 
-let projectId = localStorage.getItem('projectId')
-if (!projectId) {
-    localStorage.setItem('projectId', '1234567890')
-    project_mess.state.projectId = '1234567890'
-} else {
-    project_mess.state.projectId = projectId
-}
-
 export default project_mess
 export default project_mess

+ 4 - 2
src/views/point/config_point/steps/step1.vue

@@ -101,10 +101,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         created() {},
         created() {},
         mounted() {
         mounted() {

+ 4 - 2
src/views/point/config_point/steps/step2.vue

@@ -120,10 +120,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         methods: {
         methods: {
             clickTable(info, row) {
             clickTable(info, row) {

+ 4 - 2
src/views/point/config_point/steps/step3.vue

@@ -56,10 +56,12 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType"
                 "protocolType"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         created() {
         created() {
             if (!this.protocolType) {
             if (!this.protocolType) {

+ 4 - 2
src/views/point/config_point/steps/step4.vue

@@ -57,11 +57,13 @@
         },
         },
         computed: {
         computed: {
             ...mapGetters("project", [
             ...mapGetters("project", [
-                "projectId",
                 "datasourceId",
                 "datasourceId",
                 "protocolType",
                 "protocolType",
                 "dataName"
                 "dataName"
-            ])
+            ]),
+            projectId () {
+                return this.$store.getters['layout/projectId']
+            }
         },
         },
         created() {},
         created() {},
         mounted() {
         mounted() {

+ 9 - 3
src/views/project_setting/collection_setting/index.vue

@@ -839,8 +839,8 @@
     }
     }
     #page-main .el-tabs__content{
     #page-main .el-tabs__content{
         height: 100%;
         height: 100%;
-        // overflow-y: auto;
-        overflow: hidden;
+        overflow-y: auto;
+        // overflow: hidden;
     }
     }
 </style>
 </style>
 
 
@@ -968,8 +968,14 @@
                     }
                     }
                     ul {
                     ul {
                         display: inline-block;
                         display: inline-block;
-                        width: 240px;
+                        width: 230px;
                         line-height: 30px;
                         line-height: 30px;
+                        .el-checkbox{
+                            width: 220px;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                        }
                     }
                     }
                 }
                 }
             }
             }