mork 2 месяцев назад
Родитель
Сommit
96ead18418
4 измененных файлов с 17 добавлено и 11 удалено
  1. 2 0
      src/components/user/user.vue
  2. 10 8
      src/components/yygl/editManage.vue
  3. 1 1
      src/main.js
  4. 4 2
      src/views/yygl/manage/index.vue

+ 2 - 0
src/components/user/user.vue

@@ -37,6 +37,7 @@
     <editManage
       v-if="isContentShow"
       :isShow="isContentShow"
+      :dialog-title="dialogTitle"
       :column-model="columnModel"
       :column="columnData"
       :item="contentItem"
@@ -67,6 +68,7 @@ export default {
       columnId: systemConfig.columnIds[3], // 青浦一张图登录栏目id
 
       // 编辑用户弹窗相关
+      dialogTitle: "申请账号",
       isContentShow: false,
       isContentView: false,
       columnModel: {},

+ 10 - 8
src/components/yygl/editManage.vue

@@ -5,7 +5,7 @@
       v-model="isDialogShow"
       width="650px"
       top="7%"
-      title="申请账号"
+      :title="dialogTitle"
       :close-on-click-modal="false"
       :before-close="dialogBeforeClose"
       style="overflow: auto; height: 700px"
@@ -61,15 +61,16 @@
             :disabled="isView"
           /> -->
           <!--日期时间  formItem.describe-->
-          <span v-else-if="['date_time'].indexOf(formItem.frontType) > -1">
+          <span v-else-if="['date_time'].indexOf(formItem.frontType) > -1" style="width: 100%">
             <el-date-picker
               v-if="!isView"
               type="datetime"
               v-model="dataForm[formItem.name]"
               value-format="x"
               :placeholder="`请输入${formItem.alias}`"
+              style="width: 100%"
             />
-            <span v-else>{{
+            <span v-else style="width: 100%">{{
               dataForm[formItem.name] == "" ||
               dataForm[formItem.name] == undefined ||
               dataForm[formItem.name] == null
@@ -81,7 +82,7 @@
           <!--整数类型  formItem.describe-->
           <el-input-number
             v-if="['int_num'].indexOf(formItem.frontType) > -1"
-            style="width: 80%"
+            style="width: 100%"
             v-model="dataForm[formItem.name]"
             :placeholder="`请输入${formItem.alias}`"
             :disabled="isView"
@@ -91,7 +92,7 @@
             v-if="['float_num'].indexOf(formItem.frontType) > -1"
             :min="formItem.min"
             :max="formItem.max"
-            style="width: 80%"
+            style="width: 100%"
             v-model="dataForm[formItem.name]"
             :placeholder="`请输入${formItem.alias}`"
             :disabled="isView"
@@ -285,7 +286,7 @@
               </span>
               <template #tip>
                 <span class="el-upload__tip" style="display: inline-block; margin-left: 10px">
-                  {{ formItem.alias }}
+                  {{ formItem.describe }}
                 </span>
               </template>
             </el-upload>
@@ -339,7 +340,7 @@
               </span>
               <template #tip>
                 <span class="el-upload__tip" style="display: inline-block; margin-left: 10px">
-                  {{ formItem.alias }}
+                  {{ formItem.describe }}
                 </span>
               </template>
             </el-upload>
@@ -531,6 +532,7 @@ export default {
   },
   props: {
     isShow: Boolean,
+    dialogTitle: String,
     columnModel: Object,
     column: Object,
     item: Object,
@@ -623,7 +625,7 @@ export default {
             that.item[data.name] = val;
           }
         } else if (["check", "select", "multiple_select"].indexOf(data.frontType) > -1) {
-          that.item[data.name] = Number(that.item[data.name]);
+          that.item[data.name] = isNaN(Number(that.item[data.name])) ? '' : Number(that.item[data.name]);
         } else if (["files", "picture", "audio", "video"].indexOf(data.frontType) > -1) {
           if (!that.item[data.name]) return;
           api

+ 1 - 1
src/main.js

@@ -37,7 +37,7 @@ initApp.config.globalProperties.$getDmsTypes = (cName, index) => {
 };
 // 添加自定义方法,得到用户类型【1:游客;2:普通用户;3:管理员】
 const getUserType = () => {
-  // console.log("=====userInfo==="+JSON.stringify(store.state.userInfo));
+  console.log("=====userInfo==="+JSON.stringify(store.state.userInfo));
   if (store.state.userInfo && store.state.userInfo.id != null) {
     // 得到用户id
     let userId = store.state.userInfo.id;

+ 4 - 2
src/views/yygl/manage/index.vue

@@ -74,7 +74,7 @@
         </el-input>
         <el-button type="primary" class="search-btn" @click="handleSearchClick">搜索</el-button>
         <el-button class="reset-btn" @click="handleResetClick">重置</el-button>
-        <el-button type="success" class="add-btn" @click="handleAddClick">+ 新增应用</el-button>
+        <el-button type="success" class="add-btn" @click="handleAddClick">+ 应用接入</el-button>
       </div>
 
       <!-- 应用列表区域 -->
@@ -158,7 +158,7 @@
             <div class="app-actions">
               <!-- <span class="app-date">{{ app.createDate }}</span> -->
               <el-button type="primary" size="small" class="detail-btn" @click="getContentById(app)"
-                >查看详情</el-button
+                >信息管理</el-button
               >
             </div>
           </div>
@@ -183,6 +183,7 @@
         :isShow="isContentShow"
         :column-model="columnModel"
         :column="columnData"
+        :dialog-title="dialogTitle"
         :item="contentItem"
         :is-view="isContentView"
         :close="handleEditClose"
@@ -216,6 +217,7 @@ export default {
       modelId: systemConfig.modelIds[0], // 应用中心模型id
       columnId: systemConfig.columnIds[1], // 应用中心栏目id
 
+      dialogTitle: "应用信息管理",
       isContentShow: false,
       isContentView: false,
       columnModel: {},