Merge branch 'chenH' into bjxz-dev

package.json

@@ -34,7 +34,6 @@
     "monitorjs_horse": "^2.2.1",
     "mqtt": "^4.2.6",
     "node-rsa": "^1.1.1",
-    "node-sass": "^7.0.1",
     "postcss-normalize-string": "^5.1.0",
     "qrcodejs2": "0.0.2",
     "react": "^17.0.2",
@@ -68,7 +67,8 @@
     "compression-webpack-plugin": "^5.0.2",
     "less": "^3.0.4",
     "less-loader": "^5.0.0",
-    "sass-loader": "^7.0.1",
+    "sass": "^1.75.0",
+    "sass-loader": "^7.3.1",
     "stylus": "^0.54.8",
     "terser-webpack-plugin": "^4.2.3",
     "vue-cli-plugin-element": "~1.0.1",

src/assets/i18n/langs/cn/quality.js

@@ -2,7 +2,10 @@ export default {
     checkPoint: '检查部位',
     regionName: '区域名称',
     coding: '编码',
+    unit:'单位',
     rectificationPeople: '整改人',
+    personLiable:'责任人',
+    personWork:'责任单位',
     notifier: '通知人',
     explain: '说明',
     operation: '操作',

src/assets/js/api/configManage.js

@@ -22,7 +22,8 @@ export const getProjectModuleGroupMenuListApi  = data => post('xmgl/baseMenu/get
 
 export const addProjectUserApi = data => post('xmgl/systemUser/addProjectUser', data);
 export const editProjectUserApi = data => post('xmgl/systemUser/editProjectUser', data);
-export const getProjectChilderSystemUserListApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data);
+export const getProjectChilderSystemUserListApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data);//责任人查询
+export const getEnterpriseInfoListApi = data =>post('xmgl/enterpriseInfo/list',data)// 责任单位查询
 export const getLaborManagementInfoListApi = data => post('xmgl/workerInfo/getLaborManagementInfoList', data);//查询劳务和管理人员列表
 
 

src/assets/js/api/quality.js

@@ -32,6 +32,7 @@ export  const deleteQualityRegionListApi = data => post('xmgl/qualityRegion/dele
 export  const editQualityRegionListApi = data => post('xmgl/qualityRegion/edit', data); //检查部位 编辑 节点
 
  
+
 //数据中心
 export const getInspectionRecordListApi = data=> post('xmgl/qualityInspectionRecord/list',data); //质量检查记录  列表查询
 export const getSubcontractListApi = data=> post('xmgl/projectEnterprise/list',data); //质量检查记录  获取分包公司列表

src/router/index.js

@@ -1100,6 +1100,14 @@ const routes2 = [
             "@/views/projectFront/quality/inspectionLedger.vue",
           ], resolve),
       },
