文字修改

6 months ago · 23cbc8cc4e
parent 40ce866d26
commit 23cbc8cc4e
9 changed files with 39 additions and 45 deletions
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@ -106,11 +106,11 @@ export default {
          subs: [
            {
              path: "/I2config",
-              name: "I2配置",
+              name: "I2导出配置",
            },
            {
              path: "/datatransfer",
-              name: "下载录波文件",
+              name: "SFTP采集文件",
            },
          ],
        },
--- a/src/views/clientDownFile/downrecord/index.vue
+++ b/src/views/clientDownFile/downrecord/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="recordBoxdown">
    <div class="reportHead">
-      <h3>下载记录</h3>
+      <h3>采集记录</h3>
    </div>
    <div class="page-body">
      <div class="title">
--- a/src/views/clientDownFile/server/components/addserverDialog.vue
+++ b/src/views/clientDownFile/server/components/addserverDialog.vue
@ -53,13 +53,18 @@
                >预览路径</el-button
              >
              <el-input
+                placeholder="请输入"
                type="textarea"
                :autosize="{ minRows: 1, maxRows: 1 }"
                v-model="formInfo.path"
              ></el-input>
            </div>
          </el-form-item>
-          <el-form-item label="下载文件：" prop="suffix">
+          <el-form-item label="文件名包含：" prop="contain">
+            <el-input v-model="formInfo.contain" placeholder="请输入">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="文件名后缀：" prop="suffix">
            <el-select v-model="formInfo.suffix" placeholder="请选择">
              <el-option
                v-for="item in suffixOptions"
