Merge remote-tracking branch 'origin/master'

src/views/module_ems/energyAnalyse/moniparamData/index.vue

@@ -86,6 +86,7 @@ export default {
     // 后端好了需要删掉
     getTest() {
       this.moniparamData = emsdata.moniparamData
+      console.log(7788,this.moniparamData)
       this.initEcharts()
     },
     // 时间处理
@@ -94,6 +95,7 @@ export default {
       this.queryParam.logtimebegin= dateString[0]
       this.queryParam.logtimeend= dateString[1]
     },
+    // 获取能源参数下拉列表
     getNycsList(){
       getAction(this.url.nycsList, null).then((res) => {
         // this.options = res.map((item,index )=> {

src/views/module_tpm/equipment/modules/EquipmentForm.vue

@@ -91,12 +91,14 @@
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responsePerson">
-              <a-input v-model="model.responsePerson" placeholder="请输入负责人"  ></a-input>
+              <!-- <a-input v-model="model.responsePerson" placeholder="请输入负责人"  ></a-input> -->
+              <j-search-select-tag v-model="model.responsePerson" placeholder="请选择负责人" dict="sys_user,realname,id"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recipient">
-              <a-input v-model="model.recipient" placeholder="请输入领用人"  ></a-input>
+              <!-- <a-input v-model="model.recipient" placeholder="请输入领用人"  ></a-input> -->
+              <j-search-select-tag v-model="model.recipient" placeholder="请选择领用人" dict="sys_user,realname,id"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">