+      // {
+      //   path: "/project/quality/inspectionLedgerag", //质量管理  -- 检查记录
+      //   name: "质量管理_全部检查记录1",
+      //   component: (resolve) =>
+      //     require([
+      //       "@/views/projectFront/quality/inspectionLedgerag.vue",
+      //     ], resolve),
+      // },
       {
         path: "/project/quality/qualityProblem", //质量管理  -- 质量问题库配置
         name: "质量管理_质量问题库配置1",

src/views/projectFront/configManage/personnelAccess.vue

@@ -44,6 +44,22 @@
           <el-button type="primary" plain @click="query">{{
             $t("message.alarmWarning.query")
           }}</el-button>
+          <!--          筛选 -->
+          <!-- <el-dropdown>
+            <el-button type="primary">
+              筛选<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>黄金糕</el-dropdown-item>
+              <el-dropdown-item>狮子头</el-dropdown-item>
+              <el-dropdown-item>螺蛳粉</el-dropdown-item>
+              <el-dropdown-item>双皮奶</el-dropdown-item>
+              <el-dropdown-item>蚵仔煎</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown> -->
+          <!-- <el-button type="primary" info @click="filter">{{
+            $t("message.alarmWarning.query")
+          }}</el-button> -->
           <!--          //刷新-->
           <el-button type="warning" plain @click="refresh">{{
             $t("message.alarmValueSet.refresh")
@@ -52,6 +68,7 @@
           <el-button type="primary" @click="add">{{
             $t("message.videoManage.add")
           }}</el-button>
+          
         </el-form-item>
       </el-form>
     </div>
@@ -798,6 +815,15 @@ export default {
       console.log("查询的参数", this.queryInfo);
       this.getList();
     },
+    filter(){
+      console.log(this.queryInfo.enterpriseTypeId);
+      getProjectChilderSystemUserListApi({
+        projectSn: this.$store.state.projectSn,
+        enterpriseTypeId: this.queryInfo.enterpriseTypeId,
+      }).then((res) => {
+        console.log("筛选参数"+res);
+      });
+    },
     add() {
       this.handle("add", true);
       this.$nextTick(() => {

src/views/projectFront/devicePosition/dataPay/dataPay.vue

@@ -68,7 +68,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="less" scoped>
 
 .personManage {
   width: 100%;

src/views/projectFront/quality/businessModule/checkPoint.vue

@@ -25,6 +25,13 @@
         >
         </el-table-column>
         <el-table-column
+        align="center"
+
+          prop="regionCode"
+          :label="$t('message.quality.unit')"
+        >
+        </el-table-column>
+        <el-table-column
         align="center"
 
           prop="dutyName"
@@ -92,26 +99,53 @@
               :disabled="dialogType == 2"
             ></el-input>
           </el-form-item>
-          <el-form-item :label="$t('message.quality.rectificationPeople')">
+          <!-- 责任单位 start -->
+          <el-form-item :label="$t('message.quality.personWork')">
             <el-select
               v-model="form.dutyId"
               filterable
+              multiple 
               @change="changeDutyId"
               :placeholder="$t('message.quality.pleaseSelect')"
               style="width: 100%"
               prop="dutyId"
               clearable
+            >
+              <el-option
+                v-for="item in enterpriseInfoList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.id"
+              >
+                <span style="float: left">{{ item.enterpriseName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 责任单位 end -->
+          <!-- 责任人 start -->
+          <el-form-item :label="$t('message.quality.personLiable')">
+            <el-select
+              v-model="form.personId"
+              filterable
+              multiple
+              @change="changeDutyId"
+              :placeholder="$t('message.quality.pleaseSelect')"
+              style="width: 100%"
+              prop="personId"
+              clearable
             >
               <el-option
                 v-for="item in notifierOrPeopleList"
                 :key="item.userId"
-                :label="item.workerName"
+                :label="item.notifierOrPeopleList"
                 :value="item.userId"
               >
                 <span style="float: left">{{ item.realName }}</span>
               </el-option>
             </el-select>
           </el-form-item>
+          <!-- 责任人 end -->
+
           <!-- <el-form-item :label="$t('message.quality.notifier')">
             <el-select
               v-model="form.intendanceIds"
@@ -194,7 +228,7 @@ import {
   deleteQualityRegionListApi,
   editQualityRegionListApi
 } from '@/assets/js/api/quality.js'
-import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage.js'
+import { getProjectChilderSystemUserListApi,getEnterpriseInfoListApi } from '@/assets/js/api/configManage.js'
 export default {
   data() {
     return {
@@ -202,15 +236,18 @@ export default {
       dialogType: 1,
       projectSn: '',
       notifierOrPeopleList: [],
+      enterpriseInfoList:[],
       value: '',
       tableData: [],
       editDialog: false,
       form: {
         regionName: '',
         dutyId: '',
+        personId: [],
         intendanceIds: [],
         intendanceNames: '',
-        remark: ''
+        remark: '',
+        enterpriseName:''
       },
       showList: []
     }
@@ -226,7 +263,7 @@ export default {
         projectSn: this.projectSn
       }
       getQualityRegionListApi(data).then((res) => {
-        // console.log(res);
+        console.log(res);
         if (res.code == 200) {
           this.tableData = res.result
         }
@@ -240,7 +277,7 @@ export default {
         dutyId: '',
         intendanceIds: [],
         intendanceNames: '',
-        remark: ''
+        remark: '',
       }
       this.editDialog = true
       this.title ='新增区域'
@@ -294,10 +331,10 @@ export default {
         dutyId: '',
         intendanceIds: [],
         intendanceNames: '',
-        remark: ''
+        remark: '',
       }
       this.form.parentRegion = value.id
-      console.log(this.form)
+      // console.log(this.form)
       this.editDialog = true
       this.title = this.$t('message.quality.newJunior')
       this.dialogType = 3
@@ -307,15 +344,23 @@ export default {
     //获取 整改人 通知人下拉列表
     getNotifierOrPeopleList() {
       let data = {
-        projectSn: this.projectSn
+        projectSn: this.projectSn,
+        enterpriseId: this.enterpriseId
       }
       getProjectChilderSystemUserListApi(data).then((res) => {
-        // console.log(res);
+        console.log(res);
         if (res.code == 200) {
           console.log('------整改人', res)
+          console.log('------form', this.form)
           this.notifierOrPeopleList = res.result
         }
       })
+      getEnterpriseInfoListApi({projectSn: this.projectSn}).then(res=>{
+        console.log(res);
+        if(res.code==200){
+          this.enterpriseInfoList = res.result
+        }
+      })
     },
     //弹窗---保存按钮
     submit(formName) {

src/views/projectFront/quality/inspectionLedger.vue

@@ -490,7 +490,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item
+              <!-- <el-form-item
                 label="分部工程"
                 prop="subsectionId"
                 :disabled="type == 'detail'"
@@ -542,7 +542,7 @@
                   "
                 >
                 </el-input>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="事件描述" prop="addedDescription">
                 <el-input
                   :disabled="type == 'detail'"
@@ -1757,7 +1757,7 @@
                 <el-col :span="12" v-show="detailData.recordType == 1">
                   <div class="grid-content">
                     <span class="label" style="margin-left: -14px"
-                      >复查人：</span
+                      >复查人1：</span
                     >
                     <span class="value" style="margin-left: 25px">{{
                       detailData.reviewName

src/views/projectFront/vehiclePosition/realTimeMonitor.vue

@@ -1699,7 +1699,7 @@ export default {
 
 <!-- 组件自定义样式（需嵌套外层class） -->
 
-<style lang="scss" scoped>
+<style lang="less" scoped>
 .choice-item {
   /deep/ .el-checkbox {
     .el-checkbox__label {