Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/component/device/deviceDialog.vue

@@ -539,7 +539,7 @@
                                                 </el-row>
                                                 <el-row v-if="form.shiFouXiaoZhun==='是'">
                                                     <el-col>
-                                                        <el-form-item label="检定/校准单位">
+                                                        <el-form-item label="检定/校准单位：">
                                                             <el-input v-model="form.shiYongKeShi" size="mini" />
                                                         </el-form-item>
                                                     </el-col>
@@ -561,7 +561,7 @@
                                                 </el-row>
                                                 <el-row v-if="form.shiFouXiaoZhun==='是'">
                                                     <el-col>
-                                                        <el-form-item label="校准有效期至">
+                                                        <el-form-item label="校准有效期至：">
                                                             <el-date-picker
                                                                 v-model="form.xiaoZhunYouXia"
                                                                 style="width:100%"

src/views/system/fasc/facilityEnvConfig.vue

@@ -463,25 +463,30 @@ export default {
     watch: {
         'form.she_bei_bian_hao_' (val) {
             if (!this.isFirstDevice) {
-                const sql = `select yuan_she_bei_bian,she_bei_ming_cheng_ from t_sbdj where find_in_set(id_, '${val}')`
+                const sql = `select * from t_sbdj where find_in_set(id_, '${val}')`
                 this.$common.request('sql', sql).then(res => {
                     const { data = [] } = res.variables || {}
                     data.forEach(item => {
                         const bianHao = item.yuan_she_bei_bian
                         const mingChneg = item.she_bei_ming_cheng_
+                        const mingChnegId = item.she_bei_ming_chen
                         const t = this.subForm.find(sub => sub.deviceno1_ === bianHao)
+
                         if (!t) {
                             this.subForm.push({
                                 deviceno1_: bianHao,
                                 devicename1_: mingChneg,
+                                deviceid1_: mingChnegId,
                                 shi_fou_qi_yong_: '1',
                                 bu_men_: this.form.bian_zhi_bu_men_,
                                 jian_ce_gang_wei_: this.form.gang_wei_,
                                 jian_ce_zhou_qi_: this.form.zhou_qi_,
                                 kong_zhi_tiao_jia: this.form.tiao_jian_,
                                 fang_jian_: '',
+                                fang_jian_id_: '',
                                 qu_yu_: '',
                                 deviceno2_: '',
+                                deviceid2_: '',
                                 jian_ce_ri_qi_: this.form.jian_ce_ri_qi_,
                                 ri_qi_lie_biao_: this.form.ri_qi_lie_biao_,
                                 zi_wai_deng_wai_j: this.$utils.guid(),
@@ -860,8 +865,11 @@ export default {
                                     bu_men_: item.bu_men_,
                                     devicename1_: item.devicename1_,
                                     deviceno1_: item.deviceno1_,
+                                    deviceid1_: item.deviceid1_,
                                     deviceno2_: item.deviceno2_,
+                                    deviceid2_: item.deviceid2_,
                                     fang_jian_: item.fang_jian_,
+                                    fang_jian_id_: item.fang_jian_id_,
                                     jian_ce_gang_wei_: item.jian_ce_gang_wei_,
                                     jian_ce_ri_qi_: item.jian_ce_ri_qi_,
                                     jian_ce_zhou_qi_: item.jian_ce_zhou_qi_,
@@ -887,10 +895,13 @@ export default {
                                 param: {
                                     qu_yu_: item.qu_yu_,
                                     fang_jian_: item.fang_jian_,
+                                    fang_jian_id_: item.fang_jian_id_,
                                     bu_men_: item.bu_men_,
                                     deviceno1_: item.deviceno1_,
+                                    deviceid1_: item.deviceid1_,
                                     devicename1_: item.devicename1_,
                                     deviceno2_: item.deviceno2_, // 监控设备
+                                    deviceid2_: item.deviceid2_,
                                     jian_ce_zhou_qi_: item.jian_ce_zhou_qi_,
                                     jian_ce_gang_wei_: item.jian_ce_gang_wei_,
                                     shi_fou_qi_yong_: item.shi_fou_qi_yong_,
@@ -935,8 +946,11 @@ export default {
                                     bu_men_: item.bu_men_,
                                     devicename1_: item.devicename1_,
                                     deviceno1_: item.deviceno1_,
+                                    deviceid1_: item.deviceid1_,
                                     deviceno2_: item.deviceno2_,
+                                    deviceid2_: item.deviceid2_,
                                     fang_jian_: item.fang_jian_,
+                                    fang_jian_id_: item.fang_jian_id_,
                                     jian_ce_gang_wei_: item.jian_ce_gang_wei_,
                                     jian_ce_ri_qi_: item.jian_ce_ri_qi_,
                                     jian_ce_zhou_qi_: item.jian_ce_zhou_qi_,

src/views/system/fasc/fecDialog.vue

@@ -58,12 +58,12 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="房间：">
-                                <el-select v-model="form.fang_jian_" placeholder="请选择" size="mini" style="width:80%">
+                                <el-select v-model="form.fang_jian_id_" placeholder="请选择" size="mini" style="width:80%">
                                     <el-option
                                         v-for="item in fangJianList"
                                         :key="item.id_"
                                         :label="item.fang_jian_ming_ha"
-                                        :value="item.fang_jian_ming_ha"
+                                        :value="item.id_"
                                     />
                                 </el-select>
                             </el-form-item>
@@ -119,8 +119,11 @@
                                         <i class="el-icon-question question-icon">：</i>
                                     </el-tooltip>
                                 </template>
-                                <el-radio v-model="form.shi_fou_qi_yong_" label="1">启用</el-radio>
-                                <el-radio v-model="form.shi_fou_qi_yong_" label="0">停用</el-radio>
+                                <div class="qiyong">
+                                    <el-radio v-model="form.shi_fou_qi_yong_" label="1">启用</el-radio>
+                                    <el-radio v-model="form.shi_fou_qi_yong_" label="0">停用</el-radio>
+                                </div>
+
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -256,10 +259,13 @@ export default {
             form: {
                 qu_yu_: '',
                 fang_jian_: '',
+                fang_jian_id_: '',
                 bu_men_: '',
                 deviceno1_: '',
+                deviceid1_: '', // 设备id
                 devicename1_: '',
                 deviceno2_: '', // 监控设备
+                deviceid2_: '', // 监控设备id
                 jian_ce_zhou_qi_: '',
                 jian_ce_gang_wei_: '',
                 shi_fou_qi_yong_: '1',
@@ -307,6 +313,23 @@ export default {
         }
     },
     watch: {
+        'form.fang_jian_id_': {
+            handler (val) {
+                if (val) {
+                    const temp = this.fangJianList.find(item => item.id_ === val)
+                    this.form.fang_jian_ = temp ? temp.fang_jian_ming_ha : ''
+                }
+            }
+        },
+        'form.deviceno2_': {
+            async handler (val) {
+                if (val) {
+                    const sql = `select * from v_devicemaintenance where deviceInfo='${val}'`
+                    const { variables: { data }} = await this.$common.request('sql', sql)
+                    this.form.deviceid2_ = data.length > 0 ? data[0].deviceId : ''
+                }
+            }
+        },
         'form.jian_ce_zhou_qi_' (val, old) {
             if (!old) return
             this.dayCheck = []
@@ -668,6 +691,9 @@ export default {
     .main{
         padding: 20px;
         height: 60vh;
+        .qiyong{
+            margin-top: 0px;
+        }
         .el-row{
             margin: 10px 0;
         }