Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

1 year ago · 28d72824dd
5 changed files with 87 additions and 42 deletions
--- a/ruoyi-ui/.gitignore
+++ b/ruoyi-ui/.gitignore
@ -23,3 +23,4 @@ vue.config.js
 package-lock.json
 yarn.lock
 /.history
+/*.zip
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue
@ -1,7 +1,7 @@
 <template>
  <Dialog v-model="modelVisible" :title="data ? '修改' : '新增'">
    <div class='AddNEditDialog'>
-      <Form :value="formData" class="form" ref="FormConfigRef" :formList="formList" column="1" labelWidth="120px" />
+      <Form :value="formData" class="form" ref="FormConfigRef" :formList="formList" column="1" labelWidth="80px" />
    </div>

    <template #footer>
@ -73,7 +73,7 @@ export default {
  methods: {
    checkRepeat(word){
      let temp = _.find(this.dataAll, { word: word });
-      if (temp && Object.keys(temp).length>0) {
+      if (temp && Object.keys(temp).length>0 && !(this.data && this.data.id==temp.id)) {
        this.$message.error("该关键词已存在。");
        return false
      } else {
@ -84,14 +84,14 @@ export default {
      this.$refs.FormConfigRef.validate()
        .then((data) => {
          data.word = data.word.trim();
-          
-          if(!this.checkRepeat(data.word)){
-            return ;
-          }

          this.submitting = true;
          if (this.data) data.id = this.data.id;

+          if (!this.checkRepeat(data.word)) {
+            return;
+          }
+
          request({
            url: `/business/dcInfoBoardVocabulary`,
            method: this.data ? 'PUT' : 'POST',
@ -101,7 +101,7 @@ export default {
              if (result.code != 200) return Message.error(`提交失败!`);

              Message.success(`提交成功!`);
-              this.$emit("afterSubmit");
+              this.$emit("onSuccess");

              this.modelVisible = false;

--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/data.js
@ -13,5 +13,12 @@ export const addEditFormList = [
    label: "关键词:",
    key: "word",
    required: true,
+    options: {
+      type: "textarea",
+      autosize: true,
+      // maxlength: 50,
+      autosize: { minRows: 1, maxRows: 20 },
+      showWordLimit: true,
+    }
  }
 ];
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
@ -1,5 +1,6 @@
 <template>
  <div class='sensitiveWord'>
+
    <div class="filter">
      <div>
        <ButtonGradient @click.native="handleAddEdit(true)">
@ -22,35 +23,42 @@
        </ButtonGradient>
      </div>

-      <InputSearch style="width: 402px;" :formList="searchFormList" :formConfigOptions="{ labelWidth: '90px' }"
-        @handleSearch="handleSearch" />
+      <InputSearch style="width: 402px;" :formList="searchFormList" :formConfigOptions="{ labelWidth: '90px' }" :placeholder="searchText" @handleSearch="handleSearch" />
    </div>


-    <div class="body">
+    <div class="body" :style="{'overflow-y': (data.length && data.length>42) ? 'scroll':'auto' }">
      <Empty v-if="!data.length && !isFirst" class="no-data" style="position: absolute">暂无数据</Empty>
      <template v-else>
-        <div class="cardBox" v-for="(item, index) in data" :key="index">
+        <div class="cardBox" v-for="(item, index) in data" :key="index" style="overflow: hidden; height: 145px;">
          <Card :buttonIcon="null" :keyMap="keyMap" :cardData="item" class="card"
-          buttonText="详情">
-          <template #form-word="{ data }">
-            <div class="keyword">
-              {{ data.word }}
-            </div>
-          </template>
-          <template #button>
-            <Button @click.native="() => handleAddEdit(true, item)">
-              修改
-            </Button>
-            <Button style="background-color: #FF5F5F;" @click.native="handleDelete(item)">
-              删除
-            </Button>
-          </template>
-        </Card>
-      </div>
+            buttonText="详情">
+            <template #form-word="{ data }">
+              <div class="keyword">
+                {{ data.word }}
+              </div>
+            </template>
+            <template #button>
+              <Button @click.native="() => handleAddEdit(true, item)">
+                修改
+              </Button>
+              <Button style="background-color: #FF5F5F;" @click.native="handleDelete(item)">
+                删除
+              </Button>
+            </template>
+          </Card>
+        </div>
      </template>
    </div>
-    <AddNEditDialog v-model="isShowDialog" :data="dialogData" @onSuccess = "getData" :dataAll="data"/>;
+
+
+    <!-- 分页 -->
+    <div class="footer" v-if="numTotal>0">
+      <Pagination :total="numTotal" :current-page.sync="currentPage" :page-size="pageSize" layout="prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+    </div>
+
+    <AddNEditDialog v-model="isShowDialog" :data="dialogData" @onSuccess = "getData" :dataAll="data"/>
  </div>
 </template>

@ -60,6 +68,7 @@ import AddNEditDialog from "./components/AddNEditDialog.vue"
 import InputSearch from '@screen/components/InputSearch/index.vue';
 import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
 import Button from '@screen/components/Buttons/Button.vue';
+import Pagination from '@screen/components/Pagination.vue';

 import { searchFormList } from "./data";
 import request from "@/utils/request";
@ -71,6 +80,7 @@ import { Message } from "element-ui";
 export default {
  name: 'sensitiveWord',
  components: {
+    Pagination,
    Card,
    ButtonGradient,
    InputSearch,
@ -79,7 +89,13 @@ export default {
  },
  data() {
    return {
+      searchText:"关键词搜索",
      searchFormList,
+
+      numTotal:0,
+      pageSize:42,
+      currentPage:1,
+
      keyMap: [
        {
          key: "word",
@ -106,13 +122,16 @@ export default {
  },
  methods: {
    getSearchData() {
-      let result = {
-        ...this.searchData,
+      let params = {
+        word: this.searchData?.word,
+        pageSize: this.pageSize,
+        pageNum: this.currentPage
      };
-      if(!result.word){
-        result = {};
-      }
-      return result
+      // params = {
+      //   pageSize: 1000000,
+      //   pageNum: 1
+      // };
+      return params
    },
    async handleDelete(data) {
      await confirm({ message: "是否要删除该辖段信息?" });
@ -156,18 +175,27 @@ export default {
        method: "get",
        params: this.getSearchData()
      }).then(result => {
+        this.searchText = this.searchData?.word || "关键词搜索";
        if (result.code != 200) return;
        this.data = result.rows;
-        // this.data = [
-        //   ...result.rows,...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows
-        //   , ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows, ...result.rows
-        // ];
-        Array.from(result.rows);
+        this.numTotal = result.total;
+
+        // this.pageTotal = Math.ceil(result.total/this.pageSize);
      }).finally(() => {
        this.isFirst = false;
        closeLoading();
      })
+    },
+
+    handleSizeChange(size) {
+      this.pageSize = size;
+      this.getData();
+    },
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+      this.getData();
    }
+
  }

 }
@ -190,7 +218,7 @@ export default {
    }

  .body {
-    height: 0; flex: 1; overflow-y: scroll;
+    height: 0; flex: 1;
    display: flex; flex-wrap: wrap; align-content: flex-start;
    .cardBox{
      flex-basis: percentage(1/7); width: 0; padding-right: 10px; padding-bottom: 10px;
@ -201,5 +229,14 @@ export default {
      color: #00B3CC;
    }
  }
+
+    .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
 }
 </style>
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@ -49,8 +49,8 @@ module.exports = {
        // target: `http://10.0.81.202:8087`, //现场后台
        // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
        // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
-        target: `http://10.168.78.135:8087`, //王钦
-        // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        // target: `http://10.168.78.135:8087`,  //王钦
+        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
        // target: `http://10.168.68.42:8087`, //王思祥
        changeOrigin: true,
        pathRewrite: {