flx:修改样式

src/store/index.js

@@ -60,11 +60,11 @@ export default new Vuex.Store({
         // FILEURL:'http://182.90.224.237:51234/image/',
         // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
         // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
+        UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
+        FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
         // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地)
         // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
-        // WORKFLOWURL: "http://192.168.34.131:88/#/workspace/forms", //罗峰工作流地址(本地)
+        WORKFLOWURL: "http://192.168.34.133:88/#/workspace/forms", //罗峰工作流地址(本地)
         CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.131:88/#/workspace/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地)
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
         // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
@@ -79,9 +79,9 @@ export default new Vuex.Store({
         // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
         // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
 
-        UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工
+        // UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工
-        FILEURL: 'http://jxj.zhgdyun.com:18000' + "/image/", //包头化工
+        // FILEURL: 'http://jxj.zhgdyun.com:18000' + "/image/", //包头化工
-        WORKFLOWURL: 'http://jxj.zhgdyun.com:18003/#/workspace/forms', //包头化工工作流地址
+        // WORKFLOWURL: 'http://jxj.zhgdyun.com:18003/#/workspace/forms', //包头化工工作流地址
         // BASEURL: baseUrl
         //   ? baseUrl
         //   : window.location.protocol + "//" + window.location.host + "/", //正式环境

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -346,6 +346,68 @@
           </el-radio-group>
           <div v-show="recordType == 1 || (recordType == 1 && type == 'detail')">
             <el-form ref="addForm1" size="small" :rules="addForm1Rules" :model="addForm1" label-width="120px">
+              <el-form-item label="合同模式" prop="subsectionId" :disabled="type == 'detail'">
+                <el-select
+                  :disabled="type == 'detail'"
+                  v-model="addForm1.subsectionId"
+                  @change="checkSubListData"
+                  filterable
+                  style="width: 400px"
+                  clearable
+                  placeholder="请选择"
+                >
+                  <el-option v-for="(item, index) in listData" :key="index" :label="item.subdivisionProjectName" :value="item.id"> </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="下发层级" prop="subsectionId" :disabled="type == 'detail'">
+                <el-select
+                  :disabled="type == 'detail'"
+                  v-model="addForm1.subsectionId"
+                  @change="checkSubListData"
+                  filterable
+                  style="width: 400px"
+                  clearable
+                  placeholder="请选择"
+                >
+                  <el-option v-for="(item, index) in listData" :key="index" :label="item.subdivisionProjectName" :value="item.id"> </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="装置" prop="deviceUnitId">
+                <el-select
+                  @change="deviceUnitListFn()"
+                  v-model="addForm1.deviceUnitId"
+                  :placeholder="$t('message.personnelPosition.please_select')"
+                  filterable
+                >
+                  <el-option :label="item.deviceUnitName" :value="item.deviceUnitId" v-for="(item, index) in deviceUnitList" :key="index">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="项目组" prop="projectGroupId">
+                <el-select
+                  @change="projectGroupFn(addForm1.projectGroupId)"
+                  v-model="addForm1.projectGroupId"
+                  :placeholder="$t('message.personnelPosition.please_select')"
+                  filterable
+                >
+                  <el-option :label="item.projectGroupName" :value="item.id" v-for="(item, index) in enterpriseTypeList" :key="index"> </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="监理单位" prop="supervisingUnitId">
+                <el-select v-model="addForm1.supervisingUnitId" :placeholder="$t('message.personnelPosition.please_select')" filterable>
+                  <el-option :label="item.enterpriseName" :value="item.id" v-for="(item, index) in supervisingUnitList" :key="index"> </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="EPC承包商" prop="epcContractorId">
+                <el-select v-model="addForm1.epcContractorId" :placeholder="$t('message.personnelPosition.please_select')" filterable>
+                  <el-option :label="item.enterpriseName" :value="item.id" v-for="(item, index) in epcContractorList" :key="index"> </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="施工单位" prop="constructionUnitId">
+                <el-select v-model="addForm1.constructionUnitId" :placeholder="$t('message.personnelPosition.please_select')" filterable>
+                  <el-option :label="item.enterpriseName" :value="item.id" v-for="(item, index) in constructionUnitList" :key="index"> </el-option>
+                </el-select>
+              </el-form-item>
               <!--              检查部位-->
               <el-form-item :label="$t('message.quality.checkPoint')" prop="regionId">
                 <el-cascader
@@ -1545,7 +1607,12 @@
                     </p>
                     <p class="grid-content" v-if="item.type == 1 && item.violatorId">
                       <span class="label">违章人员：</span
-                      ><span class="value">{{ personList.find(ele => ele.id == item.violatorId).workerName }}</span>
+                      ><span class="value">{{
+                        personList
+                          .filter(ele => item.violatorId.includes(ele.id))
+                          .map(ele => ele.workerName)
+                          .join('、')
+                      }}</span>
                     </p>
                     <p class="grid-content" v-if="item.type == 1">
                       <span class="label">整改状态：</span><span class="value">{{ item.status == 2 ? '已整改' : '未整改' }}</span>
@@ -1714,6 +1781,7 @@ import {
   backSafeRectifyRecordListApi
 } from '@/assets/js/api/quality.js';
 import { getProjectChilderSystemUserListApi, getEnterpriseInfoListApi, getLaborManagementInfoListApi } from '@/assets/js/api/configManage.js';
+import { getDeviceUnitPage, getProjectGroupPage, getProjectGroupEnterpriseList } from '@/assets/js/api/project';
 import { VueCropper } from 'vue-cropper';
 import {
   getSubdivisionProjectApi //所有分部分项工程， 以父子节点形式呈现
@@ -1778,6 +1846,12 @@ export default {
       addDialog: false,
       addTitle: this.$t('message.quality.new') + this.$t('message.quality.inspectionRecord'),
       addForm1: {
+        deviceUnitId: '',
+        projectGroupId: '',
+        supervisingUnitId: '',
+        epcContractorId: '',
+        constructionUnitId: '',
+
         regionId: '',
         regionName: '',
         dangerItemContent: '',
@@ -1876,7 +1950,15 @@ export default {
       videoName: '',
       unitEnterpriseId: '',
       unitRegionId: '',
-      enterpriseList: []
+      enterpriseList: [],
+
+      deviceUnitList: [], // 装置列表
+      enterpriseTypeList: [], // 项目组
+      cooperatorList: [], // 所有企业信息
+      projectGroupUnitList: [], // 项目组下的所有承包商
+      supervisingUnitList: [], // 当前项目组下的监理单位
+      epcContractorList: [], // 当前项目组下的承包商
+      constructionUnitList: [] // 当前epc承包商下的施工承包商
     };
   },
   created() {
@@ -1891,53 +1973,92 @@ export default {
     this.getPositionList();
     this.getDescribeClassifyList();
     this.getUpdateUnitListFn();
-  },
+    this.getDeviceUnitList();
-  computed: {
+    this.getCooperatorList();
-    isJSON() {
-      return function (str) {
-        if (typeof str == 'string') {
-          try {
-            var obj = JSON.parse(str);
-            if (typeof obj == 'object' && obj) {
-              return true;
-            } else {
-              return false;
-            }
-          } catch (e) {
-            return false;
-          }
-        }
-      };
-    }
-  },
-  watch: {
-    'addForm1.regionId': {
-      handler(newVal) {
-        console.log(newVal);
-        if (newVal.length == 0) {
-          this.addForm1.reviewId = ''; // 先清空复查人
-          this.reviewList = [];
-        } else {
-          this.getReviewPeopleList(newVal);
-        }
-        // this.addForm1.reviewId = ""
-      },
-      deep: true
-    },
-    'addForm2.regionId': {
-      handler(newVal) {
-        if (newVal.length == 0) {
-          this.reviewList = [];
-        } else {
-          this.getReviewPeopleList(newVal);
-        }
-        // this.addForm2.reviewId = ""
-      },
-      deep: true
-    }
   },
   mounted() {},
   methods: {
+    getDeviceUnitList() {
+      let param = {
+        projectSn: this.$store.state.projectSn,
+        pageNo: 1,
+        pageSize: -1
+      };
+      getDeviceUnitPage(param).then(res => {
+        this.deviceUnitList = res.result.records;
+      });
+    },
+    // 项目组承包商信息
+    projectGroupFn(type) {
+      if (type != 2) {
+        this.addForm1.epcContractorId = '';
+        this.addForm1.constructionUnitId = '';
+        this.addForm1.supervisingUnitId = '';
+      }
+      getProjectGroupEnterpriseList({
+        projectGroupIds: this.addForm1.projectGroupId,
+        deviceUnitId: this.addForm1.deviceUnitId,
+        projectSn: this.$store.state.projectSn
+      }).then(res => {
+        if (res.code == 200) {
+          // this.projectGroupUnitList = res.result.projectGroupUnitList;
+          this.supervisingUnitList = res.result.supervisingUnitIds.reduce((prev, item) => {
+            const find = this.cooperatorList.find(ele => ele.id == item);
+            if (find) {
+              prev.push(find);
+            }
+            return prev;
+          }, []);
+          this.epcContractorList = res.result.epcContractorIds.reduce((prev, item) => {
+            const find = this.cooperatorList.find(ele => ele.id == item);
+            if (find) {
+              prev.push(find);
+            }
+            return prev;
+          }, []);
+          this.constructionUnitList = res.result.constructionUnitIds.reduce((prev, item) => {
+            const find = this.cooperatorList.find(ele => ele.id == item);
+            if (find) {
+              prev.push(find);
+            }
+            return prev;
+          }, []);
+          console.log(1111, this.epcContractorList, this.constructionUnitList);
+          // if(type == 2) {
+          //   this.epcContractorFn(2);
+          // }
+        }
+      });
+    },
+    deviceUnitListFn() {
+      const find = this.deviceUnitList.find(item => item.id == this.addForm1.deviceUnitId);
+      if (find) {
+        this.projectGroupListFn(find.projectGroupIds);
+      }
+    },
+    projectGroupListFn(projectGroupIds) {
+      getProjectGroupPage({
+        projectSn: this.$store.state.projectSn,
+        pageNo: 1,
+        pageSize: -1
+      }).then(res => {
+        this.enterpriseTypeList = res.result.records.filter(item => (projectGroupIds ? projectGroupIds.includes(item.id) : true));
+      });
+    },
+    //获取列表数据
+    getCooperatorList() {
+      let data = {
+        projectSn: this.$store.state.projectSn,
+        pageNo: 1,
+        pageSize: -1
+        // enterpriseTypeId: this.enterpriseTypeSelectId,
+      };
+      getCooperatorListApi(data).then(res => {
+        if (res.code == 200) {
+          this.cooperatorList = res.result.records;
+        }
+      });
+    },
     //获取人员列表
     getViolationList() {
       let data = {
@@ -3441,6 +3562,50 @@ export default {
     submit() {},
 
     handleExceed() {}
+  },
+  computed: {
+    isJSON() {
+      return function (str) {
+        if (typeof str == 'string') {
+          try {
+            var obj = JSON.parse(str);
+            if (typeof obj == 'object' && obj) {
+              return true;
+            } else {
+              return false;
+            }
+          } catch (e) {
+            return false;
+          }
+        }
+      };
+    }
+  },
+  watch: {
+    'addForm1.regionId': {
+      handler(newVal) {
+        console.log(newVal);
+        if (newVal.length == 0) {
+          this.addForm1.reviewId = ''; // 先清空复查人
+          this.reviewList = [];
+        } else {
+          this.getReviewPeopleList(newVal);
+        }
+        // this.addForm1.reviewId = ""
+      },
+      deep: true
+    },
+    'addForm2.regionId': {
+      handler(newVal) {
+        if (newVal.length == 0) {
+          this.reviewList = [];
+        } else {
+          this.getReviewPeopleList(newVal);
+        }
+        // this.addForm2.reviewId = ""
+      },
+      deep: true
+    }
   }
 };
 </script>

src/views/projectFront/scheduleManage/projectMasterPlan.vue

@@ -1,21 +1,9 @@
 <template>
   <div class="fullHeight">
+    <div class="table_wrap whiteBlock">
+      <GanttChart :yearList="yearList" :milestoneList="milestoneList" :projectItemList="projectItemList" />
+    </div>
     <div class="searchBox whiteBlock">
-      <!-- <el-form :inline="true" size="medium" :model="searchForm" ref="searchForm">
-                <el-form-item label="装置名称" prop="deviceUnitName">
-                    <el-input v-model="searchForm.deviceUnitName"
-                        :placeholder="$t('message.personnelPosition.please_enter')" clearable></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" plain @click="getProjectPlanGraph">
-                        {{ $t("message.personnelPosition.beaconManage.query") }}
-                    </el-button>
-                    <el-button type="warning" plain @click="resetForm">
-                        {{ $t("message.personnelPosition.beaconManage.refresh") }}
-                    </el-button>
-                    <el-button type="primary" @click="isAddPoint(1)"> 新增 </el-button>
-                </el-form-item>
-            </el-form> -->
       <div class="rhombus">
         图例：
         <div>
@@ -40,9 +28,6 @@
         </div>
       </div>
     </div>
-    <div class="table_wrap whiteBlock">
-      <GanttChart :yearList="yearList" :milestoneList="milestoneList" :projectItemList="projectItemList" />
-    </div>
   </div>
 </template>
 <script>

src/views/projectFront/scheduleManage/projectSchedul.vue

@@ -230,7 +230,8 @@ import {
   deleteProgressPlanApi,
   getProgressPlanEquipmentTreeApi,
   addProgressPlanEquipmentApi,
-  editProgressPlanEquipmentApi
+  editProgressPlanEquipmentApi,
+  deleteProgressPlanEquipmentApi
 } from '@/assets/js/api/scheduleInfo';
 import { getWorkerInfoList } from '@/assets/js/api/laborPerson.js';
 import { isJSON } from '@/util/nowDate/index';
@@ -439,6 +440,7 @@ export default {
             projectSn: this.$store.state.projectSn
           };
           if (this.dialogType == 1 || this.dialogType == 2) {
+            result.orderBy = result.orderBy instanceof Array ? '' : result.orderBy;
             result.bindDeviceUnitIds = result.bindDeviceUnitIds ? result.bindDeviceUnitIds.join(',') : '';
             result.isScheduleCriticalPath = result.isScheduleCriticalPath ? 1 : 0;
           }
@@ -447,7 +449,7 @@ export default {
             addProgressPlanEquipmentApi(result).then(res => {
               this.cardDialog = false;
               this.getDangerTypeRecordList();
-              this.loadCardData();
+              // this.loadCardData();
               this.handleClose();
               this.$message.success(this.$t('message.personnelPosition.add_success')); //添加成功！
             });
@@ -455,7 +457,7 @@ export default {
             editProgressPlanEquipmentApi(result).then(res => {
               this.cardDialog = false;
               this.getDangerTypeRecordList();
-              this.loadCardData();
+              // this.loadCardData();
               this.handleClose();
               this.$message.success(this.$t('message.personnelPosition.edit_success')); //编辑成功！
             });
@@ -532,6 +534,22 @@ export default {
         });
       });
     },
+    // 删除
+    deleteTreeRow(item) {
+      this.$confirm(
+        this.$t('message.personnelPosition.beaconManage.table.confirmText') + '?',
+        this.$t('message.personnelPosition.beaconManage.table.Tips'),
+        {
+          type: 'warning'
+        }
+      ).then(() => {
+        deleteProgressPlanEquipmentApi({ id: item.id }).then(res => {
+          this.getDangerTypeRecordList();
+          // this.loadCardData();
+          this.$message.success(this.$t('message.personnelPosition.delete_success')); //删除成功!
+        });
+      });
+    },
 
     //获取选中的 节点
     getCheckedNode(data) {