Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

2024-06-27 16:37:04 +08:00 · 2024-06-27 16:37:04 +08:00 · f1128e959a
commit f1128e959a
parent 420bcfde8f 9b8e361ca0
9 changed files with 73 additions and 55 deletions
--- a/src/components/account.vue
+++ b/src/components/account.vue
@ -201,13 +201,16 @@
  </div>
 </template>
 <script>
+import {
+  getNewUserAllModulePageApi,
+} from "@/assets/js/api/jxjadmin.js";
 export default {
  data() {
    return {
      COMPANY: COMPANY,
      projectType: "",
      loginData: "",
-      dataCenter1: "",
+      dataCenter1: 0,
      seeEquipment: "",
      projectBackground: "项目后台",
      enterpriseBackground: "企业后台",
@ -233,6 +236,7 @@ export default {
    this.projectType = PROJECT_TYPE;
    this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
    this.seeEquipment = this.$store.state.userInfo.seeEquipment;
+    // this.getModuleList();
    console.log("seeEquipment------", this.seeEquipment);
    console.log(" this.loginData===================", this.loginData);
    if (this.loginData.headerConfiguration != "") {
@ -263,6 +267,16 @@ export default {
    // console.log('企业后台',this.enterpriseBackground)
  },
  methods: {
+    // 获取全部模块
+    getModuleList() {
+      let allModuleList = this.$store.state.userInfo.menuAuthority.moduleList;
+      for(let i = 0;i<allModuleList.length;i++){
+        if(allModuleList[i].modulePath == '/companyAdmin/docManage'){ // 筛选资料中心
+          this.dataCenter1 = 0;
+          break;
+        }
+      }
+    },
    // 修改密码
    updatePw() {
      this.$router.push({
--- a/src/store/index.js
+++ b/src/store/index.js
@ -55,7 +55,7 @@ export default new Vuex.Store({
        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
        // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
        // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
-        // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
+        // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
        // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
        // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
        // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
--- a/src/views/projectFront/entryCode/myHome.vue
+++ b/src/views/projectFront/entryCode/myHome.vue
@ -58,14 +58,14 @@
                  :style="{ 'color': fontColor, fontSize: backimgFontSize * 0.9 + 'px' }"
                >

-                  <p v-if="WorkerInfo.safeScore >= 90">无风险</p>
-                  <p v-if="WorkerInfo.safeScore >= 80 && WorkerInfo.safeScore < 90"><i
-                      v-if="WorkerInfo.safeScore < 90"
+                  <p v-if="WorkerInfo.safeScore >= 80">无风险</p>
+                  <p v-if="WorkerInfo.safeScore >= 60 && WorkerInfo.safeScore < 80"><i
+                      v-if="WorkerInfo.safeScore < 80"
                      class="el-icon-warning"
                      :style="{ 'color': fontColor }"
                    ></i>低风险</p>
-                  <p v-if="WorkerInfo.safeScore < 80"><i
-                      v-if="WorkerInfo.safeScore < 90"
+                  <p v-if="WorkerInfo.safeScore < 60"><i
+                      v-if="WorkerInfo.safeScore < 80"
                      class="el-icon-warning"
                      :style="{ 'color': fontColor }"
                    ></i>高风险</p>
@ -101,7 +101,7 @@

              <div
                class="text"
-                v-if="WorkerInfo.safeScore >= 90 && backimgwidth != 0"
+                v-if="WorkerInfo.safeScore >= 80 && backimgwidth != 0"
                :style="{ 'color': fontColor, paddingTop: backimgFontSize * 0.3 + 'px', height: backimgFontSize * 7 + 'px' }"
              >
                通过后台查询到，您无扣分风险
@ -109,7 +109,7 @@

              <div
                class="text2"
-                v-if="WorkerInfo.safeScore < 90 && backimgwidth != 0"
+                v-if="WorkerInfo.safeScore < 80 && backimgwidth != 0"
                :style="{ 'color': fontColor, paddingTop: backimgFontSize * 0.3 + 'px', paddingBottom: backimgFontSize * 0.3 + 'px', height: backimgFontSize * 7 + 'px', width: backimgFontSize * 13.35 + 'px' }"
              >
                <div
@ -134,25 +134,25 @@
              </div>
              <div
                class="foot"
-                v-if="WorkerInfo.safeScore >= 90"
+                v-if="WorkerInfo.safeScore >= 80"
                :style="{ 'color': fontColor, 'left': '40%', paddingTop: backimgFontSize * 0.4 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
              >
                可通行
              </div>
              <div
                class="foot"
-                v-if="WorkerInfo.safeScore >= 80 && WorkerInfo.safeScore < 90"
-                :style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
-              >
-                安全分已经低于90分
-              </div>
-              <div
-                class="foot"
-                v-if="WorkerInfo.safeScore < 80"
+                v-if="WorkerInfo.safeScore >= 60 && WorkerInfo.safeScore < 80"
                :style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
              >
                安全分已经低于80分
              </div>
+              <div
+                class="foot"
+                v-if="WorkerInfo.safeScore < 60"
+                :style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
+              >
+                安全分已经低于60分
+              </div>
            </div>
          </div>

@ -323,33 +323,33 @@ export default {
      this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}`;
    },
    setImg (fenshu) {
-      if (fenshu >= 90) {
+      if (fenshu >= 80) {
        this.srcImgUrl = this.imgUrl.img1;
-      } else if (fenshu >= 80 && fenshu < 90) {
+      } else if (fenshu >= 60 && fenshu < 80) {
        this.srcImgUrl = this.imgUrl.img2;
-      } else if (fenshu < 80) {
+      } else if (fenshu < 60) {
        this.srcImgUrl = this.imgUrl.img3;
      }
    },

    setColor (fenshu) {
-      if (fenshu >= 90) {
+      if (fenshu >= 80) {
        this.fontColor = "green";
-      } else if (fenshu >= 80 && fenshu < 90) {
+      } else if (fenshu >= 60 && fenshu < 80) {
        // this.fontColor = "rgb(255, 230, 0)";
        this.fontColor = "#D47300"
-      } else if (fenshu < 80) {
+      } else if (fenshu < 60) {
        // this.fontColor = "red";
        this.fontColor = "#EA3941"
      }
    },
    setCodeColor (fenshu) {
-      if (fenshu >= 90) {
+      if (fenshu >= 80) {
        this.codeColor = "green";
-      } else if (fenshu >= 80 && fenshu < 90) {
+      } else if (fenshu >= 60 && fenshu < 80) {
        // this.fontColor = "rgb(255, 230, 0)";
        this.codeColor = "#F7C409"
-      } else if (fenshu < 80) {
+      } else if (fenshu < 60) {
        // this.fontColor = "red";
        this.codeColor = "#F0212A"
      }
--- a/src/views/projectFront/laborManage/dataValidation.vue
+++ b/src/views/projectFront/laborManage/dataValidation.vue
@ -75,11 +75,11 @@
        :data="tableList"
        @selection-change="handleSelectionChange"
      >
+        <!-- :reserve-selection="true" -->
        <el-table-column
          align="center"
          type="selection"
          width="55"
-          :reserve-selection="true"
        >
        </el-table-column>
        <el-table-column
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@ -490,10 +490,10 @@
            row-key="id"
            :row-class-name="tableRowClassName"
          >
+            <!-- :reserve-selection="true" -->
            <el-table-column
              type="selection"
              width="55"
-              :reserve-selection="true"
              :selectable="selectEnable"
            ></el-table-column>
            <el-table-column prop="workerName">
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@ -452,10 +452,10 @@
            row-key="id"
            :row-class-name="tableRowClassName"
          >
+            <!-- :reserve-selection="true" -->
            <el-table-column
              type="selection"
              width="55"
-              :reserve-selection="true"
              :selectable="selectEnable"
            ></el-table-column>
            <el-table-column prop="workerName">
--- a/src/views/projectFront/laborManage/rosterNew.vue
+++ b/src/views/projectFront/laborManage/rosterNew.vue
@ -221,11 +221,11 @@
          :row-class-name="tableRowClassName"
          @selection-change="handleSelectionChange"
        >
+          <!-- :reserve-selection="true" -->
          <el-table-column
            align="center"
            type="selection"
            width="55"
-            :reserve-selection="true"
          >
          </el-table-column>
          <el-table-column prop="attendanceNumber">
--- a/src/views/projectFront/rainfallMonitor/alarmWarning.vue
+++ b/src/views/projectFront/rainfallMonitor/alarmWarning.vue
@ -53,7 +53,13 @@
    <div class="table_wrap whiteBlock">
      <vue-scroll style="height: 88%">
        <el-table class="tables" :data="List">
-          <!-- 报警名称 -->
+          <el-table-column
+            :label="$t('message.projectInfo.devName')"
+            prop="devName"
+            align="center"
+            width="150"
+          >
+          </el-table-column>
          <el-table-column
            prop="alarmContent"
            label="报警内容"
@ -172,26 +178,23 @@ export default {
      rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => {
        if (result.success) {
          this.deviceIdArr = result.result;
-          if (result.result.length > 0) {
-            this.queryInfo.deviceId = result.result[0].devSn;
-          }
-          console.log("get设备列表", this.deviceIdArr);
+          // if (result.result.length > 0) {
+          //   this.queryInfo.deviceId = result.result[0].devSn;
+          // }
+          // console.log("get设备列表", this.deviceIdArr);
        }
      });
    },
    getList() {
-      let timeObj = {
-        startTime: this.time ? this.time[0] : "",
-        endTime: this.time ? this.time[1] : "",
+      let data = {
+        devSn: this.queryInfo.deviceId,
+        projectSn: this.$store.state.projectSn,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        alarmTime_begin: this.time ? this.time[0] : "",
+        alarmTime_end: this.time ? this.time[1] : "",
      };
-      rainAlarmList(
-        Object.assign(
-          this.queryInfo,
-          this.pagInfo,
-          { projectSn: this.$store.state.projectSn },
-          timeObj
-        )
-      ).then((result) => {
+      rainAlarmList(data).then((result) => {
        if (result.success) {
          this.List = result.result.records;
          this.pagInfo.total = result.result.total;
--- a/src/views/projectFront/rainfallMonitor/relaTimeData.vue
+++ b/src/views/projectFront/rainfallMonitor/relaTimeData.vue
@ -29,6 +29,7 @@
          v-model="valueTime"
          type="daterange"
          range-separator="-"
+          value-format="yyyy-MM-dd"
          :start-placeholder="$t('message.projectInfo.start')"
          :end-placeholder="$t('message.projectInfo.end')"
        >
@ -145,7 +146,7 @@
            align="center"
            :label="$t('message.projectInfo.uploadDate')"
            width="200"
-            prop="updateDate"
+            prop="recordTime"
          >
          </el-table-column>
        </el-table>
@ -201,10 +202,10 @@ export default {
      rainDevList({ projectSn: this.$store.state.projectSn }).then((result) => {
        if (result.success) {
          this.devList = result.result;
-          if (result.result.length > 0) {
-            this.devSn = result.result[0].devSn;
-          }
-          console.log("get设备列表", this.devList);
+          // if (result.result.length > 0) {
+          //   this.devSn = result.result[0].devSn;
+          // }
+          // console.log("get设备列表", this.devList);
        }
      });
    },
@ -230,12 +231,12 @@ export default {
    },
    selectDustNoisePageList() {
      let data = {
-        deviceId: this.devSn,
+        devSn: this.devSn,
        projectSn: this.$store.state.projectSn,
        pageNo: this.pageNo,
        pageSize: this.pageSize,
-        startTime: this.valueTime ? this.valueTime[0] : "",
-        endTime: this.valueTime ? this.valueTime[1] : "",
+        recordTime_begin: this.valueTime ? this.valueTime[0] : "",
+        recordTime_end: this.valueTime ? this.valueTime[1] : "",
      };
      rainRecordPageApi(data).then((res) => {
        console.log(res);