Merge branch 'master' of http://192.168.73.113:9001/r/lims-before

zouyu

2023-09-04 5d4d64bf94fa0b36d97afe25e949c81316965b27

Merge branch 'master' of http://192.168.73.113:9001/r/lims-before

 .env.development

@@ -2,4 +2,4 @@
ENV = 'development'

# base api
VUE_APP_BASE_API =  'http://192.168.73.96:1234/'
VUE_APP_BASE_API =  'http://localhost:1234/'

 src/App.vue

@@ -5,7 +5,9 @@
</template>

<script>
import GlobalClickMixin from "@/utils/GlobalClickMixin";
export default {
    mixins: [GlobalClickMixin], // ä½¿ç”¨æ··å…¥
  name: 'App',
    mounted() {
        document.title = "装备电缆 lims ç³»ç»Ÿ"
@@ -21,6 +23,7 @@
    .breadcrumb-container{
        height: 40px;
    }

    .app-main{
        margin-top: 41px !important;
    }
@@ -35,7 +38,8 @@
        overflow: hidden;
    }
    
    .el-dialog__header,.el-message-box__header {
.el-dialog__header,
.el-message-box__header {
      box-sizing: border-box;
      height: 46px;
      border-bottom: 1px solid rgb(238, 238, 238);

 src/main.js

@@ -9,7 +9,6 @@
import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
import VueClipboard from 'vue-clipboard2'
Vue.use(VueClipboard)

import '@/styles/index.scss' // global css

import App from './App'
@@ -61,4 +60,4 @@
  router,
  store,
  render: h => h(App)
})
});

 src/utils/EventBus.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
// EventBus.js
import Vue from 'vue';
export const EventBus = new Vue();

 src/utils/GlobalClickMixin.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
import { EventBus } from './EventBus.js';

export default {
  mounted() {
    this.$el.addEventListener('click', this.$_handleGlobalClick);
  },
  beforeDestroy() {
    this.$el.removeEventListener('click', this.$_handleGlobalClick);
  },
  methods: {
    $_handleGlobalClick(event) {
        if (event.target.tagName === 'SPAN'||event.target.tagName==='BUTTON') {
            if(sessionStorage.getItem('user')===undefined&&sessionStorage.getItem('user')===null){
                return;
            }
            let user=JSON.parse(sessionStorage.getItem('user'));
            if(user.account === 'admin'&&user.sessionLayerId === 'f5c8bcb7d5a0fd27e2323280f7e98cad'){
                return;
            }
            // console.log(this.$router.currentRoute);
            // console.log(user.role.roleMenuList);
            // console.log(event.target.innerText);
          }
    }
  }
};

 src/views/basicData/index.vue

@@ -2,7 +2,7 @@
    <div class="main_div">
        <div class="top_div">
            <span>样品名称：</span>
            <el-select v-model="params.material" size="small" placeholder="请选择样品名称">
            <el-select v-model="params.material" size="small" placeholder="请选择样品名称" @change="selectProductModelTable()">
                <el-option v-for="item in productModelSelectmater" :value="item" :key="item.index" :label="item"></el-option>
            </el-select>
            <span class="top_div_span">项目分组：</span>
@@ -160,6 +160,7 @@
                                    message: res.message,
                                    type: "success",
                                });
                                this.selectProductMaster();
                                this.selectProductModelTable();
                            });
                        }
@@ -347,13 +348,16 @@
                    name: null
                }
                this.selectProductModelTable()
            }
        },
        mounted() {
            selectList(){
            this.selectProductMaster().then((res) => {
                this.params.material = this.productModelSelectmater[0];
                this.selectProductModelTable();
            });
                })
            }
        },
        mounted() {
            this.selectList()
        },
        watch: {
            centerDialogVisible: {

 src/views/standardLibrary/index.vue

@@ -167,7 +167,8 @@
            },
            async insertVersion() {
                const resp = await addVersion({
                    specificationsId: this.selectData.id
                    specificationsId: this.selectData.id,
                    version: this.versionValue
                });
                if (resp.code === 200) {
                    this.initSelect();