likang

.env.development

@@ -4,4 +4,4 @@ ENV = 'development'
 # base api
 #VUE_APP_BASE_API = 'http://wxt.rltest.cn:8102'
 #VUE_APP_BASE_API = '127.0.0.1'
-VUE_APP_BASE_API = 'http://192.168.1.56:80'
+VUE_APP_BASE_API = 'http://192.168.1.105:80'

src/views/device/hyd_equipment/formModel.vue

@@ -32,6 +32,7 @@ export default {
            callback()
         }
     };
+    
     var validateMinPressure = (rule, value, callback) => {
         if ( (value !== '') && (this.formFieldsData.max_pressure !=='')) {
             var max_pressure = this.formFieldsData.max_pressure - 0;
@@ -137,6 +138,10 @@ export default {
             layout: 12,
             type: "input",
             label: "型号",
+            rules: [{ validator: validQC, trigger: 'blur' },
+            { max: 20, message: "型号不能超过20位", trigger: "blur" }]
+
+          
           },
            name: {
              layout: 12,
@@ -160,6 +165,9 @@ export default {
             layout: 12,
             type: "input",
             label: "固定资产编号",
+            rules:[{ validator: validQC, trigger: 'blur' },
+              { max: 20, message: "固定资产编号不能超过20位", trigger: "blur" }]
+            
           },
           fixed_asset_number2:
           {
@@ -232,7 +240,8 @@ export default {
             type: "input",
             label: "编号",
             required: true,
-            rules: { validator: validQC, trigger: 'blur' },
+            rules: [{ validator: validQC, trigger: 'blur' },
+              { max: 20, message: "编号不能超过20位", trigger: "blur" }],
             vif(data)
             {
               if(data.equipment_type&&data.equipment_type<5)

src/views/device/hyd_equipment/index.vue

@@ -115,7 +115,7 @@
       <el-button type="danger" icon="el-icon-delete" v-if="selectedIds.length > 0" style="margin-top: 15px"
         @click="handleMultiDelete()">删除</el-button>
       <el-button type="warning" icon="el-icon-download" :loading="downloadLoading" style="margin-top: 15px"
-        @click="importHydExcels">导出</el-button>
+        @click="exportExcel">导出</el-button>
 
 
       <el-button type="success" icon="el-icon-upload" :loading="downloadLoading" style="margin-top: 15px"
@@ -133,6 +133,10 @@
 
       <logDetail :detailVisible="logDetailVisible" @sendVal="closeDrawer" :record="logDetail">
       </logDetail>
+
+
+
+
       <!-- 导入弹框 -->
       <el-dialog title="导入液压设备" append-to-body width="400px" :visible.sync="uploadDialogVisible"
         custom-class="upload-dialog">
@@ -169,6 +173,18 @@
 
 
       <!-- 导出弹框 -->
+      <el-dialog title="导出" append-to-body width="400px" :visible.sync="downloadDialogVisible"
+        custom-class="upload-dialog">
+
+
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="downloadDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="exportExcel" :loading="loadings">{{
+          submitText
+          }}</el-button>
+        </span>
+      </el-dialog>
+
 
     </div>
   </div>
@@ -261,6 +277,8 @@ export default {
       headers: { authorization: "Bearer " + getToken() },
       excel_url: "", //上传学生Excel返回的url
       uploadDialogVisible: false, //下发配置显示与否
+      //下载是否显示
+      downloadDialogVisible:false,
       selectedDepartId: "",
       loadings: false,
       submitText: "确 定",
@@ -365,6 +383,10 @@ export default {
     importExcel() {
       this.uploadDialogVisible = true;
     },
+    exportExcel()
+    {
+      this.downloadDialogVisible = true;
+    },
     changeCards(v) {
       this.selectedDepartId = v[v.length - 1];
     },

src/views/wind/wind/form/AddEditWind.vue

@@ -2,74 +2,49 @@
   <div class="drawer-content">
     <el-form :ref="formName" :rules="rules" :model="form" label-width="150px">
       <el-form-item label="风场名称" prop="name">
-        <el-input v-model="form.name"></el-input>
+        <el-input v-model="form.name" :disabled="is_disabled"></el-input>
       </el-form-item>
       <el-form-item label="风场编号" required prop="number">
-        <el-input v-model="form.number"></el-input>
+        <el-input v-model="form.number" :disabled="is_disabled"></el-input>
       </el-form-item>
       <el-form-item label="风场类型" required prop="wind_type">
         <el-select v-model="form.wind_type" filterable placeholder="请选择风场类型">
-          <el-option
-            v-for="item in windTypeData"
-            :key="item.value"
-            :label="item.text"
-            :value="item.value">
+          <el-option v-for="item in windTypeData" :key="item.value" :label="item.text" :value="item.value">
           </el-option>
         </el-select>
       </el-form-item>
-       <el-form-item label="所属部门" required prop="department_id">
-        <el-cascader
-          class="filter-item form-search-input fl"
-          placeholder="请选择所属部门"
-          :options="departmentData"
-          v-model="form.department_id"
-          :show-all-levels="false"
-          :props="departProps"
-          filterable
-          clearable
-        ></el-cascader>
-         </el-form-item>
-        <el-form-item label="环境类型" required prop="env_type">
+      <el-form-item label="所属部门" required prop="department_id">
+        <el-cascader class="filter-item form-search-input fl" placeholder="请选择所属部门" :options="departmentData"
+          v-model="form.department_id" :show-all-levels="false" :props="departProps" filterable clearable></el-cascader>
+      </el-form-item>
+      <el-form-item label="环境类型" required prop="env_type">
         <el-select v-model="form.env_type" filterable placeholder="请选择环境类型">
-          <el-option
-            v-for="item in EnvTypeData"
-            :key="item.value"
-            :label="item.text"
-            :value="item.value">
+          <el-option v-for="item in EnvTypeData" :key="item.value" :label="item.text" :value="item.value">
           </el-option>
         </el-select>
-       </el-form-item>
-      <el-form-item label="所属区域"  prop="area_id" placeholder="请选择所属区域">
-          <regionals style="width: 85%"
-              ref="regionals"
-              class="filter-item fl"
-              appendToBody
-              @checked="selectArea"
-              :defaultCheckedKeys="defaultCheckedKeys"
-            />
+      </el-form-item>
+      <el-form-item label="所属区域" prop="area_id" placeholder="请选择所属区域">
+        <regionals style="width: 85%" ref="regionals" class="filter-item fl" appendToBody @checked="selectArea"
+          :defaultCheckedKeys="defaultCheckedKeys" />
       </el-form-item>
       <el-form-item label="详细地址" prop="address">
         <el-input v-model="form.address"></el-input>
       </el-form-item>
-       <el-form-item label="风场边颜色" prop="side_color">
+      <el-form-item label="风场边颜色" prop="side_color">
         <el-color-picker v-model="form.side_color"></el-color-picker>
       </el-form-item>
-       <el-form-item label="风场内颜色" prop="inside_color">
+      <el-form-item label="风场内颜色" prop="inside_color">
         <el-color-picker v-model="form.inside_color"></el-color-picker>
       </el-form-item>
-       <el-form-item label="海拔高度" prop="altitude">
+      <el-form-item label="海拔高度" prop="altitude">
         <el-input v-model="form.altitude"></el-input>
       </el-form-item>
       <el-form-item label="主机制造商" required prop="env_type">
-      <el-select v-model="form.host_firm" filterable placeholder="主机制造商">
-          <el-option
-            v-for="item in HostTypeData"
-            :key="item.value"
-            :label="item.text"
-            :value="item.value">
+        <el-select v-model="form.host_firm" filterable placeholder="主机制造商">
+          <el-option v-for="item in HostTypeData" :key="item.value" :label="item.text" :value="item.value">
           </el-option>
         </el-select>
-       </el-form-item>
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input type="textarea" v-model="form.remark"></el-input>
       </el-form-item>
@@ -120,6 +95,7 @@ export default {
         value: "id",
         checkStrictly: true,
       },
+      is_disabled:false,
       windTypeData: [],
       defaultCheckedKeys:[],
       EnvTypeData:[],
@@ -130,8 +106,8 @@ export default {
           { required: true, message: "请输入风场名称", trigger: "change" },
           {
             min: 2,
-            max: 50,
-            message: "长度在 2 到 50 个字符",
+            max: 20,
+            message: "长度在 2 到 20 个字符",
             trigger: "blur",
           },
         ],
@@ -153,6 +129,7 @@ export default {
     };
   },
   created() {
+   
     this.getDepartmentData();
     this.$http.post("sysDictData/getOptions", { type: "WindType" }).then(resp => {
         this.windTypeData = resp.data
@@ -169,6 +146,10 @@ export default {
   computed: {
     form: {
       get() {
+        if (this.formData.id)
+        {
+          this.is_disabled = true;
+        }
         return this.formData;
       },
       set(val) {
@@ -201,6 +182,7 @@ export default {
           return false;
         }
         if (this.form.id) {
+          //禁止修改风场名称和风场编号
           // 修改操作
           var saveData = {
             name: this.form.name,

src/views/work_record/work_plan/formModel.vue

@@ -64,7 +64,7 @@ export default {
             on: {
               change: (val) => {
 
-                that.queryWorkByFanModel(val);
+                this.queryFanByWindId(val);
               }
             },
             attrs: {
@@ -99,7 +99,9 @@ export default {
                     }
                     
                   });
-                  that.queryWorkByFanModel(model_id);
+                  this.formFieldsData.fan_model = model_id;
+                  that.queryWorkByFanModel();
+
               }
               },
               attrs: {
@@ -123,6 +125,10 @@ export default {
             required: true,
             vif: true,
             on: {
+              change: (val)=>
+              {
+                that.queryWorkByFanModel();
+              }
               
             },
             attrs: {
@@ -264,9 +270,11 @@ export default {
         this.formConfig.formDesc.fan_id.options = response.data;
       });
     },
-    queryWorkByFanModel(fan_model)
+
+    queryWorkByFanModel()
     {
       let part = this.formFieldsData.parts_sign;
+      let fan_model= this.formFieldsData.fan_model;
       this.$http.get("get_mainten_option?type=2&fan_model=" + fan_model +'&part='+part).then((response) => {
         this.formConfig.formDesc.work_sign.options = response.data;
       });
@@ -283,7 +291,7 @@ export default {
         if (this.formModelVisible)
         {
           this.queryFanByWindId(this.formFieldsData.wind_id)
-          this.queryWorkByFanModel(this.formFieldsData.fan_model);
+          this.queryWorkByFanModel();
 
         }
         return this.formModelVisible; // 表示获取父组件的值