031026
/
ui
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(添加测试接口)

master
031026 2024-05-15 22:43:16 +08:00
parent 359f816f59
commit 49cd80cf39
2 changed files with 87 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/accredit/auth.js
View File

@ -28,9 +28,10 @@ export function delAuth(data) {
} }
export function assetsList() { export function assetsList(data) {
return request({ return request({
url: '/source/assets/assetsList', url: '/source/assets/assetsList',
method: 'get' method: 'post',
data
}) })
} }

128
src/views/ruleengine/engineVersion/index.vue
View File

@ -233,42 +233,41 @@
:label='_dataModel.name + "("+_dataModel.comment+")"'> :label='_dataModel.name + "("+_dataModel.comment+")"'>
<el-radio v-model="dataMode" :label="_dataModel.name" :value="_dataModel.id">{{dataModeMapList[dataModeMapIndex][_dataModel.name]}}</el-radio> <el-radio v-model="dataMode" :label="_dataModel.name" :value="_dataModel.id">{{dataModeMapList[dataModeMapIndex][_dataModel.name]}}</el-radio>
{{dataModeMapList}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<el-card class="box-card" v-if="this.ruleEngineInfo.level !== 'dataSetContext'"> <el-card class="box-card" v-if="this.ruleEngineInfo.ruleengine.level !== 'dataSetContext'">
<!-- <div slot="header" class="clearfix">--> <div slot="header" class="clearfix">
<!-- <span>{{this.ruleEngineInfo.ruleengine.level === "data-set" ? "选择资产集" : "选择资产记录"}}</span>--> <span>{{this.ruleEngineInfo.ruleengine.level === "data-set" ? "选择资产集" : "选择资产记录"}}</span>
<!-- <el-table :data="dataModeMapList" max-height="200px"--> <el-table :data="dataModeMapList" max-height="200px"
<!-- @selection-change="changeDataRow">--> @selection-change="changeDataRow">
<!-- @selection-change="changeDataRow">--> <el-table-column type="selection" width="55" v-if="this.ruleEngineInfo.ruleengine.level === 'data-set'"/>
<!-- <el-table-column type="selection" width="55" v-if="this.ruleEngineInfo.level === 'data-set'"/>--> <el-table-column v-for="dataModel in dataModelList" :label="dataModel.comment" :prop="dataModel.name"/>
<!-- <el-table-column v-for="dataModel in dataModelList" :label="dataModel.comment" :prop="dataModel.name"/>--> <el-table-column label="操作" v-if="this.ruleEngineInfo.ruleengine.level !== 'data-set'">
<!-- <el-table-column label="操作" v-if="this.ruleEngineInfo.level !== 'data-set'">--> <template slot-scope="scope">
<!-- <template slot-scope="scope">--> <el-button type="text" @click="dataRecordSelect(scope.row)">选择</el-button>
<!-- <el-button type="text" @click="dataRecordSelect(scope.row)">选择</el-button>--> </template>
<!-- </template>--> </el-table-column>
<!-- </el-table-column>--> </el-table>
<!-- </el-table>--> <el-descriptions title="选择行数据" direction="vertical" :column="3" border style="margin-top: 20px" v-if="dataRecordSelectData != null">
<!-- <el-descriptions title="选择行数据" direction="vertical" :column="3" border style="margin-top: 20px" v-if="dataRecordSelectData != null">--> <el-descriptions-item v-for="(val, key) in dataRecordSelectData"
<!-- <el-descriptions-item v-for="(val, key) in dataRecordSelectData"--> :label='key'>
<!-- :label='key'>--> <el-checkbox v-model="dataRecordSelectKeyList" :label="key" :value="key">{{val}}</el-checkbox>
<!-- <el-checkbox v-model="dataRecordSelectKeyList" :label="key" :value="key">{{val}}</el-checkbox>--> </el-descriptions-item>
<!-- </el-descriptions-item>--> </el-descriptions>
<!-- </el-descriptions>--> <el-descriptions title="选择模型" :column="3" border style="margin-top: 20px" v-if="dataModeMap.length !== 0">
<!-- <el-descriptions title="选择模型" :column="3" border style="margin-top: 20px" v-if="changeDataList.length !== 0">--> <el-descriptions-item v-for="_dataModel in dataModelList"
<!-- <el-descriptions-item v-for="_dataModel in dataModelList"--> :label='_dataModel.comment'>
<!-- :label='_dataModel.comment'>--> <el-checkbox v-model="dataRecordSelectKeyList" :label="_dataModel.name" :value="_dataModel.id"></el-checkbox>
<!-- <el-checkbox v-model="dataRecordSelectKeyList" :label="_dataModel.name" :value="_dataModel.id"></el-checkbox>--> </el-descriptions-item>
<!-- </el-descriptions-item>--> </el-descriptions>
<!-- </el-descriptions>--> </div>
</el-card> </el-card>
</el-col> </el-col>
<!-- <el-col :span="24" style="margin-top: 10px" v-if="dataMode != null || dataRecordSelectKeyList.length > 0">--> <el-col :span="24" style="margin-top: 10px" v-if="dataMode != null || dataRecordSelectKeyList.length > 0">
<!-- <el-button @click="dataTest">测试</el-button>--> <el-button @click="dataTest">测试</el-button>
<!-- <el-input style="margin-top: 10px" v-model="testResult" type="textarea" placeholder="请点击测试" disabled/>--> <el-input style="margin-top: 10px" v-model="testResult" type="textarea" placeholder="请点击测试" disabled/>
<!-- </el-col>--> </el-col>
</el-col> </el-col>
</el-row> </el-row>
</el-drawer> </el-drawer>
@ -276,9 +275,9 @@
</template> </template>
<script> <script>
import { details, versionsAdd, engineOnOff, statusOnOff, versionsUpd, ruleengine, loader } from '@/api/rule/maintenance' import { details, versionsAdd, engineOnOff, statusOnOff, versionsUpd, ruleengine} from '@/api/rule/maintenance'
import Encoding from "@/components/Encoding/index.vue"; import Encoding from "@/components/Encoding/index.vue";
import { information } from '@/api/dataSource/source' import { database, information } from '@/api/dataSource/source'
import { assetsList } from '@/api/accredit/auth' import { assetsList } from '@/api/accredit/auth'
export default { export default {
name: "EngineVersion", name: "EngineVersion",
@ -303,6 +302,8 @@ export default {
engineVersionList:[], engineVersionList:[],
}, },
dataModeMapIndex:0, dataModeMapIndex:0,
dataRecordSelectKeyList:[],
dataRecordSelectData:[],
// 新增版本 // 新增版本
addVersionStatus: false, addVersionStatus: false,
engineVersionForm: { engineVersionForm: {
@ -344,6 +345,9 @@ export default {
keyList:[], keyList:[],
dataList:[], dataList:[],
dataModeMap:[], dataModeMap:[],
dataName:[],
dataVal:[],
newData:[],
} }
}, },
created() { created() {
@ -373,20 +377,59 @@ export default {
console.log("assets监听",val) console.log("assets监听",val)
this.keyList=[] this.keyList=[]
this.assetsList.forEach(res=>{ this.assetsList.forEach(res=>{
console.log("遍历",res)
if (res.name === val) { if (res.name === val) {
console.log("过滤后的数据",res)
this.dataModelList = res.databaseTables this.dataModelList = res.databaseTables
this.dataName=[]
database(val).then(res=>{
for (let resKey in res.data){
this.dataName.push(res.data[resKey].name)
}
})
assetsList(val).then(res=>{
this.dataModeMap=res.data
this.dataVal=[]
for (let resKey in res.data){
this.dataVal.push({
key:res.data[resKey].assetKey.split("-")[2],
value:res.data[resKey].value,
type:res.data[resKey].type
})
console.log("res.data[resKey].assetKey",res.data[resKey].assetKey.split("-")[2])
console.log("res.data[resKey].value",res.data[resKey].value)
console.log("res.data[resKey].type",res.data[resKey].type)
this.dataModeMap.forEach(KeyValue=>{ if (this.dataVal != null) {
this.newData = []
if (KeyValue.tableName === res.name) { let keys = this.dataName
console.log("keys",this.dataName)
this.dataModeMapList.push(KeyValue) let count = keys.length
const newData = this.dataVal.reduce((acc, curr, index) => {
if (index % count === 0 && index + count - 1 < this.dataVal.length) { // 确保不会超出数组边界
// 创建一个临时对象来存储键值对
const tempObj = {};
// 使用 keys 数组来迭代并设置 tempObj 的属性
for (let i = 0; i < keys.length; i++) {
// 访问 kvt 数组中对应位置的元素
tempObj[keys[i]] = (i === 0) ? parseInt(this.dataVal[index + i].value, 10) : this.dataVal[index + i].value;
}
// 将临时对象添加到 acc 数组中
acc.push(tempObj);
}
// 始终返回累加器数组
return acc;
}, []);
this.newData = newData
console.log("newData",newData)
console.log("this.newData====",this.newData)
}
this.dataModeMapList = this.newData
console.log("this.newData=============",this.newData)
console.log("dataModeMapList",this.dataModeMapList)
} }
}) })
} }
}) })
console.log("dataModeMapList===============",this.dataModeMapList)
} }
}, },
}, },
@ -413,7 +456,7 @@ export default {
this.changeDataList = val; this.changeDataList = val;
}, },
dataModelRandom(){ dataModelRandom(){
this.dataModeMapIndex = Math.floor(Math.random()*this.dataModeMapList.length);
}, },
//保存代码 //保存代码
saveCoding: function() { saveCoding: function() {
@ -596,9 +639,6 @@ public class ${this.engineVersionForm.versionCode} extends ${parentClass} {
this.assetStructureList=res.data this.assetStructureList=res.data
console.log("数据结构",this.assetStructureList) console.log("数据结构",this.assetStructureList)
}) })
assetsList().then(res=>{
this.dataModeMap=res.data
})
} }
} }