zhouxingyu 3 周之前
父节点
当前提交
c40cb6d0b5

+ 1 - 1
public/index.html

@@ -249,7 +249,7 @@
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 JeecgBoot 低代码平台,请耐心等待
+    <div class="load_title">正在加载 LG生产异常追踪系统,请耐心等待
 
     </div>
   </div>

+ 1 - 1
src/components/layouts/TabLayout.vue

@@ -183,7 +183,7 @@
        * @param title 要修改的新标题
        */
       changeTitle(title) {
-        let projectTitle = "Jeecg-Boot 企业级低代码平台"
+        let projectTitle = "LG生产异常追踪系统"
         // 首页特殊处理
         if (this.$route.path === indexKey) {
           document.title = projectTitle

+ 2 - 3
src/components/layouts/UserLayout.vue

@@ -4,12 +4,11 @@
       <div class="top">
         <div class="header">
           <a href="/">
-            <img src="~@/assets/logo.svg" class="logo" alt="logo">
-            <span class="title">Jeecg Boot</span>
+            <span class="title">LG生产异常追踪系统</span>
           </a>
         </div>
         <div class="desc">
-          Jeecg Boot 是中国最具影响力的 企业级 低代码平台
+
         </div>
       </div>
 

+ 1 - 1
src/components/page/GlobalHeader.vue

@@ -17,7 +17,7 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 Jeecg-Boot 企业级低代码平台</span>
+      <span v-if="device === 'desktop'">欢迎进入LG生产异常追踪系统</span>
       <span v-else>Jeecg-Boot</span>
 
       <user-menu :theme="theme"/>

+ 11 - 11
src/views/dashboard/Analysis.vue

@@ -1,16 +1,16 @@
 <template>
   <div>
-    <index-chart v-if="indexStyle==1"></index-chart>
-    <index-bdc v-if="indexStyle==2"></index-bdc>
-    <index-task v-if="indexStyle==3"></index-task>
-    <div style="width: 100%;text-align: right;margin-top: 20px">
-      请选择首页样式:
-      <a-radio-group v-model="indexStyle">
-        <a-radio :value="1">统计图表</a-radio>
-        <a-radio :value="2">统计图表2</a-radio>
-        <a-radio :value="3">任务表格</a-radio>
-      </a-radio-group>
-    </div>
+<!--    <index-chart v-if="indexStyle==1"></index-chart>-->
+<!--    <index-bdc v-if="indexStyle==2"></index-bdc>-->
+<!--    <index-task v-if="indexStyle==3"></index-task>-->
+<!--    <div style="width: 100%;text-align: right;margin-top: 20px">-->
+<!--      请选择首页样式:-->
+<!--      <a-radio-group v-model="indexStyle">-->
+<!--        <a-radio :value="1">统计图表</a-radio>-->
+<!--        <a-radio :value="2">统计图表2</a-radio>-->
+<!--        <a-radio :value="3">任务表格</a-radio>-->
+<!--      </a-radio-group>-->
+<!--    </div>-->
   </div>
 </template>
 

+ 7 - 5
src/views/lg/Contact/ContactList.vue

@@ -139,22 +139,24 @@
           {
             title:'name',
             align:"center",
-            dataIndex: 'name'
+            dataIndex: 'name',
+            validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           {
             title:'email',
             align:"center",
-            dataIndex: 'email'
+            dataIndex: 'email',
+            validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           {
-            title:'类型:发送、抄送',
+            title:'类型',
             align:"center",
-            dataIndex: 'recType_dictText'
+            dataIndex: 'recType'
           },
           {
             title:'是否启用',
             align:"center",
-            dataIndex: 'isActive_dictText'
+            dataIndex: 'isActive'
           },
           {
             title: '操作',

+ 24 - 3
src/views/lg/Contact/modules/ContactForm.vue

@@ -14,13 +14,17 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="类型:发送、抄送" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recType">
-              <a-input-number v-model="model.recType" placeholder="请输入类型:发送、抄送" style="width: 100%" />
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recType">
+              <a-select v-model="model.recType" placeholder="请输入类型:发送、抄送" style="width: 100%" >
+                <a-select-option v-for="c in contactType" :value="c.key" :key="c.key">
+                  {{ c.label }}
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isActive">
-              <a-input-number v-model="model.isActive" placeholder="请输入是否启用" style="width: 100%" />
+              <a-switch v-model:checked="model.isActive" :unCheckedValue="0" :CheckedValue="1" style="width: 5%" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -49,6 +53,8 @@
     data () {
       return {
         model:{
+          isActive: false,
+          recType: 0
          },
         labelCol: {
           xs: { span: 24 },
@@ -60,7 +66,19 @@
         },
         confirmLoading: false,
         validatorRules: {
+          name: [{ required: true, message: '姓名不能为空', trigger: 'change' }],
+          email: [{ required: true, message: '邮箱不能为空', trigger: 'change' }],
         },
+        contactType: [
+          {
+            key: 0,
+            label: "发送"
+          },
+          {
+            key: 1,
+            label: "抄送"
+          }
+        ],
         url: {
           add: "/contact/add",
           edit: "/contact/edit",
@@ -79,14 +97,17 @@
     },
     methods: {
       add () {
+        this.model.isActive = this.model.isActive ? 1 : 0;
         this.edit(this.modelDefault);
       },
       edit (record) {
+        this.model.isActive = this.model.isActive ? 1 : 0;
         this.model = Object.assign({}, record);
         this.visible = true;
       },
       submitForm () {
         const that = this;
+        this.model.isActive = this.model.isActive ? 1 : 0;
         // 触发表单验证
         this.$refs.form.validate(valid => {
           if (valid) {