Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-25 0c9e6566ac342748632e146fbe78872267c53bb8

Merge remote-tracking branch 'origin/master'

 src/App.vue

@@ -4,12 +4,11 @@
  </div>
</template>
<script>

export default {
  data() {
    return {
      mytitle: '',
    }
      mytitle: "",
    };
  },
  async created() {
    const imgObj = await this.getIcon();
@@ -17,8 +16,11 @@
  },
  methods: {
    changIcon(obj) {
      var link = document.querySelector("link [rel*='icon']") || document.createElement("link");
      var title = document.querySelector("title") || document.createElement("title");
      var link =
        document.querySelector("link [rel*='icon']") ||
        document.createElement("link");
      var title =
        document.querySelector("title") || document.createElement("title");
      link.type = "image/x-icon";
      link.rel = "shortcut icon";
      link.href = obj.chromeLinkUrl;  //icon图标
@@ -29,21 +31,21 @@
    // 获取icon
    async getIcon() {
      let result;
      const pic = JSON.parse(sessionStorage.getItem('pic'));
      const pic = JSON.parse(sessionStorage.getItem("pic"));
      if (pic) {
        result = pic;
      } else {
        await this.$axios({
          method: 'get',
          url: 'sccg/system/portal/logo/search',
        }).then(res => {
          method: "get",
          url: "sccg/system/portal/logo/search",
        }).then((res) => {
          result = res.data;
          sessionStorage.setItem('pic', JSON.stringify(result));
        })
          sessionStorage.setItem("pic", JSON.stringify(result));
        });
      }
      return result;
    },
  }
  },
};
</script>
<style lang="scss">
@@ -73,7 +75,7 @@

.el-tree-node:focus>.el-tree-node__content {
  background-color: #070f22 !important;
  color: #4b9bb7
  color: #4b9bb7;
}

/*定义滚动条高宽及背景
@@ -96,7 +98,7 @@
 内阴影+圆角*/
::-webkit-scrollbar-thumb {
  border-radius: 10px;
  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
  background-color: #555;
}

@@ -160,4 +162,18 @@
    border: 1px solid #17324c;
  }
}
.el-table__body-wrapper::-webkit-scrollbar {
  width: 8px; /*滚动条宽度*/
  height: 8px; /*滚动条高度*/
}
.el-table__body-wrapper::-webkit-scrollbar-track {
  border-radius: 10px; /*滚动条的背景区域的圆角*/
  -webkit-box-shadow: inset 0 0 6px rgba(238, 238, 238, 0.3);
  background-color: #eeeeee; /*滚动条的背景颜色*/
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
  border-radius: 10px; /*滚动条的圆角*/
  -webkit-box-shadow: inset 0 0 6px rgba(145, 143, 0143, 0.3);
  background-color: rgb(145, 143, 143); /*滚动条的背景颜色*/
}
</style>

 src/router/index.js

@@ -299,8 +299,8 @@
    {
      path: 'writManagement',
      name: 'writManagement',
      component: () => import('@/views/operate/writManager/writ'),
      redirect: '/home/operate/writManager/writ',
      component: () => import('@/views/operate/writManager'),
      // redirect: '/home/operate/writManager/writ',
      children: [
        {
          path: 'writTemplate',

 src/views/operate/writManager/index.vue

New file
@@ -0,0 +1,3 @@
<template>
    <router-view></router-view>
</template>

 src/views/operate/writManager/writ/index.vue

@@ -3,20 +3,11 @@
    <header>
      <div class="header-content">
        <div class="search">
          <span style="padding-right: 20px">筛选条件:</span>
          <el-select
            v-model="context"
            placeholder="筛选条件"
            @change="handleStateChange"
          >
            <el-option
              v-for="item in options"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            >
            </el-option>
          </el-select>
          <span>筛选条件:</span>
          <el-input placeholder="请输入内容" v-model="context"></el-input>
          <div class="findBtn">
            <el-button type="primary" @click="setTableData">查询</el-button>
          </div>
        </div>
      </div>
    </header>
@@ -42,34 +33,34 @@
          style="width: 100%"
        >
          <el-table-column type="selection" min-width="5"> </el-table-column>
          <el-table-column prop="writCode" label="文书编号" min-width="10">
          <el-table-column prop="writCode" label="文书编号" min-width="100">
          </el-table-column>
          <el-table-column prop="writTypeName" label="文书种类" min-width="10">
          <el-table-column prop="writTypeName" label="文书种类" min-width="180">
          </el-table-column>
          <el-table-column prop="categoryName" label="违法类型" min-width="20">
          <el-table-column prop="categoryName" label="违法类型" min-width="300">
          </el-table-column>
          <el-table-column prop="eventCode" label="事件编号" min-width="10">
          <el-table-column prop="eventCode" label="事件编号" width="160">
          </el-table-column>
          <el-table-column prop="sendTime" label="文书发放时间" min-width="10">
          <el-table-column prop="sendTime" label="文书发放时间" min-width="120">
          </el-table-column>
          <el-table-column prop="limitTime" label="文书限定时间" min-width="10">
          <el-table-column prop="limitTime" label="文书限定时间" min-width="120">
          </el-table-column>
          <el-table-column
            prop="sendContent"
            label="文书发放内容"
            min-width="10"
            min-width="110"
          >
          </el-table-column>
          <el-table-column
            prop="rectifyTime"
            label="实际整改时间"
            min-width="10"
            min-width="120"
          >
          </el-table-column>
          <el-table-column
            prop="rectifySituation"
            label="整改情况"
            min-width="10"
            min-width="110"
          >
          </el-table-column>

@@ -77,11 +68,11 @@
            prop="state"
            :formatter="formatSate"
            label="状态"
            min-width="5"
            width="60"
          >
          </el-table-column>

          <el-table-column prop="operation" label="操作" min-width="20">
          <el-table-column prop="operation" label="操作" min-width="150">
            <template slot-scope="scope">
              <div class="operation">
                <span v-if="!scope.row.value" @click="handleEdit(scope.row)"
@@ -242,7 +233,7 @@
      this.getWritList({
        currentPage,
        pageSize,
        state: context,
        keyword: context,
      }).then((res) => {
        this.list = res.records;
        this.totalNum = res.total;
@@ -423,4 +414,38 @@
    color: #fff;
  }
}
.headerContent {
  padding: 0 40px;
  display: flex;
  line-height: 100px;
  justify-content: space-between;
  align-items: center;

  .search {
    display: flex;
    justify-content: flex-start;

    span {
      flex: 1;
    }

    .el-input {
      flex: 2;
      color: #1d3f57;
    }
  }
}

.findBtn {
  line-height: 100px;
  margin-left: 15px;
  display: flex;
  align-items: center;
  margin-top: -2px;

  .el-button {
    padding: 12px 25px;
    border-radius: 20px;
  }
}
</style>

 vue.config.js

@@ -39,8 +39,8 @@
    proxy: {
      // 跨域配置
      "/sccg": {
        target: `http://42.193.1.25/`,
        // target: `http://127.0.0.1:8082/`,
        // target: `http://42.193.1.25/`,
        target: `http://127.0.0.1:8082/`,
        changeOrigin: true
      }
    },