修改字典使用方式

src/api/toConsult.js

@@ -36,25 +36,17 @@ export function registration(data) {
   })
 }
 //获取任务详情列表
-export function registrationList(query) {
+export function registrationList(dictType) {
   return request({
-    url: '/core/registration/list',
-    headers: {
-      isToken: false
-    },
+    url: '/core/registration/list'+dictType,
     method: 'get',
-    params:query
   })
 }
 //根据字典类型查询字典值接口
-export function getDict(query) {
+export function getDict(dictType) {
   return request({
-    url: '/system/dict/data/type',
-    headers: {
-      isToken: false
-    },
+    url: '/system/dict/data/type/'+dictType,
     method: 'get',
-    params:query
   })
 }
 

src/assets/css/index.scss

@@ -10,5 +10,5 @@ body .app {
 
 .app-container {
   padding-bottom: 100px;
-  background-color: rgb(245, 245, 249);
+  -background-color: rgb(245, 245, 249);
 }

src/components/layouts/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div :class="{'app-container': !$route.meta.hideTabBar} ">
     <div class="layout-content">
       <keep-alive v-if="$route.meta.keepAlive">
         <router-view></router-view>
@@ -65,6 +65,3 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-
-</style>

src/config/env.development.js

@@ -1,6 +1,6 @@
 /** 本地开发环境*/
 module.exports = {
-  title: 'soc-app',
+  title: 'soc-app-dev',
   baseUrl: 'http://localhost:9018', // 项目地址
   baseApi: '/luojun', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
   APPID: 'xxx',

src/config/env.staging.js

@@ -1,6 +1,6 @@
 /** 测试环境*/
 module.exports = {
-  title: 'vue-h5-test',   //项目名称
+  title: 'soc-app-test',   //项目名称
   baseUrl: 'https://test.xxx.com', // 测试项目地址
   baseApi: 'https://test.xxx.com/api', // 测试api请求地址
   APPID: 'xxx',

src/utils/global.js

@@ -1,25 +1,25 @@
-import {globalMixins} from "./globalMixins" 
+import globalMixins from "./globalMixins"
 
 const globals = {
     install: function (Vue, option) {
       // 全局混入
       Vue.mixin(globalMixins);
-      
-  
+
+
     //   // 全局过滤
     //   Object.keys(filters).forEach((key) => {
     //     Vue.filter(key, filters[key]);
     //   });
-  
+
     //   // 全局指令
     //   Object.keys(directives).forEach((key) => {
     //     Vue.directive(key, directives[key]);
     //   });
-  
+
     //   // 全局属性和方法
     //   Object.keys(propertiesAndMethods).forEach((key) => {
     //     Vue.prototype[key] = propertiesAndMethods[key];
     //   });
     },
   }
-  export default globals
+  export default globals

src/utils/globalMixins.js

@@ -1,16 +1,29 @@
 import { getDict } from '@/api/toConsult.js'
 
-export const globalMixins = {
+export default {
   data() {
-    return {}
+    return {
+      //字典['dict_type']
+      dicts:[]
+    }
+  },
+  created() {
+    /** 组件中设置dictType,即可获取相应的value*/
+    if(this.dicts.length > 0){
+      this.dicts.forEach(item=>{
+        this.getDictHandler(item,(res)=>{
+          this[item] = res
+        })
+      })
+    }
   },
   methods: {
     //根据字典类型获取字典值
     getDictHandler(dictType,callBack) {
-      getDict({ dictType: dictType }).then(res => {
+      getDict( dictType ).then(res => {
         let { code, data, msg } = res
         if (code == 200) {
-            callBack(data) 
+            callBack(data)
         }
       })
     }
@@ -19,5 +32,5 @@ export const globalMixins = {
     //     console.log(res);
     // })
   }
- 
+
 }

src/views/menu/LZRegister/api.js

@@ -0,0 +1,18 @@
+import request from "@/utils/request";
+export function dataList(data) {
+  return request({
+    url: "/core/api/resumption/taskList",
+    method: "post",
+    data,
+  });
+}
+
+//编辑日期作息配置
+export function editWorkTime(data) {
+  return request({
+    url: '/system/api/work/time/month/app/edit',
+    method: 'post',
+    showLoading:true,
+    data
+  })
+}

src/views/menu/LZRegister/edit.vue

@@ -135,7 +135,8 @@ export default {
       checked:false,
       info:'',
       activeNames: ['1'],
-      fileList:[]
+      fileList:[],
+      dicts:['sys_business_type','asdagg']
     }
   }
 }
@@ -147,7 +148,7 @@ export default {
 
   }
   .page-container{
-    height: calc(100vh - 90px);
+    height: calc(100% - 100px);
     background-color: #f1f1f1;
     overflow: auto;
     padding: 20px;

src/views/menu/LZRegister/index.vue

@@ -99,21 +99,35 @@
 import NavBar from '@/components/NavBar';
 import DatePicker from '@/components/DatePicker';
 import {mapGetters} from "vuex";
+import {dataList} from "./api"
 export default {
   components:{NavBar,DatePicker},
   data(){
     return{
       date:new Date(),
       container: null,
+      typeCode:['day','mouth','year'],
     }
   },
   mounted() {
     this.container = this.$refs.container;
+    this.getDatalist();
   },
   computed:{
     ...mapGetters(['orgName','orgId']),
   },
   methods:{
+    getDatalist(){
+      let data = {
+        dateTime: this.date,
+        orgId: this.orgId,
+        roleId:this.roleId,
+        typeCode:null,
+      }
+      dataList(data).then(res=>{
+        console.log(res,'ressss')
+      })
+    },
     queryMoth(){
 
     },
@@ -140,7 +154,6 @@ export default {
     box-sizing: border-box;
     background-color: #f1f1f1;
     overflow: auto;
-    margin-bottom: 100px;
   }
   .list-item{
     margin: 20px;

vue.config.js

@@ -4,7 +4,7 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 
 const resolve = dir => path.join(__dirname, dir)
 // page title
-const name = defaultSettings.title || 'vue mobile template'
+const name = defaultSettings.title;
 // 生产环境，测试和正式
 const IS_PROD = ['production', 'prod'].includes(process.env.NODE_ENV)
 
@@ -53,9 +53,7 @@ module.exports = defineConfig({
     proxy: {
       //配置跨域
       '/luojun': {
-          // target: "http://10.87.10.49:8080",
-          target: "http://10.87.10.47:8080",
-         
+          target: "http://10.87.10.49:8080",
           // ws:true,
           changOrigin:true,
           pathRewrite:{