This commit is contained in:
lll 2023-11-10 08:30:11 +08:00
parent d8872683bd
commit c772904bdd
6 changed files with 259 additions and 83 deletions

BIN
dist.zip

Binary file not shown.

View File

@ -1,27 +1,29 @@
import axios from "axios"; import axios from "axios";
export const GetDbwirldList = () => { export const GetDbwirldList = () => {
return axios.get("/wangguan?action=queryanswer&mark=DB-IotLite_yx"); return axios.get(
"http://111.229.30.246:10013/Handler/Config.ashx?action=queryanswer&mark=DB-IotLite_yx"
);
}; };
export const SaveUserAnswer = (data) => { export const SaveUserAnswer = (data) => {
return axios.post( return axios.post(
`/wangguan?action=updatecache&mark=${data.mark}&user_id=${data.user_id}&mark_value=${data.mark_value}` `http://111.229.30.246:10013/Handler/Config.ashx?action=updatecache&mark=${data.mark}&user_id=${data.user_id}&mark_value=${data.mark_value}`
); );
}; };
export const GetUserAnswer = (data) => { export const GetUserAnswer = (data) => {
return axios.get( return axios.get(
`/wangguan?action=querycache&mark=${data.mark}&user_id=${data.user_id}` `http://111.229.30.246:10013/Handler/Config.ashx?action=querycache&mark=${data.mark}&user_id=${data.user_id}`
); );
}; };
export const GetTree = (data) => { export const GetTree = (data) => {
return axios.get( return axios.get(
`/wangguan?action=queryacquisition&user_id=${data.user_id}&type=${data.type}` `http://111.229.30.246:10013/Handler/Config.ashx?action=queryacquisition&user_id=${data.user_id}&type=${data.type}`
) );
} };
export const SendTree = (data) => { export const SendTree = (data) => {
return axios.get( return axios.get(
`/wangguan?action=updateacquisition&user_id=${data.user_id}&data=${data.data}&type=${data.type}` `http://111.229.30.246:10013/Handler/Config.ashx?action=updateacquisition&user_id=${data.user_id}&data=${data.data}&type=${data.type}`
) );
} };
//最新拿缓存请求接口 //最新拿缓存请求接口
// export let GetUserAnswer = (data) => { // export let GetUserAnswer = (data) => {
// return axios.get( // return axios.get(

View File

