eta1.2.2

src/api/modules/dataSource.js

@@ -4,22 +4,32 @@ import http from "@/api/http.js"
 const apiDataSource={
     //获取数据源列表列配置项
     //列表类型ColumnType：1数据源明细表，2数据源统计表，3删除指标列表，4指标信息变更表"
-    tableColOpts:params=>{
+    GLTableColOpts:params=>{
         return http.get('/data_stat/source_column',params)
     },
 
     //编辑自定义列
-    tableColEdit:params=>{
+    GLTableColEdit:params=>{
         return http.post('/data_stat/source_column/edit',params)
     },
 
+    //数据源明细表
+    GLDetailTableList:params=>{
+        return http.get('/data_stat/edb_update_stat',params)
+    },
+
+    //数据源统计
+    GLStatisticTableList:params=>{
+        return http.get('/data_stat/edb_update_stat',params)
+    },
+
     //删除指标列表数据
-    delTableList:params=>{
+    GLDelTableList:params=>{
         return http.get('/data_stat/edb_delete_log',params)
     },
 
     //指标信息变更列表数据
-    edbInfoTableList:params=>{
+    GLEdbInfoTableList:params=>{
         return http.get('/data_stat/edb_update_log',params)
     },
 

src/views/dataSource_manage/accountList.vue

@@ -22,11 +22,12 @@
                 <template slot-scope="scope">
                     <span 
                         v-if="col.key==='Status'"
-                        :style="scope.row.Status===1?'':'#FF0000'"
+                        :style="{color:scope.row.Status===1?'':'#FF0000'}"
                     >{{scope.row.Status===1?'启用':'禁用'}}</span>
+                    <span v-else>{{scope.row[col.key]}}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="100">
                 <template slot-scope="scope">
                     <span 
                         style="color:#409EFF;cursor: pointer;" 
@@ -53,7 +54,12 @@
         </el-table>
 
         <!-- 新增/编辑终端账号 -->
-        <EditAccount v-model="showEditAccount" :TerminalId="activeTermId" :initData="initData"/>
+        <EditAccount 
+            v-model="showEditAccount" 
+            :TerminalId="activeTermId" 
+            :initData="initData"
+            @change="getAccountList"
+        />
     </div>
 </template>
 
@@ -79,9 +85,13 @@ export default {
                     key:'DirPath',
                 },
                 {
-                    name:'终端地址/token',
+                    name:'终端地址',
                     key:'ServerUrl',
                 },
+                {
+                    name:'终端token',
+                    key:'Value',
+                },
                 {
                     name:'数据源类型',
                     key:'Source',
@@ -97,7 +107,7 @@ export default {
                 {
                     name:'更新时间',
                     key:'ModifyTime',
-                    sortable:'custom'
+                    sortable:true
                 },
             ],
 

src/views/dataSource_manage/components/DelEDBTable.vue

@@ -58,7 +58,7 @@ export default {
     methods: {
         //获取表格数据
         getTableList(){
-            apiDataSource.delTableList({
+            apiDataSource.GLDelTableList({
                 CurrentIndex:this.page,
                 PageSize:this.pageSize,
                 SortParam:'',
@@ -81,7 +81,7 @@ export default {
         getTableColOpts(){
             this.tableColOpts=[]
             this.tableLoading=true
-            apiDataSource.tableColOpts({ColumnType:3}).then(res=>{
+            apiDataSource.GLTableColOpts({ColumnType:3}).then(res=>{
                 if(res.Ret===200){
                     const arr=res.Data.List||[]
                     this.tableColOpts=arr.filter(item=>item.IsShow===1)

src/views/dataSource_manage/components/DetailTable.vue

@@ -57,7 +57,11 @@
                 :prop="col.ColumnKey"
                 :sortable="col.IsSort===1?'custom':false"
                 align="center"
-            />
+            >
+                <template slot="header" slot-scope="scope">
+                    <span>{{col.ColumnName}}</span>
+                </template>
+            </el-table-column>
             <div slot="empty">
                 <tableNoData text="暂无数据"/>
             </div>
@@ -109,7 +113,7 @@ export default {
         getTableColOpts(){
             this.tableLoading=true
             this.tableColOpts=[]
-            apiDataSource.tableColOpts({ColumnType:1}).then(res=>{
+            apiDataSource.GLTableColOpts({ColumnType:1}).then(res=>{
                 if(res.Ret===200){
                     const arr=res.Data.List||[]
                     this.tableColOpts=arr.filter(item=>item.IsShow===1)

src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -59,7 +59,7 @@ export default {
     methods: {
         //获取表格数据
         getTableList(){
-            apiDataSource.edbInfoTableList({
+            apiDataSource.GLEdbInfoTableList({
                 CurrentIndex:this.page,
                 PageSize:this.pageSize,
                 SortParam:'',
@@ -82,7 +82,7 @@ export default {
         getTableColOpts(){
             this.tableColOpts=[]
             this.tableLoading=true
-            apiDataSource.tableColOpts({ColumnType:4}).then(res=>{
+            apiDataSource.GLTableColOpts({ColumnType:4}).then(res=>{
                 if(res.Ret===200){
                     const arr=res.Data.List||[]
                     this.tableColOpts=arr.filter(item=>item.IsShow===1)

src/views/dataSource_manage/components/EditAccount.vue

@@ -23,8 +23,11 @@
             <el-form-item label="文件夹路径" prop="dirUrl">
                 <el-input placeholder="请输入文件夹路径" v-model="formState.dirUrl"  style="width:300px" :disabled="TerminalId"></el-input>
             </el-form-item>
-            <el-form-item label="终端地址/token" prop="url">
-                <el-input placeholder="请输入终端地址/token" v-model="formState.url"  style="width:300px"></el-input>
+            <el-form-item label="终端地址" prop="url">
+                <el-input placeholder="请输入终端地址" v-model="formState.url"  style="width:300px"></el-input>
+            </el-form-item>
+            <el-form-item label="终端token" prop="token">
+                <el-input placeholder="请输入终端token" v-model="formState.token"  style="width:300px"></el-input>
             </el-form-item>
             <el-form-item label="数据源类型" prop="type">
                 <el-select 
@@ -35,9 +38,9 @@
                 >
                     <el-option 
                         v-for="item in dataSourceOpt"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
+                        :key="item.EdbSourceId"
+                        :label="item.SourceName"
+                        :value="item.EdbSourceId"
                     />
                 </el-select>
             </el-form-item>
@@ -53,18 +56,8 @@
 </template>
 
 <script>
-import {dataSourceTypeOpt} from '../utils/config'
-import {fromCode} from '@/views/dataEntry_manage/databaseComponents/util.js'
 import {apiDataSource} from '@/api/modules/dataSource.js'
-function initSourceTypeData(){
-    const arr=dataSourceTypeOpt.map(item=>{
-        return {
-            label:item,
-            value:fromCode.get(item)
-        }
-    })
-    return arr
-}
+import {dataBaseInterface} from '@/api/api.js'
 export default {
     model:{
         prop:"show",
@@ -87,26 +80,41 @@ export default {
     watch: {
         show(n,o){
             if(n&&this.TerminalId){
+                console.log('aa');
+                console.log(this.initData);
                 this.formState.name=this.initData.Name
                 this.formState.url=this.initData.ServerUrl
                 this.formState.dirUrl=this.initData.DirPath
-                this.type=this.initData.Source.toString()
-                this.num=this.initData.Num
+                this.formState.type=this.initData.Source
+                this.formState.num=this.initData.Num
+                this.formState.token=this.initData.Value
+            }
+            if(!n){
+                this.formState.name=''
+                this.formState.url=''
+                this.formState.dirUrl=''
+                this.formState.type=''
+                this.formState.num=''
+                this.formState.token=''
             }
         }
     },
     data() {
         return {
-            dataSourceOpt:initSourceTypeData(),
+            dataSourceOpt:[],
             formState:{
                 name:'',
                 url:'',
+                token:'',
                 dirUrl:'',
                 type:'',
                 num:''
             }
         }
     },
+    created() {
+        this.getTargetSource()
+    },
     methods: {
         handleClose(){
             this.$emit('close', false)
@@ -115,19 +123,32 @@ export default {
         async handleSave(){
             const params={
                 TerminalId:this.TerminalId||0,
-                Source:Number(fromCode.get(this.formState.type)),//终端类型
+                Source:Number(this.formState.type),//终端类型
                 Name:this.formState.name,
                 ServerUrl:this.formState.url,
                 DirPath:this.formState.dirUrl,
                 Num:Number(this.formState.num),
+                Value:this.formState.token
             }
             console.log(params);
             const res=await apiDataSource.accountSave(params)
             if(res.Ret===200){
                 this.$message.success('保存成功')
+                this.$emit('change')
                 this.handleClose()
             }
-        }
+        },
+
+        // 获取数据源类型
+        getTargetSource(){
+			this.dataSourceOpt = []
+			dataBaseInterface.getDataSource({IsBase:1}).then(res=>{
+				if(res.Ret!==200) return
+				if(res.Data){
+					this.dataSourceOpt = res.Data||[]
+				}
+			})
+		}
     },
 }
 </script>

src/views/dataSource_manage/components/SetTableCols.vue

@@ -65,7 +65,7 @@ export default {
     methods: {
         // 获取表格列配置项
         getTableColOpts(){
-            apiDataSource.tableColOpts({ColumnType:this.ColumnType}).then(res=>{
+            apiDataSource.GLTableColOpts({ColumnType:this.ColumnType}).then(res=>{
                 if(res.Ret===200){
                     const arr=res.Data.List||[]
                     this.list=arr.map(item=>{
@@ -85,7 +85,7 @@ export default {
                     IsShow:item.checked?1:0
                 }
             })
-            apiDataSource.tableColEdit({
+            apiDataSource.GLTableColEdit({
                 list:list
             }).then(res=>{
                 if(res.Ret===200){

src/views/dataSource_manage/components/StatisticTable.vue

@@ -58,7 +58,7 @@ export default {
         // 获取表格列配置项
         getTableColOpts(){
             this.tableColOpts=[]
-            apiDataSource.tableColOpts({ColumnType:2}).then(res=>{
+            apiDataSource.GLTableColOpts({ColumnType:2}).then(res=>{
                 if(res.Ret===200){
                     this.tableColOpts=res.Data.List||[]
                     this.$nextTick(()=>{