Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/api/system/device.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import { parseStrEmpty } from "@/utils/ruoyi";
 // 查询列表【请填写功能名称】
 export function listDevice(query) {
   return request({
@@ -19,7 +19,7 @@ export function getDevice(id) {
 // 查询主机
 export function getHostByOrgId(orgId) {
   return request({
-    url: '/system/device/getHostByOrgId/' + orgId,
+    url: '/system/device/getHostByOrgId/'+ orgId.id,
     method: 'get'
   })
 }

src/components/ImageUpload/index.vue

@@ -152,12 +152,13 @@ export default {
     },
     //自定义上传方式(自带的成功回调及失败回调会失效)
     uploadImage(fileObj){
+      console.log(window.origin,'URL')
       let formData = new FormData();
       formData.append('file',fileObj.file);
       upload(formData,'image').then(res=>{
         /*上传成功*/
         this.$modal.closeLoading();
-        let imgUrl = process.env.VUE_APP_BASE_API + res.data.url;
+        let imgUrl = process.env.NODE_ENV === 'development'? process.env.VUE_APP_BASE_API + res.data.url :window.origin + res.data.url;
         let arr = [];
         arr.push({ name: res.data.name, url: imgUrl})
         this.fileList = arr;

src/views/system/device/index.vue

@@ -1,24 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- 
+
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="资产类别" prop="assetType">
 
         <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择">
-                <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
-                  :value="`${dict.value}`"></el-option>
-              </el-select>
+          <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
+            :value="`${dict.value}`"></el-option>
+        </el-select>
       </el-form-item>
 
       <el-form-item label="设备分类" prop="deviceType">
-        
+
         <el-select style="width: 100%;" v-model="queryParams.deviceType" placeholder="请选择">
-                <el-option v-for="dict in dict.type.sys_device_type" :key="dict.value" :label="dict.label"
-                  :value="`${dict.value}`"></el-option>
-              </el-select>
+          <el-option v-for="dict in dict.type.sys_device_type" :key="dict.value" :label="dict.label"
+            :value="`${dict.value}`"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -91,17 +91,17 @@
               <el-input v-model="form.deviceName" placeholder="请输入" />
             </el-form-item>
           </el-col>
-          <el-col :span="14">
+          <el-col :span="10">
             <el-form-item label="所属机构" prop="orgId">
               <tree-select v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
-                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属机构" >
+                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属机构" @select="changeSelect">
               </tree-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="资产类别">
+            <el-form-item label="资产类别" prop="assetType">
               <el-select style="width: 100%;" v-model="form.assetType" placeholder="请选择">
                 <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
                   :value="`${dict.value}`"></el-option>
@@ -109,8 +109,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="设备分类">
-              <el-select style="width: 100%;" v-model="form.deviceType" placeholder="请选择"  @change="changeSelect(form.orgId)">
+            <el-form-item label="设备分类" prop="deviceType">
+              <el-select style="width: 100%;" v-model="form.deviceType" placeholder="请选择">
                 <el-option v-for="dict in dict.type.sys_device_type" :key="dict.value" :label="dict.label"
                   :value="`${dict.value}`"></el-option>
               </el-select>
@@ -120,7 +120,7 @@
 
         <el-row>
           <el-col :span="10">
-            <el-form-item v-if="form.deviceType==2" label="主机">
+            <el-form-item v-if="form.deviceType == 2" label="主机" prop="hostId">
               <el-select v-model="form.hostId" placeholder="请选择">
                 <el-option v-for="item in hostList" :key="item.id" :label="item.deviceName" :value="item.id"></el-option>
               </el-select>
@@ -128,7 +128,7 @@
           </el-col>
 
           <el-col :span="10">
-            <el-form-item v-if="form.deviceType==2" label="通道号" prop="channel">
+            <el-form-item v-if="form.deviceType == 2" label="通道号" prop="channel">
               <el-input v-model="form.channel" placeholder="请输入" />
             </el-form-item>
           </el-col>
@@ -138,12 +138,12 @@
 
         <el-row>
           <el-col :span="10">
-            <el-form-item v-if="!form.id" label="设备品牌" prop="deviceBrand">
+            <el-form-item label="设备品牌" prop="deviceBrand">
               <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="30" />
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+          <el-col :span="10">
             <el-form-item style="width: 517px;" label="验收日期" prop="checkTime">
               <el-date-picker clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择时间">
@@ -181,6 +181,33 @@ export default {
   name: "Device",
   data() {
     return {
+
+      rules: {
+        deviceName: [
+          { required: true, message: '请输入设备名称', trigger: 'change' },
+        ],
+        orgId: [
+          { required: true, message: '请选择所属机构', trigger: 'blur' },
+        ],
+        assetType: [
+          { required: true, message: '请选择资产类别', trigger: 'blur' },
+        ],
+        hostId: [{ required: true, message: '请选择主机', trigger: 'blur' }],
+        channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],
+        deviceType: [
+          { required: true, message: '请选择设备分类', trigger: 'blur' },
+
+        ],
+        deviceBrand: [
+          { required: true, message: '请输入设备品牌', trigger: 'change' },
+        ],
+        checkTime: [
+          { required: true, message: '请选择验收日期', trigger: 'change' }
+        ],
+        maintenanceTerm: [
+          { required: true, message: '请输入保修期限', trigger: 'change' }
+        ],
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -219,10 +246,19 @@ export default {
         channel: null
       },
       // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
+      form: {
+        orgId: null,
+        deviceName: null,
+        assetType: null,
+        deviceType: null,
+        deviceBrand: null,
+        checkTime: null,
+        maintenanceTerm: null,
+        hostId: null,
+        channel: null
       },
+      // 表单校验
+
       //修改新增中的机构树
       deptOptions: [],
     };
@@ -251,8 +287,8 @@ export default {
       }
     },
 
-    changeSelect(orgId) {
-      getHostByOrgId(orgId).then(response => {
+    changeSelect(val) {
+      getHostByOrgId(val).then(response => {
         this.form.hostId = null;
         this.hostList = response.data;
       })
@@ -324,8 +360,11 @@ export default {
       getDevice(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改【请填写功能名称】";
+        this.title = "修改";
       });
+      listDevice().then(response => {
+        this.hostList = response.rows;
+      })
     },
     /** 提交按钮 */
     submitForm() {

src/views/system/user/extend.vue

@@ -234,46 +234,46 @@ export default {
       },
       rules: {
          deptId: [
-            { required: true,message: '请选择组织机构', trigger: 'blur' },
+            { required: true,message: '请选择所属部门', trigger: 'blur' },
           ],
           duties:[
-            { required: true,message: '请选择组织机构', trigger: 'blur' },
+            { required: true,message: '请选择职务', trigger: 'blur' },
           ],
           workType:[
-            { required: true, message: '请选择组织机构',trigger: 'blur' },
+            { required: true, message: '请选择用工形式',trigger: 'blur' },
           ],
           isFullTime:[
-            { required: true,message: '请选择组织机构', trigger: 'change' },
+            { required: true,message: '请选择是否专职', trigger: 'change' },
           ],
           highestEducation:[
-            { required: true,message: '请选择组织机构', trigger: 'blur' },
+            { required: true,message: '请选择最高学历', trigger: 'blur' },
           ],
           educationType:[
-            { required: true,message: '请选择组织机构', trigger: 'blur' },
+            { required: true,message: '请选择学历取得形式', trigger: 'blur' },
           ],
           certificateWork:[
-            { required: true,message: '请选择组织机构', trigger: 'blur' },
+            { required: true,message: '请选择是否持证上岗', trigger: 'blur' },
           ],
           workTime:[
-            { required: true,message: '请选择组织机构',trigger: 'blur' },
+            { required: true,message: '请选择参加工作时间',trigger: 'blur' },
           ],
           entryTime: [
-            { required: true,message: '请选择组织机构', trigger: 'change' }
+            { required: true,message: '请选择入职时间', trigger: 'change' }
           ],
           bornTime: [
-            { required: true,message: '请选择组织机构', trigger: 'change' }
+            { required: true,message: '请选择出生时间', trigger: 'change' }
           ],
           responsibilitiesLeaderName: [
-            { required: true,message: '请选择组织机构', trigger: 'change' }
+            { required: true,message: '请输入分管领导名字', trigger: 'change' }
           ],
           responsibilitiesLeaderDuties: [
-            { required: true,message: '请选择组织机构', trigger: 'change' }
+            { required: true,message: '请选择分管领导职务', trigger: 'change' }
           ],
           qualificationCertificateUrl: [
-            { required: true,message: '请选择组织机构', trigger: 'change' }
+            { required: true,message: '请选择上传资格证', trigger: 'change' }
           ],
           professionalQualifications:[
-            { required: true,message: '请选择组织机构', trigger: 'change' }
+            { required: true,message: '请输入初级以上相关专业技术职业资格', trigger: 'change' }
           ],
           date1: [
             { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
@@ -587,7 +587,7 @@ export default {
       this.orgreset();
       const id = row.id || this.orgids;
       getOrgPhysicalDefenseConstruction(id).then((response) => {
-        // console.log(response)
+
         this.orgform = response.data;
         this.orgopen = true;
         this.orgtitle = "修改机构物防建设";
@@ -630,39 +630,7 @@ export default {
         })
         .catch(() => {});
     },
-    // saveExtend() {
-    //   let dat = {
-    //     deptId: this.deptId,
-    //     duties: this.duties,
-    //     workType: this.workType,
-    //     isFullTime: this.isFullTime,
-    //     highestEducation: this.highestEducation,
-    //     educationType: this.educationType,
-    //     certificateWork: this.certificateWork,
-    //     professionalQualifications: this.professionalQualifications,
-    //     certificateFailReason: this.certificateFailReason,
-    //     workTime: this.workTime,
-    //     entryTime: this.entryTime,
-    //     bornTime: this.bornTime,
-    //     responsibilitiesLeaderName: this.responsibilitiesLeaderName,
-    //     responsibilitiesLeaderDuties: this.responsibilitiesLeaderDuties,
-    //     qualificationCertificateUrl: this.qualificationCertificateUrl,
-
-    //     id: this.id,
-    //   };
-    //   if(this.extendId){
-    //     updateExtend(dat).then((res) => {
-    //       this.$modal.msgSuccess("保存成功");
-    //       this.$router.go(-1);
-    //     });
-    //   }else{
-    //     addExtend(dat).then((res) => {
-    //       this.$modal.msgSuccess("保存成功");
-    //       this.$router.go(-1);
-    //     });
-    //   }
 
-    // },
     nosaveExtend() {
       this.$router.go(-1);
     },

vue.config.js

@@ -20,7 +20,8 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "./" : "./",
+  publicPath:"./",
+
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）