@ -108,7 +108,6 @@ export default {
}, },
// //
async GetUserAnswer() { async GetUserAnswer() {
this.loading = true;
let res = await GetUserAnswer({ let res = await GetUserAnswer({
mark: "CKFWQ_wx", mark: "CKFWQ_wx",
user_id: `${this.user_id}`, user_id: `${this.user_id}`,
@ -119,7 +118,6 @@ export default {
this.ruleForm.kqwk = obj.kqwk; this.ruleForm.kqwk = obj.kqwk;
this.ruleForm.wkgzfs = obj.wkgzfs; this.ruleForm.wkgzfs = obj.wkgzfs;
this.ruleForm.wkms = obj.wkms; this.ruleForm.wkms = obj.wkms;
this.loading = false;
} }
}, },
}, },

View File

@ -4,24 +4,48 @@
<!-- v-click-outside="closeMenu" --> <!-- v-click-outside="closeMenu" -->
<div> <div>
<div class="tree_menu" v-show="dialogVisible"> <div class="tree_menu" v-show="dialogVisible">
<el-tree :data="trees" node-key="id" :props="defaultProps" default-expand-all @node-contextmenu="rightClick" <el-tree
@node-click="treeNodeClick" ref="tree"> :data="trees"
node-key="id"
:props="defaultProps"
default-expand-all
@node-contextmenu="rightClick"
@node-click="treeNodeClick"
ref="tree"
>
<!-- :render-content="renderContent" --> <!-- :render-content="renderContent" -->
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<template v-if="data.editing == 1"> <template v-if="data.editing == 1">
<el-button type="mini" v-if="flag" style="right: 50px; top: 0; position: absolute; border: none" <el-button
@click.stop="done">完成</el-button> type="mini"
<el-button type="mini" style="right: 0; top: 0; position: absolute; border: none" v-if="flag"
@click.stop="edit">编辑</el-button> style="right: 50px; top: 0; position: absolute; border: none"
@click.stop="done"
>完成</el-button
>
<el-button
type="mini"
style="right: 0; top: 0; position: absolute; border: none"
@click.stop="edit"
>编辑</el-button
>
<span v-if="!flag">{{ data.label }}</span> <span v-if="!flag">{{ data.label }}</span>
<el-input v-else style="width: 150px" v-model="gateway"></el-input> <el-input
v-else
style="width: 150px"
v-model="gateway"
></el-input>
</template> </template>
<template v-else>{{ data.label }}</template> <template v-else>{{ data.label }}</template>
</span> </span>
</el-tree> </el-tree>
<!-- 树形控件右键组件 --> <!-- 树形控件右键组件 -->
<div v-show="menuShow" class="tree_rightmenu" :style="{ ...rightMenu }"> <div v-show="menuShow" class="tree_rightmenu" :style="{ ...rightMenu }">
<el-menu class="el-menu-vertical-demo" @select="selectMenuNode" default-active="#0078FE"> <el-menu
class="el-menu-vertical-demo"
@select="selectMenuNode"
default-active="#0078FE"
>
<el-menu-item id="menuitem" index="1" style="font-size: 12px"> <el-menu-item id="menuitem" index="1" style="font-size: 12px">
<span slot="title">新建通道</span> <span slot="title">新建通道</span>
</el-menu-item> </el-menu-item>
@ -33,13 +57,36 @@
</div> </div>
</div> </div>
<div class="pas_params"> <div class="pas_params">
<el-dialog title="通道参数设置" :visible.sync="add_passage" width="765px" v-loading="loading"> <el-dialog
<el-form :model="FormData" :label-position="labelPosition" :rules="rules" ref="ruleForm"> title="通道参数设置"
:visible.sync="add_passage"
width="765px"
v-loading="loading"
>
<el-form
:model="FormData"
:label-position="labelPosition"
:rules="rules"
ref="ruleForm"
>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通道名称:" :label-width="formLabelWidth" prop="tdpz_tdmc"> <el-form-item
<el-select v-model="FormData.tdpz_tdmc" placeholder="" style="width: 200px; height: 30px"> label="通道名称:"
<el-option v-for="(item, index) in options1" :key="index" :label="item.label" :value="item.value"> :label-width="formLabelWidth"
prop="tdpz_tdmc"
>
<el-select
v-model="FormData.tdpz_tdmc"
placeholder=""
style="width: 200px; height: 30px"
>
<el-option
v-for="(item, index) in options1"
:key="index"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -47,21 +94,46 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通道:" :label-width="formLabelWidth" prop="tdpz_td"> <el-form-item
<el-select v-model="FormData.tdpz_td" placeholder="" style="width: 200px; height: 30px"> label="通道:"
<el-option v-for="(item, index) in options2" :key="index" :label="item.label" :value="item.value"> :label-width="formLabelWidth"
prop="tdpz_td"
>
<el-select
v-model="FormData.tdpz_td"
placeholder=""
style="width: 200px; height: 30px"
>
<el-option
v-for="(item, index) in options2"
:key="index"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="驱动名称:" :label-width="formLabelWidth" prop="tdpz_qdmc"> <el-form-item
label="驱动名称:"
:label-width="formLabelWidth"
prop="tdpz_qdmc"
>
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-input v-model="FormData.tdpz_qdmc" placeholder="" style="width: 200px; height: 30px"></el-input> <el-input
v-model="FormData.tdpz_qdmc"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-button style="width: 50px; height: 30px" @click="getDriveName">...</el-button> <el-button
style="width: 50px; height: 30px"
@click="getDriveName"
>...</el-button
>
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
@ -69,22 +141,38 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="IP地址:" :label-width="formLabelWidth" prop="tdpz_ip"> <el-form-item
label="IP地址:"
:label-width="formLabelWidth"
prop="tdpz_ip"
>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-input v-model="tdpz_ip1" style="width: 43px; height: 30px"></el-input> <el-input
v-model="tdpz_ip1"
style="width: 43px; height: 30px"
></el-input>
</el-col> </el-col>
<el-col :span="1" style="color: #fff">. </el-col> <el-col :span="1" style="color: #fff">. </el-col>
<el-col :span="5"> <el-col :span="5">
<el-input v-model="tdpz_ip2" style="width: 43px; height: 30px"></el-input> <el-input
v-model="tdpz_ip2"
style="width: 43px; height: 30px"
></el-input>
</el-col> </el-col>
<el-col :span="1" style="color: #fff">.</el-col> <el-col :span="1" style="color: #fff">.</el-col>
<el-col :span="5"> <el-col :span="5">
<el-input v-model="tdpz_ip3" style="width: 43px; height: 30px"></el-input> <el-input
v-model="tdpz_ip3"
style="width: 43px; height: 30px"
></el-input>
</el-col> </el-col>
<el-col :span="1" style="color: #fff">.</el-col> <el-col :span="1" style="color: #fff">.</el-col>
<el-col :span="5"> <el-col :span="5">
<el-input v-model="tdpz_ip4" style="width: 43px; height: 30px"></el-input> <el-input
v-model="tdpz_ip4"
style="width: 43px; height: 30px"
></el-input>
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
@ -92,32 +180,72 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="端口号:" :label-width="formLabelWidth" prop="tdpz_port"> <el-form-item
<el-input v-model="FormData.tdpz_port" placeholder="" style="width: 200px; height: 30px"></el-input> label="端口号:"
:label-width="formLabelWidth"
prop="tdpz_port"
>
<el-input
v-model="FormData.tdpz_port"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="超过时间(ms):" :label-width="formLabelWidth" prop="tdpz_cssj"> <el-form-item
<el-input v-model="FormData.tdpz_cssj" placeholder="" style="width: 200px; height: 30px"></el-input> label="超过时间(ms):"
:label-width="formLabelWidth"
prop="tdpz_cssj"
>
<el-input
v-model="FormData.tdpz_cssj"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="间隔时间(ms):" :label-width="formLabelWidth" prop="tdpz_jgsj"> <el-form-item
<el-input v-model="FormData.tdpz_jgsj" placeholder="" style="width: 200px; height: 30px"></el-input> label="间隔时间(ms):"
:label-width="formLabelWidth"
prop="tdpz_jgsj"
>
<el-input
v-model="FormData.tdpz_jgsj"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="轮询时间(ms):" :label-width="formLabelWidth" prop="tdpz_lxsj"> <el-form-item
<el-input v-model="FormData.tdpz_lxsj" placeholder="" style="width: 200px; height: 30px"></el-input> label="轮询时间(ms):"
:label-width="formLabelWidth"
prop="tdpz_lxsj"
>
<el-input
v-model="FormData.tdpz_lxsj"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="重复次数:" :label-width="formLabelWidth" prop="tdpz_cfcs"> <el-form-item
<el-input v-model="FormData.tdpz_cfcs" placeholder="" style="width: 200px; height: 30px"></el-input> label="重复次数:"
:label-width="formLabelWidth"
prop="tdpz_cfcs"
>
<el-input
v-model="FormData.tdpz_cfcs"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -127,29 +255,47 @@
<div> <div>
<i class="el-icon-caret-bottom" v-if="is_retract"></i> <i class="el-icon-caret-bottom" v-if="is_retract"></i>
<i class="el-icon-caret-top" v-else="is_retract"></i> <i class="el-icon-caret-top" v-else="is_retract"></i>
<el-button type="text" plain @click="getRetract" style=" <el-button
type="text"
plain
@click="getRetract"
style="
width: 28px; width: 28px;
border: none; border: none;
color: rgba(16, 16, 16, 1); color: rgba(16, 16, 16, 1);
font-size: 14px; font-size: 14px;
text-align: left; text-align: left;
"> "
收起</el-button> >
收起</el-button
>
</div> </div>
</div> </div>
<div class="super_con" v-show="is_retract"> <div class="super_con" v-show="is_retract">
<el-form :label-position="labelPosition" :rules="rules" ref="ruleForm"> <el-form
:label-position="labelPosition"
:rules="rules"
ref="ruleForm"
>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item> <el-form-item>
<el-checkbox v-model="FormData.tdpz_watchtime">watch time(s)</el-checkbox> <el-checkbox v-model="FormData.tdpz_watchtime"
<el-input v-model="input1" placeholder="" style="width: 200px; height: 30px" >watch time(s)</el-checkbox
:disabled="isdisabled"></el-input> >
<el-input
v-model="input1"
placeholder=""
style="width: 200px; height: 30px"
:disabled="isdisabled"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item> <el-form-item>
<el-checkbox v-model="FormData.tdpz_cjsylxdz">采集使用连续地址</el-checkbox> <el-checkbox v-model="FormData.tdpz_cjsylxdz"
>采集使用连续地址</el-checkbox
>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -158,11 +304,17 @@
<el-form-item label="读写占空比:" :label-width="formLabelWidth"> <el-form-item label="读写占空比:" :label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-input v-model="tdpz_dxzkb1" style="width: 91px; height: 30px"></el-input> <el-input
v-model="tdpz_dxzkb1"
style="width: 91px; height: 30px"
></el-input>
</el-col> </el-col>
<el-col :span="4">: </el-col> <el-col :span="4">: </el-col>
<el-col :span="10"> <el-col :span="10">
<el-input v-model="tdpz_dxzkb2" style="width: 91px; height: 30px"></el-input> <el-input
v-model="tdpz_dxzkb2"
style="width: 91px; height: 30px"
></el-input>
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
@ -172,18 +324,42 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="05/0F:" :label-width="formLabelWidth"> <el-form-item label="05/0F:" :label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="8"><el-radio v-model="FormData.tdpz_050F" label="auto">auto</el-radio></el-col> <el-col :span="8"
<el-col :span="8"><el-radio v-model="FormData.tdpz_050F" label="05">05</el-radio></el-col> ><el-radio v-model="FormData.tdpz_050F" label="auto"
<el-col :span="8"><el-radio v-model="FormData.tdpz_050F" label="0F">0F</el-radio></el-col> >auto</el-radio
></el-col
>
<el-col :span="8"
><el-radio v-model="FormData.tdpz_050F" label="05"
>05</el-radio
></el-col
>
<el-col :span="8"
><el-radio v-model="FormData.tdpz_050F" label="0F"
>0F</el-radio
></el-col
>
</el-row> </el-row>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="06/10:" :label-width="formLabelWidth"> <el-form-item label="06/10:" :label-width="formLabelWidth">
<el-row> <el-row>
<el-col :span="8"><el-radio v-model="FormData.tdpz_0610" label="auto">auto</el-radio></el-col> <el-col :span="8"
<el-col :span="8"><el-radio v-model="FormData.tdpz_0610" label="06">06</el-radio></el-col> ><el-radio v-model="FormData.tdpz_0610" label="auto"
<el-col :span="8"><el-radio v-model="FormData.tdpz_0610" label="10">10</el-radio></el-col> >auto</el-radio
></el-col
>
<el-col :span="8"
><el-radio v-model="FormData.tdpz_0610" label="06"
>06</el-radio
></el-col
>
<el-col :span="8"
><el-radio v-model="FormData.tdpz_0610" label="10"
>10</el-radio
></el-col
>
</el-row> </el-row>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -202,7 +378,12 @@
<i class="el-icon-close title_r" @click="diag_drive = false"></i> <i class="el-icon-close title_r" @click="diag_drive = false"></i>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
<el-tree :data="datas2" :props="defaultProps" @node-click="handleDetailClick" default-expand-all></el-tree> <el-tree
:data="datas2"
:props="defaultProps"
@node-click="handleDetailClick"
default-expand-all
></el-tree>
</div> </div>
</div> </div>
</template> </template>
@ -509,13 +690,16 @@ export default {
console.log(res); console.log(res);
// console.log(res.data.data.mark_value); // console.log(res.data.data.mark_value);
// this.$nextTick(() => { // this.$nextTick(() => {
this.$refs["tree"].append({ this.$refs["tree"].append(
{
id: this.nodekey + 1000, id: this.nodekey + 1000,
label: this.FormData.tdpz_tdmc label: this.FormData.tdpz_tdmc,
}, this.nodekey); },
this.nodekey
);
// console.log(this.trees); // console.log(this.trees);
this.sendTree(); this.sendTree();
this.$router.push(`/dbcollectdevice?user_id=${this.use}`); this.$router.push(`/dbcollectdevice?user_id=${this.user_id}`);
}, },
handleDetailClick(data, node, value) { handleDetailClick(data, node, value) {
console.log(data.label); console.log(data.label);
@ -575,7 +759,7 @@ export default {
user_id: this.user_id, user_id: this.user_id,
data: JSON.stringify(this.trees), data: JSON.stringify(this.trees),
type: "1", type: "1",
}) });
console.log(result); console.log(result);
}, },
}, },
@ -589,7 +773,7 @@ export default {
console.log(res); console.log(res);
console.log(JSON.parse(res.data.data.data)); console.log(JSON.parse(res.data.data.data));
this.trees = JSON.parse(res.data.data.data); this.trees = JSON.parse(res.data.data.data);
}) });
this.loading = true; this.loading = true;
this.GetUserAnswer(); this.GetUserAnswer();
this.loading = false; this.loading = false;

