bianpo rev-from-lcl

.env.development

 # 页面标题
-VUE_APP_TITLE = 建平盛德日新矿业有限公司边坡结构稳定性监测系统
+VUE_APP_TITLE = 边坡结构稳定性监测系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 建平盛德日新矿业有限公司边坡结构稳定性监测系统/开发环境
+# 边坡结构稳定性监测系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 #VUE_APP_BASE_API = '/prod-api'
 

.env.production

 # 页面标题
-VUE_APP_TITLE = 建平盛德日新矿业有限公司边坡结构稳定性监测系统
+VUE_APP_TITLE = 边坡结构稳定性监测系统
 
 # 生产环境配置
 ENV = 'production'

.env.staging

 # 页面标题
-VUE_APP_TITLE = 建平盛德日新矿业有限公司边坡结构稳定性监测系统
+VUE_APP_TITLE = 边坡结构稳定性监测系统
 
 NODE_ENV = production
 

README.en.md

-# 建平盛德日新矿业有限公司边坡结构稳定性监测系统
+# 边坡结构稳定性监测系统
 
 #### Description
 {**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}

package.json

@@ -79,7 +79,6 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
-    "html-webpack-plugin": "^5.5.3",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.13",

src/api/lclApi/lclapi.js

@@ -687,4 +687,12 @@ export function alarmRelieve(data) {
     method: 'put',
     data
   })
+}
+//  : 爆破震动
+export function blastingImage(params) {
+  return request({
+    url: '/slope/blasting/image',
+    method: 'get',
+    params
+  })
 }
\ No newline at end of file

src/layout/components/Navbar.vue

