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

src/views/component/device/deviceDialog.vue

@@ -64,6 +64,7 @@
                                                 :multiple="false"
                                                 size="mini"
                                                 :filter="filter"
+                                                filterable
                                             />
                                         </el-form-item>
                                     </el-col>
@@ -78,6 +79,7 @@
                                                 size="mini"
                                                 style="width:100%"
                                                 :filter="filter"
+                                                filterable
                                             />
                                         </el-form-item>
                                     </el-col>
@@ -173,6 +175,7 @@
                                                 :multiple="false"
                                                 size="mini"
                                                 :filter="filter"
+                                                filterable
                                             />
                                         </el-form-item>
                                     </el-col>
@@ -362,6 +365,7 @@
                                                                 size="mini"
                                                                 style="width:100%"
                                                                 :filter="filter"
+                                                                filterable
                                                             />
                                                         </el-form-item>
                                                     </el-col>

src/views/component/device/index.vue

@@ -226,6 +226,8 @@
                             readonly-text="text"
                             :multiple="true"
                             size="mini"
+                            :filter="filter"
+                            filterable
                         />
                     </template>
                     <template slot="time">
@@ -280,6 +282,8 @@
                             readonly-text="text"
                             :multiple="true"
                             size="mini"
+                            :filter="filter"
+                            filterable
                         />
                     </template>
                     <template slot="deviceClass">
@@ -362,6 +366,16 @@ export default {
     data () {
         const { userId, level = {}, position } = this.$store.getters || {}
         return {
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: '',
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }],
             images: [image01, image02, image03, image04],
             ImportDeviceType: '',
             iframeVisible: false,
@@ -624,6 +638,11 @@ export default {
                 relation: 'AND',
                 parameters: []
             }
+            // 增加地点过滤
+            const obj = { relation: 'AND', parameters: [] }
+            obj.parameters.push({ key: 'Q^di_dian_^S', value: this.level, param: this.$utils.guid() })
+            parameters.parameters.push(obj)
+
             // 部门搜索(可多选)
             if (this.search.pos) {
                 const obj = { relation: 'OR', parameters: [] }

src/views/component/device/maintenanceStatic.vue

@@ -411,19 +411,19 @@ export default {
                     .green-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: green;
+                        background-color: #67C23A;
                         border-radius: 50%;
                     }
                     .red-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: red;
+                        background-color: #F56C6C;
                         border-radius: 50%;
                     }
                     .orange-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: orange;
+                        background-color: #E6A23C;
                         border-radius: 50%;
                     }
                 }
