Merge branch 'master' of http://116.63.33.55/git/industry-data-platform into master

industry-admin/src/views/report/runConfig/reportAuth.vue

@@ -1,7 +1,11 @@
 <template>
     <el-dialog :title="title" width="50%" center custom-class="dialog-max" top="5vh" :before-close="dialogClose"
         :visible.sync="visible" :append-to-body="true" @open="dialogOpen" @close="dialogClose">
-        <el-transfer v-model="hasUserGroupList" :data="userGroupList" :props="userGroupProp"></el-transfer>
+        <el-transfer v-model="hasUserGroupList"
+                     :data="userGroupList"
+                     :props="userGroupProp"
+                     :titles="['用户组列表', '已选用户组']"
+        ></el-transfer>
         <div slot="footer" style="text-align: right">
             <el-button size="mini" type="primary" @click="tableAssignUserEvent" style="margin-top: 20px">确定</el-button>
             <el-button size="mini" @click="dialogClose" style="margin-top: 20px">取消</el-button>

industry-admin/src/views/source/dataQuery/index.vue

@@ -76,7 +76,7 @@
                                     :value="scheme.id">
                                     <span style="float: left">{{ scheme.schemeName }}</span>
                                     <span style="float: right; color: #8492a6; font-size: 13px;margin-top: 10px;"
-                                        class="el-icon-circle-close" @click="delSchemeEvent(scheme.id)"></span>
+                                        class="el-icon-delete" @click.stop="delSchemeEvent(scheme.id)"></span>
                                 </el-option>
                             </el-select>
                             <el-button type="primary" size="small" @click="saveSchemeEvent">保存方案</el-button>
@@ -861,8 +861,8 @@ export default {
                     this.getAllDataScheme((data) => {
                         if (data.length > 0) {
                             let id = data[0].id
-                            this.chooseScheme = id
-                            this.chooseSchemeEvent(id)
+                            //this.chooseScheme = id
+                            //this.chooseSchemeEvent(id)
                         }
                     })
                 })

industry-admin/src/views/source/dataSource/index.vue

@@ -69,6 +69,10 @@
                 </el-tag>
               </el-form-item>
             </el-form>
+            <div slot='footer' style="text-align: right">
+              <el-button type="primary" size="mini" @click='winSave()'>保存</el-button>
+              <el-button @click='winClose' size="mini">取消</el-button>
+            </div>
           </div>
         </div>
       </el-dialog>
@@ -464,6 +468,12 @@ export default {
       this.$refs['dataSourceForm'].validate(valid => {
         if (valid) {
           // this.initDataSourceForm()
+          this.driverList = [];
+          this.driverList.push({
+            'clsId': this.dataSourceForm.clsId,
+            'description': this.dataSourceForm.driverDescribe,
+            'progId': this.dataSourceForm.progId
+          })
           this.configVisible = true
         }
       })
@@ -504,6 +514,7 @@ export default {
               this.showMsg('保存成功！', true)
               this.handleConfigClose()
               this.handleClose()
+              this.getAllDataSource()
             }
           })
 
@@ -552,6 +563,12 @@ export default {
       this.$refs['dataSourceForm'].resetFields()
       this.datasourceDialogVisible = false
     },
+    winClose(){
+      this.datasourceDialogVisible = false
+    },
+    winSave(){
+      //只修改名称和备注
+    },
     /** 配置弹出层关闭事件 */
     handleConfigClose() {
       // this.initDataSourceForm()

industry-admin/src/views/source/itemGroup/index.vue

@@ -54,7 +54,7 @@ export default {
       tableHeaderTitle: [
         {
           propName: "groupName",
-          labelName: "数据组1",
+          labelName: "数据组",
           align: "left"
         },
         {