@@ -162,14 +162,6 @@ export default {
         .catch(() => {});
     },
     toBigscreen() {
-      console.log(
-        this.$router.resolve({
-          path: "/user",
-        }),
-        process,
-        "this.$router.resolve"
-      );
-
       // this.$router.push({ path: "/bigscreen" });
       // clearInterval(this.curTimer)
       var link = this.$router.resolve({

src/layout/components/Sidebar/Logo.vue

@@ -10,7 +10,7 @@
   >
     <transition name="sidebarLogoFade" class="logo-header">
       <router-link class="sidebar-logo-link logo-header" to="/">
-        <img :src="logo" class="sidebar-logo" />
+        <!-- <img :src="logo" class="sidebar-logo" /> -->
         <h1
           class="sidebar-title"
           :style="{
@@ -68,7 +68,7 @@ export default {
   },
   data() {
     return {
-      title: "建平盛德日新矿业有限公司边坡结构稳定性监测系统",
+      title: "边坡结构稳定性监测系统",
       logo: logoImg,
     };
   },

src/store/getters.js

@@ -15,6 +15,8 @@ const getters = {
   topbarRouters: state => state.permission.topbarRouters,
   defaultRoutes: state => state.permission.defaultRoutes,
   sidebarRouters: state => state.permission.sidebarRouters,
-  appPicApi: res => 'http://192.168.3.37:40251',
+  appPicApi: res => 'http://60.212.188.152:12100',
+  // exportModel: res => 'http://60.212.188.152:12100',
+  // appPicApi: res => 'http://192.168.3.37:40251',
 }
 export default getters

src/views/baopo/baopoDataWatch/index.vue

@@ -57,31 +57,28 @@
               height: '20px',
             }"
             :row-style="{ height: '20px' }"
+            @row-click="rowClick"
           >
             <el-table-column
               align="center"
               prop="createTime"
-              label="监测时间"
+              label="爆破时间"
             />
             <el-table-column align="center" prop="monNumber" label="监测编号">
             </el-table-column>
             <el-table-column align="center" prop="pointName" label="监测点位">
             </el-table-column>
-             <el-table-column align="center" prop="monValueX" label="震动速度-X(cm/s)"></el-table-column>
-            <el-table-column align="center" prop="monValueY" label="震动速度-Y(cm/s)"></el-table-column>
-            <el-table-column align="center" prop="monValueZ" label="震动速度-Z(cm/s)"></el-table-column>
-            <el-table-column align="center" prop="monValue" label="合成速度(cm/s)"></el-table-column>
-            <!-- <el-table-column
+            <el-table-column
               align="center"
               prop="monValue"
               label="震动幅度(cm/s)"
             >
-            </el-table-column> -->
-            <!-- <el-table-column
+            </el-table-column>
+            <el-table-column
               align="center"
               prop="monFrequency"
               label="震动主频(Hz)"
-            > -->
+            >
             </el-table-column>
           </el-table>
         </div>
@@ -103,10 +100,11 @@
 // import { defineComponent } from "@vue/composition-api";
 import ChartsForLine from "@/components/lclEcharts/ChartsForLine";
 import { getSevenTime } from "@/components/lclEcharts/time";
-import { blastinghistory, imageList } from "@/api/lclApi/lclapi";
+import { blastinghistory, imageList, blastingImage } from "@/api/lclApi/lclapi";
 export default {
   data() {
     return {
+      rowId: 1,
       baopoTableData: [
         {
           createTime: "2023-03-11 19:06:20",
@@ -123,6 +121,7 @@ export default {
       ],
       AllChartData: {
         name: "1#爆破振动传感器",
+        xDataShow: "1",
         chartId: `baopo`,
         color: ["#f7af0b", "#05f57a", "#f40852"],
         chartType: "line",
@@ -139,7 +138,7 @@ export default {
         },
         showlegend: false,
         legendItem: ["1#爆破振动传感器"],
-        xAxisData: ["q", "p"],
+        xAxisData: null,
         yData: [],
       },
       allYDataForEchart: [],
@@ -148,8 +147,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 99999,
-        startTime: "2023-09-28",
-        endTime: "2023-11-28",
+        startTime: "2022-01-17",
+        endTime: "2023-03-17",
       },
       dataVal: "",
       appPicApi: "",
@@ -162,7 +161,7 @@ export default {
   created() {},
   mounted() {
     this.$nextTick(() => {
-     
+      this.getchart();
       let getTime = getSevenTime(7);
       this.queryParams.startTime = getTime[0];
       this.queryParams.endTime = getTime[getTime.length - 1];
@@ -170,24 +169,29 @@ export default {
       imageList({ monType: 9 }).then((res) => {
         this.picUrl = res.rows[0].image;
       });
-       this.getchart();
     });
   },
   methods: {
+    rowClick(row) {
+      let that = this;
+
+      let id = row.id || that.rowId;
+      blastingImage({ id, pageNum: 1, pageSize: 999 }).then((res) => {
+        that.AllChartData.yData = [res.rows.map((item) => item.blastingValue)];
+      });
+    },
     getchart() {
       let that = this;
       blastinghistory(this.queryParams)
         .then((res) => {
           if (res && res.code === 200 && res.rows) {
             that.baopoTableData = res.rows;
-            that.AllChartData.xAxisData = res.rows.map(
-              (item) => item.createTime
-            );
-            that.AllChartData.yData = [res.rows.map((item) => item.monValue)];
-            console.log(that.AllChartData);
+            that.rowId = that.baopoTableData[0].id;
           }
         })
-        .then(() => {});
+        .then(() => {
+          this.rowClick({ id: that.baopoTableData[0].id });
+        });
     },
     gettime() {
       var date = new Date();
@@ -265,8 +269,7 @@ export default {
       }
     }
     .watch-right {
-      // width: 55%;
-      width: 80%;
+      width: 55%;
       padding: 10px;
       float: left;
       .lcl-title {

src/views/bigScreen/index.vue

@@ -433,7 +433,7 @@ Highcharts3D(Highcharts);
 export default {
   data() {
     return {
-      screenTitle: "建平盛德日新矿业有限公司边坡结构稳定性监测系统",
+      screenTitle: "边坡结构稳定性监测系统",
       nowDate: "2023-01-01",
       nowTime: "23:59:59",
       jxlEquipno: 19,
@@ -800,7 +800,7 @@ export default {
         a: "getcode",
         id: 48,
         icon: 1,
-        py: "jianping"// "weihai", // 建平
+        py: "weihai",
       }).then((res) => {
         var body = document.createElement("div");
         var weather = this.$el.querySelector("#weather1");
@@ -1982,11 +1982,13 @@ window.onload = function () {
       .mid-top {
         flex: 0.12;
         border: none;
+        width: 100%;
       }
 
       .mid-fir {
         flex: 2.94;
         margin-top: 0;
+        width: 100%;
         .nothing {
           height: 0.32rem;
           width: 100%;
@@ -2011,6 +2013,7 @@ window.onload = function () {
         justify-content: space-between;
         align-items: stretch;
         border: none;
+        width: 100%;
         .section-content {
           border: 1px solid #0085c0;
           .card-content {

src/views/bmwy/bmwyAlarm/index.vue

@@ -57,9 +57,9 @@
             align="center"
             prop="alarmMonNumber"
           />
-          <el-table-column label="x(mm)" align="center" prop="alarmValueA" />
-          <el-table-column label="y(mm)" align="center" prop="alarmValueB" />
-          <el-table-column label="z(mm)" align="center" prop="alarmValueC" />
+          <el-table-column label="监测值-a" align="center" prop="alarmValueA" />
+          <el-table-column label="监测值-b" align="center" prop="alarmValueB" />
+          <el-table-column label="监测值-c" align="center" prop="alarmValueC" />
           <el-table-column
             label="报警时间"
             align="center"

src/views/index.vue

@@ -3,7 +3,8 @@
     <div class="home-right">
       <div class="home-right-top">
         <p class="title">边坡介绍</p>
-        <p class="cont">边坡名称：威海晶合边坡结构系统</p>
+        <!-- <p class="cont">边坡名称：威海晶合边坡结构系统</p> -->
+        <p class="cont">边坡名称：边坡结构系统</p>
         <p class="cont">边坡工程安全等级：高级</p>
         <p class="cont">边坡危害等级：低级</p>
         <p class="cont">边皮设计稳定系数：高</p>

src/views/jyl/index.vue

@@ -226,7 +226,7 @@ export default {
         },
       ],
       alarmData: [],
-      city_weather: "jianping", // 建平县
+      city_weather: "qingdao",
       weatherList: [
         {
           day: "今天",

src/views/login.vue

 <template>
   <div class="login" :style="'background-image:url(' + Background + ');'">
     <div class="headder">
-      <h2>建平盛德日新矿业有限公司边坡结构稳定性监测系统</h2>
+      <h2>边坡结构稳定性监测系统</h2>
       <!-- <h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4> -->
     </div>
     <div class="logo-place">
@@ -86,11 +86,11 @@
     </div>
 
     <!--  底部  -->
-    <div class="el-login-footer">
+    <!-- <div class="el-login-footer">
       <span style="color: #eee; margin-top: 10px"
         >技术支持：威海晶合数字矿山技术有限公司</span
       >
-    </div>
+    </div> -->
   </div>
 </template>
 

src/views/nbwy/nbwyAlarm/index.vue

@@ -59,7 +59,7 @@
           />
           <el-table-column label="监测值-a" align="center" prop="alarmValueA" />
           <el-table-column label="监测值-b" align="center" prop="alarmValueB" />
-          <el-table-column label="位移值(mm)" align="center" prop="alarmValueC" />
+          <el-table-column label="监测值-c" align="center" prop="alarmValueC" />
           <el-table-column
             label="报警时间"
             align="center"

src/views/register.vue

@@ -6,7 +6,7 @@
       :rules="registerRules"
       class="register-form"
     >
-      <h3 class="title">建平盛德日新矿业有限公司边坡结构稳定性监测系统</h3>
+      <h3 class="title">边坡结构稳定性监测系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="registerForm.username"

src/views/rgxj/calibration/index.vue

 <template>
   <div class="name">
-    <el-card class="mt10 box-card">
+    <el-card class="mt10 box-card" v-if="checkRole(['admin', 'addreporter'])">
       <div class="lcl-title">设备校准</div>
       <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
         >新增</el-button
@@ -168,7 +168,9 @@
             type="primary"
             size="medium"
             @click="checkDia"
-            v-if="checkStatus && form.status == 0"
+            v-if="
+              checkStatus && form.status == 0 && checkRole(['admin', 'checker'])
+            "
             >审核</el-button
           >
           <el-form label-width="80px" style="overflow: hidden">
@@ -240,7 +242,7 @@
             <el-button
               type="primary"
               @click="submitForm"
-              v-if="form.status == 0"
+              v-if="form.status == 0 && checkRole(['admin', 'addreporter'])"
               >提 交</el-button
             >
           </div>
@@ -260,6 +262,7 @@ import {
   calibrationDel,
 } from "@/api/lclApi/lclapi";
 import { getDicts } from "@/api/system/dict/data";
+import { checkPermi, checkRole } from "@/utils/permission";
 export default {
   name: "name",
   components: {},
@@ -317,6 +320,8 @@ export default {
     });
   },
   methods: {
+    checkPermi,
+    checkRole,
     formreset() {
       this.form = {
         id: null,

src/views/rgxj/record/index.vue

 <template>
   <div class="name">
-    <el-card class="mt10 box-card">
+    <el-card class="mt10 box-card" v-if="checkRole(['admin', 'addreporter'])">
       <div class="lcl-title">巡检记录</div>
       <el-button type="primary" icon="el-icon-plus" @click="addRecord"
         >新增</el-button
@@ -85,7 +85,7 @@
           <el-form
             :model="reportForm"
             ref="reportForm"
-            label-width="6.25rem"
+            label-width="100px"
             class="demo-dynamic"
           >
             <el-form-item label="负责人" prop="insUser">

src/views/rgxj/watch/index.vue

@@ -2,7 +2,11 @@
   <div class="name">
     <el-card class="mt10 box-card">
       <div class="lcl-title">人工观测</div>
-      <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
+      <el-button
+        type="primary"
+        icon="el-icon-plus"
+        @click="handleAdd"
+        v-if="checkRole(['admin', 'addreporter'])"
         >新增</el-button
       >
       <div class="mt10" id=" radar-table">
@@ -41,7 +45,8 @@
           <el-table-column
             align="center"
             class-name="small-padding fixed-width"
-            label="历史数据"
+            label="操作"
+            v-if="checkRole(['admin', 'addreporter'])"
           >
             <template slot-scope="scope">
               <el-button
@@ -175,6 +180,7 @@ import {
   delObservation,
 } from "@/api/lclApi/lclapi";
 import ChartsForLine from "@/components/lclEcharts/ChartsForLine";
+import { checkPermi, checkRole } from "@/utils/permission";
 import * as echarts from "echarts";
 export default {
   name: "name",
@@ -246,6 +252,8 @@ export default {
     });
   },
   methods: {
+    checkPermi,
+    checkRole,
     formRest() {
       this.form = {
         id: null,

src/views/system/checkPlan/index.vue

@@ -371,12 +371,11 @@ export default {
 
     exportExcl() {
       exportModel().then((res) => {
-        console.log(`192.168.3.37:8035/excel/${res.msg}`);
         this.$modal
           .confirm("是否确认导出？")
           .then(function () {
             return window.open(
-              `http://192.168.3.37:8035/excel/${res.msg}`,
+              `${this.$store.getters.appPicApi}/excel/${res.msg}`,
               "_blank"
             );
           })

src/views/yujing/yujingAlarm/index.vue

@@ -46,10 +46,9 @@
             align="center"
             prop="alarmMonNumber"
           />
-          <!-- <el-table-column label="监测值-a" align="center" prop="alarmValueA" />
+          <el-table-column label="监测值-a" align="center" prop="alarmValueA" />
           <el-table-column label="监测值-b" align="center" prop="alarmValueB" />
-          <el-table-column label="监测值-c" align="center" prop="alarmValueC" /> -->
-          <el-table-column label="报警数据" align="center" prop="alarmValue" />
+          <el-table-column label="监测值-c" align="center" prop="alarmValueC" />
           <el-table-column
             label="报警时间"
             align="center"
@@ -144,10 +143,8 @@
 // import { defineComponent } from "@vue/composition-api";
 import { dataAlarm } from "@/api/lclApi/lclapi";
 export default {
-  dicts:["slope_alarm_level"],
   data() {
     return {
-
       // 查询参数
       queryParams: {
         pageNum: 1,

src/views/zhjgyl/Alarm/index.vue

@@ -57,7 +57,7 @@
             align="center"
             prop="alarmMonNumber"
           />
-          <el-table-column align="center" prop="monValue" label="监测值（KN）">
+          <el-table-column align="center" prop="monValue" label="监测值（mm）">
           </el-table-column>
           <el-table-column
             label="报警时间"

src/views/zhjgyl/Chart/index.vue

@@ -56,7 +56,7 @@
           </el-table-column>
           <el-table-column align="center" prop="pointName" label="监测点位">
           </el-table-column>
-          <el-table-column align="center" prop="monValue" label="监测值（KN）">
+          <el-table-column align="center" prop="monValue" label="监测值（mm）">
           </el-table-column>
           <el-table-column align="center" prop="monAlarmLevel" label="预警状态">
           </el-table-column>

src/views/zhjgyl/DataWatch/index.vue

@@ -32,7 +32,7 @@
             <el-table-column
               align="center"
               prop="monValue"
-              label="监测值（KN）"
+              label="监测值（mm）"
             >
             </el-table-column>
 

vue.config.js

@@ -7,8 +7,8 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-// const name = process.env.VUE_APP_TITLE || '建平盛德日新矿业有限公司边坡结构稳定性监测系统' // 网页标题
-const name = '建平盛德日新矿业有限公司边坡结构稳定性监测系统' // 网页标题 建平盛德日新矿业有限公司边坡结构稳定性监测系统
+// const name = process.env.VUE_APP_TITLE || '边坡结构稳定性监测系统' // 网页标题
+const name = '边坡结构稳定性监测系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 12100 // 端口
 
@@ -34,13 +34,11 @@ module.exports = {
     port: port,
     open: true,
     proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy 
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.3.180:8002`,
         // target: `http://192.168.3.37:9090`,
         target: `http://60.212.188.152:12000`,//服务器
-        // target: `http://192.168.3.188:9090`,//广建服务器-好用
-        // target: `http://192.168.3.188:9090`,//毕广建服务器
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''