代码提交

pengwei

2025-05-15 b9260c7807d064f2b77ef9e92005a8c3257ec2e1

代码提交

 ÏîÄ¿´úÂë/ÉìËõ¸Ë.7z

Binary files differ

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/dist.7z

Binary files differ

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/api/newapi/Parameters.js

@@ -1,7 +1,9 @@
import http from "../http";

export const AddData = (data) => http.post("/api/Parameters/AddData", data);
export const AddData = (data) => http.post("/api/Parameters/AddSpeed", data);
//自动伸出缩回
export const AutoPickAndDrop = (data) => http.post(`/api/Parameters/automation?ExtendedState=${data.ExtendedState}`);
//手动伸出缩回
export const ManualOperation = (data) => http.post(`/api/Parameters/ManualOperation?position=${data.position}&ExtendedState=${data.ExtendedState}`);
export const ManualOperation = (data) => http.post(`/api/Parameters/ManualOperation?position=${data.position}&ExtendedState=${data.ExtendedState}`);
//获取参数
export const GetParameter = (data) => http.post(`/api/Parameters/BackfillSpeed`);

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/utils/index.js

@@ -1,9 +1,9 @@
import { dayjs } from "element-plus";
// import XLSX from "xlsx"; //导入xlsx

export const baseUrl = "http://192.168.0.80:1598"
export const baseUrl = "http://192.168.2.103:9093"
// http://192.168.0.80:1598
// http://115.159.85.185:9098/
// http://192.168.2.103:9093


//对象转FormData生成方法

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/views/system/UserInfo.vue

@@ -11,12 +11,12 @@
        >
          <el-image
            style="width: 100px; height: 100px"
            :src="'http://192.168.0.80:1598' + userInfo.headImageUrl"
            :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
            :fit="fit"
          />
          <!-- <img
            v-if="userInfo.headImageUrl"
            :src="'http://192.168.0.80:5000' + userInfo.headImageUrl"
            :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
            class="avatar"
          />
          <el-icon v-else class="avatar-uploader-icon">
@@ -163,7 +163,7 @@
            ref="upload"
            name="fileInput"
            class="avatar-uploader"
            action="http://192.168.0.80:1598/api/User/SaveFiles"
            action="http://192.168.2.103:9093/api/User/SaveFiles"
            list-type="picture-card"
            :auto-upload="true"
            limit="1"

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/views/tts/AlarmReset/AlarmReset.vue

@@ -72,7 +72,7 @@
  clearInterval(timer.value);
  // åˆ›å»ºWebSocket连接
  //"ws://127.0.0.1:9295/admin"
  client.value = new WebSocket("ws://192.168.0.80:5173/");
  client.value = new WebSocket("ws://192.168.2.103:5173/");
  client.value.onopen = function () {
    console.log("WebSocket è¿žæŽ¥æˆåŠŸ");
  };

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/views/tts/DataLogging/Datalogging.vue

@@ -106,7 +106,7 @@
            <template #default="scope">
              <el-image
                style="width: 5rem; height: 5rem"
                :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
                :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
                show-progress
                :initial-index="4"
                fit="cover"
@@ -150,7 +150,7 @@
            <template #default="scope">
              <el-image
                style="width: 5rem; height: 5rem"
                :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
                :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
                show-progress
                :initial-index="4"
                fit="cover"
@@ -199,7 +199,7 @@
            <template #default="scope">
              <el-image
                style="width: 5rem; height: 5rem"
                :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
                :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
                show-progress
                :initial-index="4"
                fit="cover"

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/views/tts/Maintenancemanagement/Maintenancemanagement.vue

@@ -79,7 +79,7 @@
              <template #default="scope">
                <el-image
                  style="width: 5rem; height: 5rem"
                  :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
                  :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
                  :fit="fit"
                />
              </template>
@@ -217,7 +217,7 @@
              <template #default="scope">
                <el-image
                  style="width: 5rem; height: 5rem"
                  :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
                  :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
                  :fit="fit"
                />
              </template>

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/views/tts/Parametersettings/Parametersettings.vue

@@ -19,7 +19,7 @@
        <el-form-item prop="extendSpeed">
          <template #label>
            <span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
              >自动伸出速度m/min：</span
              >å·¦PLC自动伸出缩回速度m/min：</span
            >
          </template>
          <el-input
@@ -31,7 +31,7 @@
        <el-form-item prop="retractionSpeed">
          <template #label>
            <span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
              >自动缩回速度m/min：</span
              >右PLC自动伸出缩回速度m/min：</span
            >
          </template>
          <el-input
@@ -43,7 +43,7 @@
        <el-form-item prop="manualExtend">
          <template #label>
            <span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
              >手动伸出速度m/min：</span
              >å·¦PLC手动伸出缩回速度m/min：</span
            >
          </template>
          <el-input
@@ -55,7 +55,7 @@
        <el-form-item prop="manualRetraction">
          <template #label>
            <span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
              >手动缩回速度m/min：</span
              >右PLC手动伸出缩回速度m/min：</span
            >
          </template>
          <el-input
@@ -179,9 +179,9 @@
  </div>
</template>
<script setup>
import { ref } from "vue";
import { onMounted, ref } from "vue";
import { ElMessage } from "element-plus";
import { AddData } from "@/api/newapi/Parameters";
import { AddData, GetParameter } from "@/api/newapi/Parameters";
const userInfo = JSON.parse(localStorage.getItem("user"));
const ruleForm = ref({
  creater: "string",
@@ -194,6 +194,7 @@
  manualExtend: 0,
  manualRetraction: 0,
  depid: userInfo.depid,
  account: userInfo.userName,
});

//保存
@@ -204,6 +205,23 @@
    }
  });
};
//获取参数
const getParameter = () => {
  GetParameter().then((res) => {
    if (res.code == 0) {
      ruleForm.value.extendSpeed = res.data == null ? 0 : res.data.extendSpeed;
      ruleForm.value.retractionSpeed =
        res.data == null ? 0 : res.data.retractionSpeed;
      ruleForm.value.manualExtend =
        res.data == null ? 0 : res.data.manualExtend;
      ruleForm.value.manualRetraction =
        res.data == null ? 0 : res.data.manualRetraction;
    }
  });
};
onMounted(() => {
  getParameter();
});
</script>
<style lang="scss" scoped>
.Parametersettings {

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/views/tts/PickAndDrop/Manualcontrol.vue

@@ -412,12 +412,12 @@
    });
    if (res.code === 0) {
      ElMessage({
        message: `${position}侧${ExtendedState}成功`,
        message: `${position}侧${ExtendedState}成功，${position}PLC手动${ExtendedState}速度为${res.data.manualExtend}`,
        type: "success",
      });
    } else {
      ElMessage({
        message: `${position}侧${ExtendedState}失败`,
        message: `${position}侧${ExtendedState}失败，${position}PLC手动${ExtendedState}速度为${res.data.manualExtend}`,
        type: "error",
      });
    }

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/src/views/tts/UserManagement/Usermanagement.vue

@@ -162,7 +162,7 @@
            min-width="3%"
          />
          <el-table-column
            prop="role_Id"
            prop="userteam"
            label="用户分组"
            align="center"
            min-width="2%"
@@ -182,7 +182,7 @@
            <template #default="scope">
              <el-image
                style="width: 5rem; height: 5rem"
                :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
                :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
                show-progress
                :initial-index="4"
                fit="cover"
@@ -508,7 +508,7 @@
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >部门</span
                    >轨道站</span
                  >
                </div>
              </template>