@@ -446,12 +446,12 @@ export default {
             .table{
                 display: flex;
                 .column{
+                    flex: 1;
                     &:nth-child(2){
                         display: flex;
                     }
                     >.item{
                         height: 50px;
-                        width: 160px;
                         text-align: center;
                         line-height: 50px;
                         border-bottom: 1px solid #333;
@@ -461,14 +461,12 @@ export default {
                     @media screen and (max-width: 1800px) {
                          >.item{
                             height: 44px;
-                            width: 120px;
                             line-height: 44px;
                         }
                     }
                     @media screen and (max-width: 1550px) {
                          >.item{
                             height: 40px;
-                            width: 100px;
                             line-height: 40px;
                         }
                     }
@@ -518,7 +516,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: green;
+                            background-color: #67C23A;
                             border-radius: 50%;
                         }
                         .red-circle {
@@ -529,7 +527,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: red;
+                            background-color: #F56C6C;
                             border-radius: 50%;
                         }
                         .orange-circle {
@@ -540,7 +538,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: orange;
+                            background-color: #E6A23C;
                             border-radius: 50%;
                         }
                     }

src/views/component/device/maintenanceStaticAll.vue

@@ -43,6 +43,8 @@
                             readonly-text="text"
                             :disabled="false"
                             :multiple="false"
+                            :filter="filter"
+                            filterable
                         />
                     </div>
                     <div class="item">
@@ -78,7 +80,7 @@
                     </div>
                 </div>
 
-                <div class="table">
+                <div v-if="fliterData.length>0" class="table">
                     <div class="column">
                         <div class="item">设备名称/日期</div>
                         <div v-for="(item,index) in fliterData" :key="index" class="item" style="cursor:pointer" @click="goLookStatic(item)">
@@ -113,6 +115,7 @@
                         </div>
                     </div>
                 </div>
+                <el-empty v-else description="暂无数据" />
             </div>
             <MaintenanceStatic v-if="MaintenanceStaticVisible" :dialog-visible.sync="MaintenanceStaticVisible" :params="dialogParams" />
 
@@ -187,7 +190,17 @@ export default {
 
             },
             dataList: [],
-            type: ['日保养', '周保养', '月保养', '季度保养', '半年保养', '年保养', '按需保养']
+            type: ['日保养', '周保养', '月保养', '季度保养', '半年保养', '年保养', '按需保养'],
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: '',
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }]
         }
     },
     computed: {
@@ -389,7 +402,7 @@ export default {
             this.title = `月度设备维护统计`
             const y = +this.month.split('-')[0]
             const m = +this.month.split('-')[1]
-            const sql = `select a.id_ AS mainId,a.shi_fou_guo_shen_,a.bian_zhi_bu_men_,c.wei_hu_xiang_mu_c,a.bian_zhi_ren_,a.she_bei_ming_chen,a.she_bei_bian_hao_,a.ri_qi_,a.zhu_zhou_qi_,a.nei_rong_qing_kua,a.ji_hua_shi_jian_,b.id_ AS subId,c.wei_hu_ri_qi_,c.wei_hu_lei_xing_,c.ri_qi_shu_zi_,c.id_ AS addtionId,d.bei_zhu_,d.wei_hu_zhuang_tai from t_mjsbwhbyjlby a left join t_mjsbwhjhzb b on a.ji_hua_wai_jian_ = b.id_ left join v_device_devicemaintenance c on b.she_bei_bian_hao_ = c.id_ left join t_mjsbwhbyjlzby d on a.id_ = d.parent_id_ where a.shi_fou_guo_shen_!='已删除' and YEAR(a.ji_hua_shi_jian_) = ${y} and MONTH(a.ji_hua_shi_jian_) = ${m}`
+            const sql = `select a.id_ AS mainId,a.shi_fou_guo_shen_,a.bian_zhi_bu_men_,c.wei_hu_xiang_mu_c,a.bian_zhi_ren_,a.she_bei_ming_chen,a.she_bei_bian_hao_,a.ri_qi_,a.zhu_zhou_qi_,a.nei_rong_qing_kua,a.ji_hua_shi_jian_,b.id_ AS subId,c.wei_hu_ri_qi_,c.wei_hu_lei_xing_,c.ri_qi_shu_zi_,c.id_ AS addtionId,d.bei_zhu_,d.wei_hu_zhuang_tai from t_mjsbwhbyjlby a left join t_mjsbwhjhzb b on a.ji_hua_wai_jian_ = b.id_ left join v_device_devicemaintenance c on b.she_bei_bian_hao_ = c.id_ left join t_mjsbwhbyjlzby d on a.id_ = d.parent_id_ where a.shi_fou_guo_shen_!='已删除' and YEAR(a.ji_hua_shi_jian_) = ${y} and MONTH(a.ji_hua_shi_jian_) = ${m} and a.di_dian_='${this.level}'`
             const { variables: { data }} = await this.$common.request('sql', sql)
             this.dataList = data
             this.dataList.forEach(item => {
@@ -438,7 +451,7 @@ export default {
             &::before{
                 content: '*';
                 margin: 0 4px 0 -7.5px;
-                color: #F56C6C;
+                color: red;
             }
         }
         .left{
@@ -461,19 +474,19 @@ export default {
                     .green-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: green;
+                        background-color: #67C23A;
                         border-radius: 50%;
                     }
                     .red-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: red;
+                        background-color: #F56C6C;
                         border-radius: 50%;
                     }
                     .orange-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: orange;
+                        background-color: #E6A23C;
                         border-radius: 50%;
                     }
                 }
@@ -499,6 +512,7 @@ export default {
             .table{
                 display: flex;
                 .column{
+                    flex: 1;
                     &:nth-child(2){
                         display: flex;
                     }
@@ -530,6 +544,11 @@ export default {
                         line-height: 30px;
                         text-align: center;
                     }
+                    >.item:not(:first-child) {
+                        :hover{
+                            color: #409EFF;
+                        }
+                    }
                     .content-item{
                         >.item{
                             position: relative;
@@ -570,7 +589,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: green;
+                            background-color: #67C23A;
                             border-radius: 50%;
                         }
                         .red-circle {
@@ -581,7 +600,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: red;
+                            background-color: #F56C6C;
                             border-radius: 50%;
                         }
                         .orange-circle {
@@ -592,7 +611,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: orange;
+                            background-color: #E6A23C;
                             border-radius: 50%;
                         }
                     }

src/views/component/formTemplate/index.vue

@@ -31,6 +31,8 @@
                                         :disabled="false"
                                         :multiple="false"
                                         size="mini"
+                                        :filter="filter"
+                                        filterable
                                     />
                                 </el-form-item>
                             </el-col>
@@ -152,6 +154,8 @@
                                             :disabled="false"
                                             placeholder="请选择人员"
                                             :multiple="true"
+                                            :filter="filter"
+                                            filterable
                                         />
                                         <ibps-role-selector
                                             v-if="row.yong_hu_lei_xing_==='role'"
@@ -209,6 +213,16 @@ export default {
     data () {
         const { userId, position, level } = this.$store.getters
         return {
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: '',
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }],
             dialogVisible: true,
             userId: userId,
             position: position,

src/views/component/shiftHandover/earlyHandover.vue

@@ -36,6 +36,8 @@
                                     :multiple="false"
                                     size="mini"
                                     style="width:200px"
+                                    :filter="filter"
+                                    filterable
                                 />
                             </el-form-item>
                         </el-col>
@@ -250,6 +252,8 @@
                                     :multiple="true"
                                     size="mini"
                                     style="width:1000px"
+                                    :filter="filter"
+                                    filterable
                                 />
                             </el-form-item>
                         </el-col>
@@ -311,6 +315,16 @@ export default {
     data () {
         const { userId, position, level } = this.$store.getters
         return {
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: '',
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }],
             codeId: '', // 扫码签到
             RegisterInfoShow: false,
             QrcodeedDialogShow: false,
@@ -363,7 +377,7 @@ export default {
                 { key: 'gunRegister', label: '扫码枪签到', hidden: () => { return !this.isEdit || this.isFinished } },
                 { key: 'registerInfo', label: '签到信息', hidden: () => { return !this.isEdit } },
                 { key: 'submit', label: '提交', icon: 'el-icon-finished', hidden: () => { return !this.isEdit || this.isFinished } },
-                { key: 'cancel', label: '退出', type: 'danger',icon:'ibps-icon-close' }
+                { key: 'cancel', label: '退出', type: 'danger', icon: 'ibps-icon-close' }
             ],
             initWidth: '1280px',
             isEdit: false,

src/views/platform/risk/riskV2.vue

@@ -181,6 +181,8 @@
                                 :disabled="readonly"
                                 :multiple="true"
                                 size="mini"
+                                :filter="filter"
+                                filterable
                             />
                         </div>
 
@@ -209,6 +211,8 @@
                                 :disabled="readonly"
                                 :multiple="true"
                                 size="mini"
+                                :filter="filter"
+                                filterable
                             />
                         </div>
 
@@ -270,6 +274,16 @@ export default {
     data () {
         const { userId, position, level } = this.$store.getters
         return {
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: '',
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }],
             isFirst: true,
             userId: userId,
             position: position,

src/views/system/fasc/facilityEnvConfig.vue

@@ -71,6 +71,8 @@
                                         :disabled="false"
                                         :multiple="false"
                                         style="width:80%"
+                                        :filter="filter"
+                                        filterable
                                     />
                                 </el-form-item>
                             </el-col>
@@ -122,7 +124,7 @@
                                         <el-radio v-model="weekCheck" :label="6">周六</el-radio>
                                         <el-radio v-model="weekCheck" :label="7">周日</el-radio>
                                     </template>
-                                    <el-select v-if="form.zhou_qi_==='每月'" v-model="monthCheck" placeholder="请选择">
+                                    <el-select v-if="form.zhou_qi_==='每月'" v-model="monthCheck" placeholder="请选择" size="mini" style="width:80%">
                                         <el-option
                                             v-for="item in 28"
                                             :key="item"
@@ -130,7 +132,7 @@
                                             :value="item"
                                         />
                                     </el-select>
-                                    <el-select v-if="form.zhou_qi_==='每季度'" v-model="quarterCheck" placeholder="请选择">
+                                    <el-select v-if="form.zhou_qi_==='每季度'" v-model="quarterCheck" placeholder="请选择" size="mini" style="width:80%">
                                         <el-option
                                             v-for="item in 3"
                                             :key="item"
@@ -138,7 +140,7 @@
                                             :value="item"
                                         />
                                     </el-select>
-                                    <el-select v-if="form.zhou_qi_==='每半年'" v-model="halfYearCheck" placeholder="请选择">
+                                    <el-select v-if="form.zhou_qi_==='每半年'" v-model="halfYearCheck" placeholder="请选择" size="mini" style="width:80%">
                                         <el-option
                                             v-for="item in 6"
                                             :key="item"
@@ -146,7 +148,7 @@
                                             :value="item"
                                         />
                                     </el-select>
-                                    <el-select v-if="form.zhou_qi_==='每年'" v-model="yearCheck" placeholder="请选择">
+                                    <el-select v-if="form.zhou_qi_==='每年'" v-model="yearCheck" placeholder="请选择" size="mini" style="width:80%">
                                         <el-option
                                             v-for="item in 12"
                                             :key="item"
@@ -190,7 +192,8 @@
                                     readonly-text="text"
                                     :disabled="false"
                                     :multiple="false"
-
+                                    :filter="filter"
+                                    filterable
                                     size="mini"
                                 />
                             </div>
@@ -384,6 +387,16 @@ export default {
     data () {
         const { userId, level = {}, position } = this.$store.getters || {}
         return {
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: '',
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }],
             search: {
                 buMen: '',
                 quYu: '',
@@ -1517,7 +1530,11 @@ export default {
 }
     ::v-deep {
         .el-form-item__label{
-        text-align: left
+            text-align: left
         }
+        .el-form-item__content{
+             font-size: 12px !important;
+           display: flex;
+         }
     }
 </style>

src/views/system/fasc/fecDialog.vue

@@ -25,6 +25,8 @@
                                     :disabled="false"
                                     :multiple="false"
                                     style="width:80%"
+                                    :filter="filter"
+                                    filterable
                                 />
                             </el-form-item>
                         </el-col>
@@ -85,12 +87,12 @@
                     <el-row v-if="isShowDevice">
                         <el-col :span="12">
                             <el-form-item label="被控设备/设施编号：" label-width="140">
-                                <el-input v-model="form.deviceno1_" size="mini" style="width:62%" />
+                                <el-input v-model="form.deviceno1_" size="mini" style="width:80%" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="被控设备/设施名称：" label-width="140">
-                                <el-input v-model="form.devicename1_" size="mini" style="width:62%" />
+                                <el-input v-model="form.devicename1_" size="mini" style="width:80%" />
                             </el-form-item>
                         </el-col>
 
@@ -219,6 +221,16 @@ export default {
     },
     data () {
         return {
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: '',
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }],
             dialogVisible: true,
             title: '配置详情',
             jianCeGangWeiList: [],