提交代码

ruoyi-ui/src/views/project/surProjectInsurance/index.vue

@@ -129,7 +129,8 @@
     <el-table
       v-loading="loading"
       :data="surProjectInsuranceList"
-      @selection-change="handleSelectionChange" stripe
+      @selection-change="handleSelectionChange"
+      stripe
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
@@ -249,7 +250,14 @@
     />
 
     <!-- 添加或修改项目保险对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="680px"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="保险类型" prop="insuranceType">
           <el-select
@@ -482,7 +490,7 @@ export default {
     },
     /** 预览 */
     handledownload(row) {
-      window.open("/jhapi" + row.insuranceFile);
+      window.open(process.env.VUE_APP_BASE_API + row.insuranceFile);
     },
   },
 };

ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue

@@ -42,7 +42,8 @@
       <el-table
         v-loading="loading"
         :data="surProjectInsuranceList"
-        @selection-change="handleSelectionChange" stripe
+        @selection-change="handleSelectionChange"
+        stripe
       >
         <el-table-column label="保险类型" align="center" prop="insuranceTypeName" />
         <el-table-column label="保险状态" align="center" prop="insuranceState">
@@ -106,7 +107,14 @@
       />
 
       <!-- 添加或修改项目保险对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
+      <el-dialog
+        :title="title"
+        :visible.sync="open"
+        width="680px"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+      >
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
@@ -405,7 +413,7 @@ export default {
     },
     /** 预览 */
     handledownload(row) {
-      window.open("/jhapi" + row.insuranceFile);
+      window.open(process.env.VUE_APP_BASE_API + row.insuranceFile);
     },
   },
 };

ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue

@@ -359,7 +359,13 @@ export default {
       // 获取项目列表的接口
       this.$api.publics.getMyProjectList({}).then((response) => {
         this.projectOptions = response.rows;
-        if (response.rows.length > 1) {
+        if(response.rows.length == 1){
+          //默认初始化当前项目人员信息
+          this.$api.publics.selectProjectAllUnitUser({projectId: response.rows[0].id})
+          .then((d) => {
+            this.projectUnitUsers.push({projectId:response.rows[0].id,data:d.data});
+          });
+        }else if (response.rows.length > 1) {
           this.showPro = true;
         }
       });

ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue

@@ -359,7 +359,13 @@ export default {
       // 获取项目列表的接口
       this.$api.publics.getMyProjectList({}).then((response) => {
         this.projectOptions = response.rows;
-        if (response.rows.length > 1) {
+        if(response.rows.length == 1){
+          //默认初始化当前项目人员信息
+          this.$api.publics.selectProjectAllUnitUser({projectId: response.rows[0].id})
+          .then((d) => {
+            this.projectUnitUsers.push({projectId:response.rows[0].id,data:d.data});
+          });
+        }else if (response.rows.length > 1) {
           this.showPro = true;
         }
       });

ruoyi-ui/src/views/work/workFile/indexViewDrawer.vue

@@ -21,7 +21,7 @@
           <el-tab-pane :label="tag.zbgs" name="2" key="2" ></el-tab-pane>
           <el-tab-pane :label="tag.fbgs" name="3" key="3" ></el-tab-pane>
         </el-tabs>
-  
+
         <el-table
           v-loading="loading"
           style="margin-left: 20px; margin-right: 20px"
@@ -42,10 +42,10 @@
           >
           <template slot-scope="scope">
             <span v-if="scope.row.deptType!=1 && scope.row.deptType!=11">{{ scope.row.deptName }}</span>
-              <span v-if="scope.row.deptType==1">发展集团</span>
+              <span v-if="scope.row.deptType==1">产发集团</span>
               <span v-if="scope.row.deptType==11">
                 {{getDeptName(scope.row.ancestors)}}
-              </span>    
+              </span>
           </template>
           </el-table-column>
           <el-table-column label="人员姓名" align="center" prop="nickName"/>
@@ -72,7 +72,7 @@
         </template>
       </el-table-column>
         </el-table>
-  
+
         <pagination
           v-show="total > 0"
           :total="total"
@@ -83,10 +83,10 @@
       </el-drawer>
     </div>
   </template>
-  
+
   <script>
   import { listWorkUser, delWorkUser, queryCount } from "@/api/work/workUser";
-  
+
   export default {
     name: "workFileUser",
     data() {
@@ -155,23 +155,23 @@
           response.data.forEach(datum => {
             if(datum.deptType=="1"){
               sum+=datum.total;
-              tag.fzjt="集团公司（"+datum.total+"）"; 
+              tag.fzjt="集团公司（"+datum.total+"）";
             }
             if(datum.deptType=="11"){
               sum+=datum.total;
-              tag.zgs="子公司（"+datum.total+"）"; 
+              tag.zgs="子公司（"+datum.total+"）";
             }
             if(datum.deptType=="4"){
               sum+=datum.total;
-              tag.jldw="监理单位（"+datum.total+"）"; 
+              tag.jldw="监理单位（"+datum.total+"）";
             }
             if(datum.deptType=="2"){
               sum+=datum.total;
-              tag.zbgs="总包公司（"+datum.total+"）"; 
+              tag.zbgs="总包公司（"+datum.total+"）";
             }
             if(datum.deptType=="3"){
               sum+=datum.total;
-              tag.fbgs="分包公司（"+datum.total+"）"; 
+              tag.fbgs="分包公司（"+datum.total+"）";
             }
             tag.all="全部（"+sum+"）";
           });
@@ -210,4 +210,3 @@
     },
   };
   </script>
-