@@ -526,6 +526,44 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item prop="dept_Id">
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >组</span
                  >
                </div>
              </template>
              <el-input
                size="small"
                v-model="formUser.userteam"
                placeholder="请输入"
              />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item prop="dept_Id">
              <template #label>
                <div style="display: flex; align-items: flex-end">
                  <span style="color: red; margin-right: 0.2rem">*</span>
                  <span
                    style="font-size: 0.88rem; color: black; font-weight: bold"
                    >卡号</span
                  >
                </div>
              </template>
              <el-input
                size="small"
                v-model="formUser.carnuber"
                placeholder="请输入"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item>
              <template #label>
@@ -549,7 +587,7 @@
                ref="uploadRef"
                name="files"
                class="avatar-uploader"
                action="http://192.168.0.80:1598/api/User/SaveFiles"
                action="http://192.168.2.103:9093/api/User/SaveFiles"
                list-type="picture-card"
                limit="1"
                :auto-upload="true"
@@ -866,6 +904,8 @@
  path: "",
  usertruename: "",
  dept_Id: 1,
  carnuber: null,
  userteam: "",
});
const rules = reactive({
  userName: {
@@ -898,6 +938,16 @@
  userTrueName: {
    required: true,
    message: "请输入真实姓名",
    trigger: "blur",
  },
  userteam: {
    required: true,
    message: "请输入组",
    trigger: "blur",
  },
  carnuber: {
    required: true,
    message: "请输入卡号",
    trigger: "blur",
  },
});
@@ -1093,6 +1143,8 @@
    enable: 1,
    path: "",
    user_Id: undefined,
    userteam: "",
    carnuber: null,
  };
  fileList.value = [];
};
@@ -1180,6 +1232,8 @@
    enable: val.enable,
    path: val.headImageUrl,
    usertruename: val.userTrueName,
    cardNumber: val.cardNumber,
    userteam: val.userteam,
  };
  UpdateUser(data).then((res) => {
    ElMessage({ message: "修改成功", type: "success" });
@@ -1209,15 +1263,18 @@
    enable: val.enable,
    path: val.headImageUrl,
    usertruename: val.userTrueName,
    carnuber: val.cardNumber,
    userteam: val.userteam,
    dept_Id: val.dept_Id,
  };
  formUser.value = {
    ...obj,
  };
  if (obj.headImageUrl != "") {
  if (obj.headImageUrl != null) {
    fileList.value = [
      {
        name: "1",
        url: "http://115.159.85.185:9098" + obj.headImageUrl,
        url: "http://192.168.2.103:9093" + obj.headImageUrl,
      },
    ];
  }
@@ -1230,21 +1287,17 @@
  let obj = Object.assign({}, val);
  formUser.value = obj;
  formpassword.value = val;
  newobj.value = Object.assign({}, val);
  console.log(newobj.value);

  dialogVisible1.value = true;
};
//保存修改密码
const savePassword = async (formEl) => {
  let obj = Object.assign({}, newobj);
  // obj.password = formpassword.value.password;
  console.log(formUser.value);

  let formdata = {
    id: formUser.value.user_Id,
    oldPwd: formUser.value.userPwd,
    newPwd: formUser.value.newPwd,
    newPwd: newobj.value.newPwd,
  };
  if (!formEl) return;
  await formEl.validate((valid, fields) => {

 ÏîÄ¿´úÂë/ÉìËõ¸Ë/client/vite.config.js

@@ -34,7 +34,7 @@
  server: {
    proxy: {
      '/api': {
        target: 'http://115.159.85.185:9098/', // ç›®æ ‡æŽ¥å£çš„域名
        target: 'http://192.168.2.103:9093', // ç›®æ ‡æŽ¥å£çš„域名
        changeOrigin: true, // æ˜¯å¦è·¨åŸŸ
        rewrite: (path) => path.replace(/^\/api/, '') // è·¯å¾„重写
      }

 ÏîÄ¿´úÂë/¿ÉÊÓ»¯´óÆÁ.7z

Binary files differ

 ÏîÄ¿´úÂë/¿ÉÊÓ»¯´óÆÁ/client/dist.7z

Binary files differ

 ÏîÄ¿´úÂë/¿ÉÊÓ»¯´óÆÁ/client/src/api/http.js

@@ -145,6 +145,7 @@
              ? err.data.message
              : "服务器处理异常"
          );

        }
      )
      .catch((error) => {

 ÏîÄ¿´úÂë/¿ÉÊÓ»¯´óÆÁ/client/src/utils/index.js

@@ -1,9 +1,9 @@
import { dayjs } from "element-plus";
// import XLSX from "xlsx"; //导入xlsx

export const baseUrl = "http://192.168.0.80:1598"
export const baseUrl = "http://192.168.2.103:9093"
// http://192.168.0.80:1598
// http://115.159.85.185:9098/
// http://192.168.2.103:9093


//对象转FormData生成方法

 ÏîÄ¿´úÂë/¿ÉÊÓ»¯´óÆÁ/client/src/views/Index.vue

@@ -61,7 +61,7 @@
        align-items: center;
        margin-top: 6%;
        padding-bottom: 10%;
        height: 70%;
        height: 60%;
        box-sizing: border-box;
        border-radius: 2rem;
        background-color: rgba(39, 136, 214, 0.5);
@@ -85,7 +85,6 @@
              height: 5rem;
              font-size: 6rem;
              font-weight: bold;

              display: flex;
              align-items: center;
              padding-left: 2rem;
@@ -170,7 +169,7 @@
            empty-text="暂无数据"
            :data="tableData"
            style="width: 100%"
            height="750"
            height="400"
            :header-cell-style="{
              height: '1.61rem',
              color: '#fff',
@@ -278,6 +277,7 @@
    pageSize: pageQuery.value.rows,
    searchKeyword: queryForm.value.inputcontent,
    status: queryForm.value.selectType,
    account: "admin",
  }).then((res) => {
    tableData.value = res.data.items;
    pageTotal.value = res.data.totalCount;
@@ -293,11 +293,11 @@
  initData();
  //获取当前时间
  const date = new Date();
  await UpstreamInspectionRoad();
  timer.value = setInterval(() => {
    currentTime.value = formatTime(date, "yyyy-MM-dd hh:mm:ss");
    date.setSeconds(date.getSeconds() + 1);
  }, 1000);
  // await UpstreamInspectionRoad();
});
onUnmounted(() => {
  clearInterval(timer.value);

 ÏîÄ¿´úÂë/¿ÉÊÓ»¯´óÆÁ/client/src/views/system/UserInfo.vue

@@ -11,12 +11,12 @@
        >
          <el-image
            style="width: 100px; height: 100px"
            :src="'http://192.168.0.80:1598' + userInfo.headImageUrl"
            :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
            :fit="fit"
          />
          <!-- <img
            v-if="userInfo.headImageUrl"
            :src="'http://192.168.0.80:5000' + userInfo.headImageUrl"
            :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
            class="avatar"
          />
          <el-icon v-else class="avatar-uploader-icon">
@@ -163,7 +163,7 @@
            ref="upload"
            name="fileInput"
            class="avatar-uploader"
            action="http://192.168.0.80:1598/api/User/SaveFiles"
            action="http://192.168.2.103:9093/api/User/SaveFiles"
            list-type="picture-card"
            :auto-upload="true"
            limit="1"

 ÏîÄ¿´úÂë/¿ÉÊÓ»¯´óÆÁ/client/vite.config.js

@@ -34,7 +34,7 @@
  server: {
    proxy: {
      '/api': {
        target: 'http://115.159.85.185:9098/', // ç›®æ ‡æŽ¥å£çš„域名
        target: 'http://192.168.2.103:9093/', // ç›®æ ‡æŽ¥å£çš„域名
        changeOrigin: true, // æ˜¯å¦è·¨åŸŸ
        rewrite: (path) => path.replace(/^\/api/, '') // è·¯å¾„重写
      }