|
@@ -270,7 +270,8 @@
|
|
<el-button>取消</el-button>
|
|
<el-button>取消</el-button>
|
|
<el-button type="primary" @click="stdySubmit(dataInfo) ">确定</el-button>
|
|
<el-button type="primary" @click="stdySubmit(dataInfo) ">确定</el-button>
|
|
</div>
|
|
</div>
|
|
- <PythonKafkaTmp v-if="pythonKafkaVisible" ref="pythonKafkaTmp" @refreshDataList="getDataList"></PythonKafkaTmp>
|
|
|
|
|
|
+<!-- <PythonKafkaTmp v-if="pythonKafkaVisible" ref="pythonKafkaTmp" @refreshDataList="getDataList"></PythonKafkaTmp>-->
|
|
|
|
+ <PythonKafkaTmp v-if="pythonKafkaVisible" ref="pythonKafkaTmp" ></PythonKafkaTmp>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -774,7 +775,7 @@ export default {
|
|
key: 0,
|
|
key: 0,
|
|
prop: 'time',
|
|
prop: 'time',
|
|
label: '时间',
|
|
label: '时间',
|
|
- measurepointId: Math.floor(Math.random() * 10000 + 1)
|
|
|
|
|
|
+ measurepointId: 'time' + Math.floor(Math.random() * 10000 + 1)
|
|
}], // 数据库的字段名
|
|
}], // 数据库的字段名
|
|
icon: 'icon iconfont icon-xitong1', // 图标
|
|
icon: 'icon iconfont icon-xitong1', // 图标
|
|
sql: {
|
|
sql: {
|
|
@@ -1122,8 +1123,14 @@ export default {
|
|
// 获取代码模板
|
|
// 获取代码模板
|
|
getPythonKafkaTmp () {
|
|
getPythonKafkaTmp () {
|
|
this.pythonKafkaVisible = true
|
|
this.pythonKafkaVisible = true
|
|
|
|
+ var info = []
|
|
|
|
+ for (const meas of this.measurepoint) {
|
|
|
|
+ if (meas.indexOf('time') === -1) {
|
|
|
|
+ info.push(meas)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
- this.$refs.pythonKafkaTmp.init(this.measurepoint.join())
|
|
|
|
|
|
+ this.$refs.pythonKafkaTmp.init(info.join())
|
|
})
|
|
})
|
|
},
|
|
},
|
|
getCoal (resolve) {
|
|
getCoal (resolve) {
|