Skip to content

H
huaxin-rq
Commit e8c76483 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

设备生命周期去除多余字段

parent e80adf25
Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 322 deletions
huaxin-web/src/views/cycle/components/CycleDetailInfo.vue
View file @ e8c76483
......@@ -31,170 +31,170 @@
<el-row v-if="form.devType==1">
<el-col :span="12">
<el-form-item label="计量范围" prop="devFlowRange">
<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="精度等级" prop="devLevel">
<span v-if="form.devLevel">{{ form.devLevel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==1">
<el-col :span="12">
<el-form-item label="连接口方向" prop="workElectricity">
<span v-if="form.workElectricity">{{ form.workElectricity }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="内部编号" prop="devNumber">
<span v-if="form.devNumber">{{ form.devNumber }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==2">
<el-col :span="12">
<el-form-item label="公称直径" prop="devDiameter">
<span v-if="form.devDiameter">{{ form.devDiameter }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力" prop="devPressure">
<span v-if="form.devPressure">{{ form.devPressure }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==2">
<el-col :span="12">
<el-form-item label="压力等级" prop="devLevel">
<span v-if="form.devLevel">{{ form.devLevel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整定压力" prop="workElectricity">
<span v-if="form.workElectricity">{{ form.workElectricity }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="介质" prop="devDiameter">
<span v-if="form.devDiameter">{{ form.devDiameter }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="精准度" prop="devFlowRange">
<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="防护等级" prop="devLevel">
<span v-if="form.devLevel">{{ form.devLevel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报警限值" prop="workElectricity">
<span v-if="form.workElectricity">{{ form.workElectricity }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<span v-if="form.devDate">{{ form.devDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==4">
<el-col :span="12">
<el-form-item label="设备类别" prop="devDiameter">
<span v-if="form.devDiameter">{{ form.devDiameter }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="公称通径" prop="devDiameter">
<span v-if="form.devDiameter">{{ form.devDiameter }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="流量范围" prop="devFlowRange">
<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="准确度等级" prop="devLevel">
<span v-if="form.devLevel">{{ form.devLevel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力" prop="devPressure">
<span v-if="form.devPressure">{{ form.devPressure }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="工作电源" prop="workElectricity">
<span v-if="form.workElectricity">{{ form.workElectricity }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<span v-if="form.devDate">{{ form.devDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<!--<el-row v-if="form.devType==1">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="计量范围" prop="devFlowRange">-->
<!--<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="精度等级" prop="devLevel">-->
<!--<span v-if="form.devLevel">{{ form.devLevel }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==1">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="连接口方向" prop="workElectricity">-->
<!--<span v-if="form.workElectricity">{{ form.workElectricity }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="内部编号" prop="devNumber">-->
<!--<span v-if="form.devNumber">{{ form.devNumber }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==2">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="公称直径" prop="devDiameter">-->
<!--<span v-if="form.devDiameter">{{ form.devDiameter }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="公称压力" prop="devPressure">-->
<!--<span v-if="form.devPressure">{{ form.devPressure }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==2">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="压力等级" prop="devLevel">-->
<!--<span v-if="form.devLevel">{{ form.devLevel }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="整定压力" prop="workElectricity">-->
<!--<span v-if="form.workElectricity">{{ form.workElectricity }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==3">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="介质" prop="devDiameter">-->
<!--<span v-if="form.devDiameter">{{ form.devDiameter }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="精准度" prop="devFlowRange">-->
<!--<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==3">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="防护等级" prop="devLevel">-->
<!--<span v-if="form.devLevel">{{ form.devLevel }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="报警限值" prop="workElectricity">-->
<!--<span v-if="form.workElectricity">{{ form.workElectricity }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==3">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="生产日期" prop="devDate">-->
<!--<span v-if="form.devDate">{{ form.devDate }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==4">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="设备类别" prop="devDiameter">-->
<!--<span v-if="form.devDiameter">{{ form.devDiameter }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==5">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="公称通径" prop="devDiameter">-->
<!--<span v-if="form.devDiameter">{{ form.devDiameter }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="流量范围" prop="devFlowRange">-->
<!--<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==5">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="准确度等级" prop="devLevel">-->
<!--<span v-if="form.devLevel">{{ form.devLevel }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="公称压力" prop="devPressure">-->
<!--<span v-if="form.devPressure">{{ form.devPressure }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==5">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="工作电源" prop="workElectricity">-->
<!--<span v-if="form.workElectricity">{{ form.workElectricity }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="生产日期" prop="devDate">-->
<!--<span v-if="form.devDate">{{ form.devDate }}</span>-->
<!--<span v-else>-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
......
huaxin-web/src/views/cycle/index.vue
View file @ e8c76483
......@@ -242,162 +242,162 @@
<el-row v-if="form.devType==1">
<el-col :span="12">
<el-form-item label="计量范围" prop="devFlowRange">
<el-input v-model="form.devFlowRange" placeholder="请输入计量范围" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="精度等级" prop="devLevel">
<el-input v-model="form.devLevel" placeholder="请输入精度等级" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==1">
<el-col :span="12">
<el-form-item label="连接口方向" prop="workElectricity">
<el-input v-model="form.workElectricity" placeholder="请输入连接口方向" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="内部编号" prop="devNumber">
<el-input v-model="form.devNumber" placeholder="请输入内部编号" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==2">
<el-col :span="12">
<el-form-item label="公称直径" prop="devDiameter">
<el-input v-model="form.devDiameter" placeholder="请输公称直径" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力" prop="devPressure">
<el-input v-model="form.devPressure" placeholder="请输入公称压力" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==2">
<el-col :span="12">
<el-form-item label="压力等级" prop="devLevel">
<el-input v-model="form.devLevel" placeholder="请输入压力等级" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整定压力" prop="workElectricity">
<el-input v-model="form.workElectricity" placeholder="请输入公称压力" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="介质" prop="devDiameter">
<el-input v-model="form.devDiameter" placeholder="请输介质" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="精准度" prop="devFlowRange">
<el-input v-model="form.devFlowRange" placeholder="请输入精准度" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="防护等级" prop="devLevel">
<el-input v-model="form.devLevel" placeholder="请输入防护等级" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报警限值" prop="workElectricity">
<el-input v-model="form.workElectricity" placeholder="请输入报警限值" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<el-date-picker clearable size="small"
v-model="form.devDate"
type="date"
style="width: 100%"
value-format="yyyy-MM-dd"
placeholder="选择启用日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==4">
<el-col :span="12">
<el-form-item label="设备类别" prop="devDiameter">
<el-input v-model="form.devDiameter" placeholder="请输入设备类别" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="公称通径" prop="devDiameter">
<el-input v-model="form.devDiameter" placeholder="请输入公称通径" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="流量范围" prop="devFlowRange">
<el-input v-model="form.devFlowRange" placeholder="请输入流量范围" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="准确度等级" prop="devLevel">
<el-input v-model="form.devLevel" placeholder="请输入准确度等级" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力" prop="devPressure">
<el-input v-model="form.devPressure" placeholder="请输入公称压力" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="工作电源" prop="workElectricity">
<el-input v-model="form.workElectricity" placeholder="请输入工作电源" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<el-date-picker clearable size="small"
v-model="form.devDate"
type="date"
style="width: 100%"
value-format="yyyy-MM-dd"
placeholder="选择启用日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<!--<el-row v-if="form.devType==1">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="计量范围" prop="devFlowRange">-->
<!--<el-input v-model="form.devFlowRange" placeholder="请输入计量范围" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="精度等级" prop="devLevel">-->
<!--<el-input v-model="form.devLevel" placeholder="请输入精度等级" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==1">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="连接口方向" prop="workElectricity">-->
<!--<el-input v-model="form.workElectricity" placeholder="请输入连接口方向" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="内部编号" prop="devNumber">-->
<!--<el-input v-model="form.devNumber" placeholder="请输入内部编号" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==2">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="公称直径" prop="devDiameter">-->
<!--<el-input v-model="form.devDiameter" placeholder="请输公称直径" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="公称压力" prop="devPressure">-->
<!--<el-input v-model="form.devPressure" placeholder="请输入公称压力" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==2">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="压力等级" prop="devLevel">-->
<!--<el-input v-model="form.devLevel" placeholder="请输入压力等级" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="整定压力" prop="workElectricity">-->
<!--<el-input v-model="form.workElectricity" placeholder="请输入公称压力" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==3">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="介质" prop="devDiameter">-->
<!--<el-input v-model="form.devDiameter" placeholder="请输介质" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="精准度" prop="devFlowRange">-->
<!--<el-input v-model="form.devFlowRange" placeholder="请输入精准度" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==3">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="防护等级" prop="devLevel">-->
<!--<el-input v-model="form.devLevel" placeholder="请输入防护等级" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="报警限值" prop="workElectricity">-->
<!--<el-input v-model="form.workElectricity" placeholder="请输入报警限值" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==3">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="生产日期" prop="devDate">-->
<!--<el-date-picker clearable size="small"-->
<!--v-model="form.devDate"-->
<!--type="date"-->
<!--style="width: 100%"-->
<!--value-format="yyyy-MM-dd"-->
<!--placeholder="选择启用日期">-->
<!--</el-date-picker>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==4">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="设备类别" prop="devDiameter">-->
<!--<el-input v-model="form.devDiameter" placeholder="请输入设备类别" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==5">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="公称通径" prop="devDiameter">-->
<!--<el-input v-model="form.devDiameter" placeholder="请输入公称通径" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="流量范围" prop="devFlowRange">-->
<!--<el-input v-model="form.devFlowRange" placeholder="请输入流量范围" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==5">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="准确度等级" prop="devLevel">-->
<!--<el-input v-model="form.devLevel" placeholder="请输入准确度等级" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="公称压力" prop="devPressure">-->
<!--<el-input v-model="form.devPressure" placeholder="请输入公称压力" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-row v-if="form.devType==5">-->
<!--<el-col :span="12">-->
<!--<el-form-item label="工作电源" prop="workElectricity">-->
<!--<el-input v-model="form.workElectricity" placeholder="请输入工作电源" />-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="生产日期" prop="devDate">-->
<!--<el-date-picker clearable size="small"-->
<!--v-model="form.devDate"-->
<!--type="date"-->
<!--style="width: 100%"-->
<!--value-format="yyyy-MM-dd"-->
<!--placeholder="选择启用日期">-->
<!--</el-date-picker>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--</el-row>-->
......
huaxin-web/vue.config.js
View file @ e8c76483
......@@ -34,8 +34,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8909/huaxin`,
target: `https://yhq.zhkjgf.com:8898`,
//target: `http://localhost:8909/huaxin`,
target: `http://36.139.135.138:8089/huaxin`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment