Merge branch 'master' of http://152.136.206.27:3000/dongjh/ems_client

src/views/module_base/space/modules/SpaceModal.vue

@@ -18,7 +18,7 @@
             ref="treeSelect"
             placeholder="请选择上级"
             v-model="model.parentid"
-            dict="ems_space,name,id"
+            dict="base_space,name,id"
             pidField="parentid"
             pidValue="0"
             hasChildField="has_child"

src/views/module_cmms/spotcheckContent/SpotcheckContentList.vue

@@ -214,7 +214,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'contentcode',text:'点检内容编号',dictCode:''})
         fieldList.push({type:'string',value:'contentname',text:'点检内容名称',dictCode:''})
-        fieldList.push({type:'sel_search',value:'equipmentid',text:'设备id',dictTable:"ems_tpm_equipment", dictText:'equipmentname', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'equipmentid',text:'设备id',dictTable:"tpm_equipment", dictText:'equipmentname', dictCode:'id'})
         fieldList.push({type:'string',value:'status',text:'状态：启用：0、禁用:1',dictCode:'spotcheck_content_status'})
         this.superFieldList = fieldList
       },

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentForm.vue

@@ -18,7 +18,7 @@
               </a-col>
               <a-col :span="12">
                 <a-form-model-item label="选择设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-                  <j-search-select-tag v-model="model.equipmentid" dict="ems_tpm_equipment,equipmentname,id"  />
+                  <j-search-select-tag v-model="model.equipmentid" dict="tpm_equipment,equipmentname,id"  />
                 </a-form-model-item>
               </a-col>
               <a-col :span="12">

src/views/module_cmms/spotcheckItem/SpotcheckItemList.vue

@@ -11,12 +11,12 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备类型">
-              <!-- <j-search-select-tag placeholder="请选择设备类型" v-model="queryParam.equipmenttreeid" dict="ems_tpm_equipment_tree,name,id"/> -->
+              <!-- <j-search-select-tag placeholder="请选择设备类型" v-model="queryParam.equipmenttreeid" dict="tpm_equipment_tree,name,id"/> -->
               <j-tree-select
                 ref="treeSelect"
                 placeholder="请选择设备类型"
                 v-model="queryParam.equipmenttreeid"
-                dict="ems_tpm_equipment_tree,name,id"
+                dict="tpm_equipment_tree,name,id"
                 pidField="parentid"
                 pidValue="0"
                 hasChildField="has_child"
@@ -235,7 +235,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'itemname',text:'名称',dictCode:''})
-        fieldList.push({type:'sel_search',value:'equipmenttreeid',text:'设备类型ID',dictTable:"ems_tpm_equipment_tree", dictText:'name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'equipmenttreeid',text:'设备类型ID',dictTable:"tpm_equipment_tree", dictText:'name', dictCode:'id'})
         fieldList.push({type:'string',value:'itemcode',text:'点检项编号',dictCode:''})
         fieldList.push({type:'string',value:'conditions',text:'标准',dictCode:''})
         fieldList.push({type:'string',value:'itemtype',text:'点检项分类',dictCode:'spotcheck_item_type'})

src/views/module_cmms/spotcheckItem/modules/SpotcheckItemForm.vue

@@ -10,13 +10,13 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmenttreeid">
-              <!-- <j-search-select-tag v-model="model.equipmenttreeid" dict="ems_tpm_equipment_tree,name,id"  /> -->
+              <!-- <j-search-select-tag v-model="model.equipmenttreeid" dict="tpm_equipment_tree,name,id"  /> -->
               <j-tree-select
                 ref="treeSelect"
                 placeholder="请选择设备类型"
                 multiple
                 v-model="model.equipmenttreeid"
-                dict="ems_tpm_equipment_tree,name,id"
+                dict="tpm_equipment_tree,name,id"
                 pidField="parentid"
                 pidValue="0"
                 hasChildField="has_child"

src/views/module_tpm/equipment/EquipmentList.vue

@@ -16,7 +16,7 @@
                 ref="treeSelect"
                 placeholder="请选择设备分类"
                 v-model="queryParam.equipmenttreeid"
-                dict="ems_tpm_equipment_tree,name,id"
+                dict="tpm_equipment_tree,name,id"
                 pidField="parentid"
                 pidValue="0"
                 hasChildField="has_child"
@@ -47,7 +47,7 @@
                   ref="treeSelect"
                   placeholder="请选择区域"
                   v-model="queryParam.spaceid"
-                  dict="ems_space,name,id"
+                  dict="base_space,name,id"
                   pidField="parentid"
                   pidValue="0"
                   hasChildField="has_child"

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

@@ -15,7 +15,7 @@
                 ref="treeSelect"
                 placeholder="请选择设备分类"
                 v-model="model.equipmenttreeid"
-                dict="ems_tpm_equipment_tree,name,id"
+                dict="tpm_equipment_tree,name,id"
                 pidField="parentid"
                 pidValue="0"
                 hasChildField="has_child"
@@ -51,7 +51,7 @@
                 ref="treeSelect"
                 placeholder="请选择区域"
                 v-model="model.spaceid"
-                dict="ems_space,name,id"
+                dict="base_space,name,id"
                 pidField="parentid"
                 pidValue="0"
                 hasChildField="has_child"

src/views/module_tpm/equipmentTree/EquipmentTreeList.vue

@@ -11,7 +11,7 @@
                 ref="treeSelect"
                 placeholder="请选择设备分类"
                 v-model="queryParam.id"
-                dict="ems_tpm_equipment_tree,name,id"
+                dict="tpm_equipment_tree,name,id"
                 pidField="parentid"
                 pidValue="0"
                 hasChildField="has_child"
@@ -363,7 +363,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'name',text:'设备分类名称',dictCode:''})
-        fieldList.push({type:'string',value:'parentid',text:'上级ID',dictCode:"ems_tpm_equipment_tree,name,id"})
+        fieldList.push({type:'string',value:'parentid',text:'上级ID',dictCode:"tpm_equipment_tree,name,id"})
         this.superFieldList = fieldList
       },
       expandClose(){

src/views/module_tpm/equipmentTree/modules/EquipmentTreeModal.vue

@@ -18,7 +18,7 @@
             ref="treeSelect"
             placeholder="请选择上级"
             v-model="model.parentid"
-            dict="ems_tpm_equipment_tree,name,id"
+            dict="tpm_equipment_tree,name,id"
             pidField="parentid"
             pidValue="0"
             hasChildField="has_child"
@@ -82,7 +82,7 @@
     methods: {
       validateTemplateCode(rule, value, callback){
         var params = {
-          tableName: "ems_tpm_equipment_tree",
+          tableName: "tpm_equipment_tree",
           fieldName: "name",
           fieldVal: value,
           dataId: this.model.name

src/views/module_tpm/tag/TagList.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="设备名称">
-              <j-search-select-tag v-model="queryParam.equipmentid" placeholder="请选择设备" dict="ems_tpm_equipment,equipmentname,id"  />
+              <j-search-select-tag v-model="queryParam.equipmentid" placeholder="请选择设备" dict="tpm_equipment,equipmentname,id"  />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="点位名">
-              <j-search-select-tag v-model="queryParam.tagname" placeholder="请选择点位" dict="ems_tpm_tag,tagname,tagname"  />
+              <j-search-select-tag v-model="queryParam.tagname" placeholder="请选择点位" dict="tpm_tag,tagname,tagname"  />
               <!-- <a-select
               v-model="queryParam.tagname"
               placeholder="请选择点位"
@@ -115,7 +115,7 @@
 
     <!-- <tpm-tag-modal ref="modalForm" @ok="modalFormOk"></tpm-tag-modal> -->
     <tag-modal ref="modalForm" @ok="modalFormOk"></tag-modal>
-    <tag-modal-pl  ref="modalFormPL" @ok="modalFormOk"></tag-modal-pl>
+    <TagModalPL ref="modalFormPL" @ok="modalFormOk"></TagModalPL>
     <!-- <TpmTagModalPL ref="modalFormPL" @ok="modalFormOk"></TpmTagModalPL> -->
   </a-card>
 </template>
@@ -259,7 +259,7 @@ import TagModalPL from './modulesPL/TagModalPL.vue'
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'equipmentid',text:'设备ID',dictCode:"ems_tpm_equipment,id,equipmentname"})
+        fieldList.push({type:'string',value:'equipmentid',text:'设备ID',dictCode:"tpm_equipment,id,equipmentname"})
         fieldList.push({type:'string',value:'tagname',text:'点位名',dictCode:''})
         fieldList.push({type:'string',value:'tagaddress',text:'点位地址',dictCode:'tagaddress'})
         fieldList.push({type:'string',value:'tagtype',text:'点位类型：温度、湿度、噪声、氧浓度、需量、电流、电压、电量、冷热模式、开关机、设定温度、运行状态、故障状态、环境温度等',dictCode:''})

src/views/module_tpm/tag/modules/TagForm.vue

@@ -6,7 +6,7 @@
           <a-col :span="12">
             <a-form-model-item label="设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
               <!-- <a-input v-model="model.equipmentid" placeholder="请输入设备ID"  ></a-input> -->
-              <j-search-select-tag v-model="model.equipmentid" placeholder="请选择设备" dict="ems_tpm_equipment,equipmentname,id"  />
+              <j-search-select-tag v-model="model.equipmentid" placeholder="请选择设备" dict="tpm_equipment,equipmentname,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="12">

src/views/module_tpm/tag/modulesPL/TagFormPL1.vue

@@ -33,7 +33,7 @@
                                         <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> -->
                                                 <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
                                                     <!-- bug:不能搜索 （解决：a-form-model加上slot="detail"）-->
-                                                    <j-search-select-tag v-model="model.equipmentid" placeholder="请选择设备" dict="ems_tpm_equipment,equipmentname,id"  />
+                                                    <j-search-select-tag v-model="model.equipmentid" placeholder="请选择设备" dict="tpm_equipment,equipmentname,id"  />
                                                 </a-form-model-item>
                                         <!-- </a-form-model>
                                     </j-form-container> -->

src/views/module_tpm/tag/modulesPL/TagModalPL.vue

@@ -8,7 +8,7 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <!-- <TpmTagFormPL1 ref="realForm" @ok="submitCallback"></TpmTagFormPL1> -->
-    <tag-form-pl-1 ref="realForm" @ok="submitCallback"></tag-form-pl-1>
+    <TagFormPL1 ref="realForm" @ok="submitCallback"></TagFormPL1>
   </u-modal>
 </template>
 

src/views/user/LoginAccount.vue

@@ -12,19 +12,19 @@
           </a-input>
         </a-form-model-item>
 
-        <a-row :gutter="0">
-          <a-col :span="16">
-            <a-form-model-item required prop="inputCode">
-              <a-input v-model="model.inputCode" size="large" type="text" placeholder="请输入验证码">
-                <a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-              </a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="8" style="text-align: right">
-            <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
-            <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
-          </a-col>
-        </a-row>
+<!--        <a-row :gutter="0">-->
+<!--          <a-col :span="16">-->
+<!--            <a-form-model-item required prop="inputCode">-->
+<!--              <a-input v-model="model.inputCode" size="large" type="text" placeholder="请输入验证码">-->
+<!--                <a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>-->
+<!--              </a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="8" style="text-align: right">-->
+<!--            <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>-->
+<!--            <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
       </a-form-model>
     </div>
 </template>
@@ -45,7 +45,7 @@
         model:{
           username: 'admin',
           password: '123456',
-          inputCode: ''
+          // inputCode: ''
         },
         validatorRules:{
           username: [
@@ -55,9 +55,9 @@
           password: [{
             required: true, message: '请输入密码!', validator: 'click'
           }],
-          inputCode: [{
-            required: true, message: '请输入验证码!'
-          }]
+          // inputCode: [{
+          //   required: true, message: '请输入验证码!'
+          // }]
         }
 
       }
@@ -123,12 +123,13 @@
       },
       //账号密码登录
       handleLogin(rememberMe){
-        this.validateFields([ 'username', 'password', 'inputCode' ], (err)=>{
+        // this.validateFields([ 'username', 'password', 'inputCode' ], (err)=>{
+        this.validateFields([ 'username', 'password' ], (err)=>{
           if(!err){
             let loginParams = {
               username: this.model.username,
               password: this.model.password,
-              captcha: this.model.inputCode,
+              // captcha: this.model.inputCode,
               checkKey: this.currdatetime,
               remember_me: rememberMe,
             }