View File

@ -214,9 +214,10 @@ export default {
mark: "CKFWQ_wx", mark: "CKFWQ_wx",
user_id: `${this.user_id}`, user_id: `${this.user_id}`,
}); });
let obj = JSON.parse(answers.data.data.mark_value);
console.log(answers); console.log(answers);
if (answers.data.data && answers.data.state) { if (answers.data.data && answers.data.state) {
let obj = JSON.parse(answers.data.data.mark_value);
this.ruleForm.ckcssz_btl = obj.ckcssz_btl; this.ruleForm.ckcssz_btl = obj.ckcssz_btl;
this.ruleForm.ckcssz_jyw = obj.ckcssz_jyw; this.ruleForm.ckcssz_jyw = obj.ckcssz_jyw;
this.ruleForm.ckcssz_lk = obj.ckcssz_lk; this.ruleForm.ckcssz_lk = obj.ckcssz_lk;

View File

@ -5,17 +5,8 @@ module.exports = defineConfig({
lintOnSave: false, lintOnSave: false,
devServer: { devServer: {
proxy: { proxy: {
"/wangguan": {
target: "http://111.229.30.246:10013/Handler/Config.ashx",
pathRewrite: { "^/wangguan": "" },
secure: false,
// 开启代理:在本地会创建一个虚拟服务端,然后发送请求的数据,
//并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
// 必须设置该项
changeOrigin: true,
},
"/Handler": { "/Handler": {
target: "http://111.229.30.246:10015", target: "http://111.229.30.246:10013",
pathRewrite: { "^/Handler": "" }, pathRewrite: { "^/Handler": "" },
secure: false, secure: false,
changeOrigin: true, changeOrigin: true,