@ -186,7 +191,7 @@ export default {
    submitForm() {
      this.$refs.formInforef.validate((valid) => {
        if (valid) {
-          if (this.title == "新增客户端服务器") {
+          if (this.title == "采集文件配置") {
            console.log(this.formInfo);
            // const pathArray = this.formInfo.pathList
            //   .split("\n")
@ -195,7 +200,7 @@ export default {
            let params = {
              devId: this.formInfo.devId,
              iedId: this.formInfo.iedId,
-
+              contain: this.formInfo.contain,
              path: this.formInfo.path,
              active: this.formInfo.active,
              todel: this.formInfo.todel,
@ -238,6 +243,7 @@ export default {
              active: this.formInfo.active,
              todel: this.formInfo.todel,
              suffix: this.formInfo.suffix,
+              contain: this.formInfo.contain,
            };
            ieddlUpdateApi(params)
              .then((res) => {
@ -473,7 +479,7 @@ export default {
    }
    .ipclass {
      position: absolute;
-      font-size: 12px;
+      font-size: 14px;
      top: 36px;
      line-height: 14px;
    }
@ -484,6 +490,9 @@ export default {
      }
    }
    .filedInfo {
+      .el-form-item--small.el-form-item {
+        margin-bottom: 24px;
+      }
      .colListBox {
        overflow: auto;
        height: 400px;
--- a/src/views/clientDownFile/server/index.vue
+++ b/src/views/clientDownFile/server/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="ieddlServer">
    <div class="reportHead">
-      <h3>客户端服务器</h3>
+      <h3>采集文件配置</h3>
    </div>
    <div class="page-body">
      <el-button type="primary" icon="el-icon-plus" @click="handleAddClick"
@ -40,8 +40,8 @@
              <span>{{ scope.row.active == 1 ? "启用" : "停用" }}</span>
            </template>
          </el-table-column>
-          <el-table-column label="下载文件后缀" prop="suffix">
-          </el-table-column>
+          <el-table-column label="文件名包含" prop="contain"> </el-table-column>
+          <el-table-column label="文件名后缀" prop="suffix"> </el-table-column>
          <el-table-column label="操作" class-name="editClass">
            <template slot-scope="scope">
              <el-link
@ -93,9 +93,18 @@ export default {
      ieddlServerApi()
        .then((res) => {
          console.log(res);
-          this.serverData = res.data;
+          if (res.success) {
+            this.serverData = res.data;

-          this.filedLoading = false;
+            this.filedLoading = false;
+          } else {
+            this.$message({
+              duration: 1500,
+              showClose: true,
+              type: "error",
+              message: res.errorMsg,
+            });
+          }
        })
        .catch((err) => {
          console.log(err); //代码错误、请求失败捕获
@ -103,7 +112,7 @@ export default {
    },
    //新增
    handleAddClick() {
-      this.title = "新增客户端服务器";
+      this.title = "采集文件配置";
      this.$refs.serverAddRef.display();
    },
    handleEditClick(data) {
--- a/src/views/dataTransfer/downrecord/index.vue
+++ b/src/views/dataTransfer/downrecord/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="recordBoxdown">
    <div class="reportHead">
-      <h3>下载记录</h3>
+      <h3>采集记录</h3>
    </div>
    <div class="page-body">
      <div class="title">
--- a/src/views/dataTransfer/index.vue
+++ b/src/views/dataTransfer/index.vue
@ -2,7 +2,7 @@
  <div class="I2Box">
    <div class="equimentList">
      <div class="sideNav">
-        <h3><i class="el-icon-s-tools"></i>数据转移</h3>
+        <h3><i class="el-icon-s-tools"></i>SFTP采集文件</h3>
        <ul class="navList">
          <li v-for="(item, index) in navlist" :key="index">
            <router-link :to="item.path">
@ -30,12 +30,12 @@ export default {
      activeIndex: 0,
      navlist: [
        {
-          name: "远端服务器",
+          name: "SFTP服务器",
          path: "/dataTransfer/server",
        },

        {
-          name: "下载记录",
+          name: "采集记录",
          path: "/dataTransfer/downrecord",
        },
      ],
--- a/src/views/dataTransfer/server/components/addserverDialog.vue
+++ b/src/views/dataTransfer/server/components/addserverDialog.vue
@ -111,7 +111,7 @@ export default {
    submitForm() {
      this.$refs.formInforef.validate((valid) => {
        if (valid) {
-          if (this.title == "新增远端服务器") {
+          if (this.title == "新增SFTP服务器") {
            console.log(this.formInfo);
            const pathArray = this.formInfo.pathList
              .split("\n")
--- a/src/views/dataTransfer/server/index.vue
+++ b/src/views/dataTransfer/server/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="filedBoxServer">
    <div class="reportHead">
-      <h3>远端服务器</h3>
+      <h3>SFTP服务器</h3>
    </div>
    <div class="page-body">
      <el-button type="primary" icon="el-icon-plus" @click="handleAddClick"
@ -97,7 +97,7 @@ export default {
    },
    //新增
    handleAddClick() {
-      this.title = "新增远端服务器";
+      this.title = "新增SFTP服务器";
      this.$refs.serverAddRef.display();
    },
    handleEditClick(data) {
@ -108,7 +108,7 @@ export default {
    //删除数据
    handleDeleteClick(data) {
      console.log(data);
-      this.$confirm(`确定要删除${data.name}远端服务器记录吗?`, "提示", {
+      this.$confirm(`确定要删除${data.name}SFTP服务器记录吗?`, "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -69,30 +69,6 @@ export default {
      this.$refs.loginForm.validate((valid) => {
        if (valid) {
          console.log(this.userInfo);
-          // if (
-          //   (this.userInfo.userName == "admin" &&
-          //     this.userInfo.password == "shxy123456") ||
-          //   (this.userInfo.userName == "cacuser" &&
-          //     this.userInfo.password == "cac123456")
-          // ) {
-          //   localStorage.setItem("token", "13747c96ff9f434cb09ecf78e4b9a8bc");
-          //   this.$message({
-          //     duration: 1500,
-          //     showClose: true,
-          //     message: "登录成功",
-          //     type: "success",
-          //   });
-          //   this.$router.push("/");
-          //   return;
-          // } else {
-          //   this.$message({
-          //     duration: 1500,
-          //     showClose: true,
-          //     message: "账号密码错误，请重新输入！",
-          //     type: "warning",
-          //   });
-          //   return;
-          // }
          //注释
          userloginApi(this.userInfo)
            .then((res) => {