Merge branch 'master' of http://git.bozedu.net:3000/872880485/activity_manage

# Conflicts:
#	package-lock.json

package-lock.json

@@ -1,8 +1,9 @@
 {
   "name": "v2admin",
   "version": "0.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
+<<<<<<< HEAD
   "packages": {
     "": {
       "name": "v2admin",
@@ -2291,6 +2292,8 @@
       "dev": true
     }
   },
+=======
+>>>>>>> 9174a8066c34233f54c286aeb34828411be3f67c
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.1.2",
@@ -2688,8 +2691,7 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-2.2.4.tgz",
       "integrity": "sha512-ev9AOlp0ljCaDkFZF3JwC/pD2N4Hh+r5srl5JHM6BKg5+99jiiK0rE/XaRs3pVm1wzyKkjUy/StBSoXX5fFzcw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.2.1",
@@ -2847,8 +2849,7 @@
     "@vue/composition-api": {
       "version": "1.4.9",
       "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.9.tgz",
-      "integrity": "sha512-l6YOeg5LEXmfPqyxAnBaCv1FMRw0OGKJ4m6nOWRm6ngt5TuHcj5ZoBRN+LXh3J0u6Ur3C4VA+RiKT+M0eItr/g==",
-      "requires": {}
+      "integrity": "sha512-l6YOeg5LEXmfPqyxAnBaCv1FMRw0OGKJ4m6nOWRm6ngt5TuHcj5ZoBRN+LXh3J0u6Ur3C4VA+RiKT+M0eItr/g=="
     },
     "@vue/devtools-api": {
       "version": "6.1.3",
@@ -3059,9 +3060,7 @@
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
-      "dev": true,
-      "peer": true
+      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0="
     },
     "debug": {
       "version": "4.3.3",
@@ -3377,9 +3376,7 @@
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "peer": true
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
     },
     "html-tags": {
       "version": "2.0.0",
@@ -3809,8 +3806,7 @@
     "vue-demi": {
       "version": "0.12.1",
       "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.1.tgz",
-      "integrity": "sha512-QL3ny+wX8c6Xm1/EZylbgzdoDolye+VpCXRhI2hug9dJTP3OUJ3lmiKN3CsVV3mOJKwFi0nsstbgob0vG7aoIw==",
-      "requires": {}
+      "integrity": "sha512-QL3ny+wX8c6Xm1/EZylbgzdoDolye+VpCXRhI2hug9dJTP3OUJ3lmiKN3CsVV3mOJKwFi0nsstbgob0vG7aoIw=="
     },
     "vue-router": {
       "version": "3.5.3",
@@ -3821,8 +3817,6 @@
       "version": "2.6.14",
       "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz",
       "integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==",
-      "dev": true,
-      "peer": true,
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.1.0"

package.json

@@ -26,6 +26,7 @@
     "path-to-regexp": "^6.2.0",
     "pinia": "^2.0.12",
     "vue": "^2.6.14",
-    "vue-router": "^3.5.3"
+    "vue-router": "^3.5.3",
+    "vue-template-compiler": "^2.6.14"
   }
 }

src/views/mhgl/hdgg/api.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request';
+
+//列表数据
+export const queryApi = (data = {}) =>
+  request({
+    url: 'hdpb/hdgg/index',
+    data,
+  })
+// 添加接口  
+export const addApi = () => request({})
+//删除接口
+export const deleteApi = () => request({})
+//编辑接口
+export const editApi = () => request({})

src/views/mhgl/hdgg/index.vue

@@ -1,13 +1,80 @@
 <template>
-    <div>hdgg</div>
+    <div>
+       <header></header>
+       <el-row>
+      <div class="titleFuc">
+        <el-button type="success" icon="el-icon-plus">新建活动公告</el-button>
+         <el-button type="success" icon="el-icon-plus">批量删除</el-button>
+      </div>
+      <div class="searchFunc">
+        <el-input
+          placeholder="请输入搜索关键字"
+          suffix-icon="el-icon-search"
+          v-model="searchText"
+          style="width: 200px"
+        ></el-input>
+        <el-button type="primary">搜索</el-button>
+      </div>
+    </el-row>
+    <el-row>
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="活动公告标题" prop="hh_name"></el-table-column>
+        <el-table-column label="创建人" prop="hh_cjr"></el-table-column>
+        <el-table-column label="创建时间" prop="hh_cjsj"></el-table-column>
+
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-link type="primary">编辑</el-link>
+            <span style="color: #409eff; margin: 0 10px">|</span>
+            <el-link type="primary">删除</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+
+    </div>
 </template>
 
 <script>
-
+import { queryApi } from "./api";
 export default {
+  data(){
+    return{
+      searchText:"这里是预制的搜素内容",
+      tableData:[],
+    }
+  },
+  created(){
+    this.activeList();
+  },
+  methods:{
+    async activeList(){
+      const { data } = await queryApi();
+      console.log(data);
+      this.tableData=data.page_data;
+    }
+  },
+  watch:{
+
+  }
 
 }
 </script>
 
 <style lang="scss" scoped>
+.titleFuc {
+  width: 80%;
+  display: inline-block;
+}
+.searchFunc {
+  width: 20%;
+  display: inline-block;
+  text-align: right;
+}
 </style>

src/views/mhgl/tzgg/api.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request';
+
+//列表数据
+export const queryApi = (data = {}) =>
+  request({
+    url: 'hdpb/tzgg/index',
+    data,
+  })
+// 添加接口  
+export const addApi = () => request({})
+//删除接口
+export const deleteApi = () => request({})
+//编辑接口
+export const editApi = () => request({})

src/views/mhgl/tzgg/index.vue

@@ -1,13 +1,86 @@
 <template>
-    <div>tzgg</div>
+  <div>
+    <header></header>
+    <el-row>
+      <div class="titleFuc">
+        <el-button type="info" icon="el-icon-plus">新建通知公告</el-button>
+      </div>
+      <div class="searchFunc">
+        <el-input
+          placeholder="请输入搜索关键字"
+          suffix-icon="el-icon-search"
+          v-model="searchText"
+          style="width: 200px"
+        ></el-input>
+        <el-button type="primary">搜索</el-button>
+      </div>
+    </el-row>
+    <el-row>
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        tooltip-effect="dark"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="通知公告标题" prop=""></el-table-column>
+        <el-table-column label="创建人" prop=""></el-table-column>
+        <el-table-column label="创建时间" prop=""></el-table-column>
+
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-link type="primary">编辑</el-link>
+            <span style="color: #409eff; margin: 0 10px">|</span>
+            <el-link type="primary">删除</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+    <el-row style="text-align: right">
+        <el-pagination background layout="prev, pager, next" :total="total"></el-pagination>
+    </el-row>
+  </div>
 </template>
 
 <script>
+import { defineComponent, ref } from "@vue/composition-api";
+import { queryApi } from "./api";
 
-export default {
+export default defineComponent({
+  setup() {
+    const searchText = ref("");
 
-}
+    const total = ref(0);
+    const tableData = ref([]);
+    async function query() {
+      const { data } = await queryApi();
+      console.log(data);
+      const { page_data, total_rows } = data;
+
+      total.value = total_rows * 1;
+      tableData.value = page_data;
+    }
+
+    query();
+
+    return {
+      total,
+      tableData,
+      query,
+      searchText,
+    };
+  },
+});
 </script>
 
 <style lang="scss" scoped>
+.titleFuc {
+  width: 80%;
+  display: inline-block;
+}
+.searchFunc {
+  width: 20%;
+  display: inline-block;
+  text-align: right;
+}
 </style>