From c8753517239080adc20dbc37b6080b7cece3d9f0 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Fri, 26 Jul 2024 17:37:36 +0800
Subject: [PATCH] 前端页面整改

---
 src/assets/style/common.scss            |  15 +++++++++++++++
 src/components/CompanyForm/index.vue    |   7 -------
 src/components/InfoEditRecord/index.vue | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/InfoForm/index.vue       |  11 +----------
 vue.config.js                           |  28 ++++++++++++++++++++++++++++
 5 files changed, 109 insertions(+), 161 deletions(-)

diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index 7d9fe78..80ddec1 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -64,3 +64,18 @@ a {
 
 } 
 
+.form-item {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  flex-direction: row;
+  color: #C0C4CC;
+  line-height: 30px;
+  .label {
+    color: #000;
+    &.w-100 {
+      width: 100px;
+    }
+  }
+}
+
diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index 78200df..962b2a4 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -58,13 +58,6 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="资质证明" prop="qualificationCertificate">
-						<NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9"
-							buttonText="点击上传">
-						</NCC-UploadFz>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24">
 					<el-form-item label="其他信息" prop="otherInfo">
 						<NCC-Quill v-model="dataForm.otherInfo" placeholder="请输入内容...">
 						</NCC-Quill>
diff --git a/src/components/InfoEditRecord/index.vue b/src/components/InfoEditRecord/index.vue
index 7ed386f..29362c8 100644
--- a/src/components/InfoEditRecord/index.vue
+++ b/src/components/InfoEditRecord/index.vue
@@ -27,97 +27,27 @@
             v-loading="infoForm_loading"
           >
             <el-row :gutter="20">
-              <el-col :span="24">
-                <el-col :span="12">
-                  <el-form-item label="主体企业" prop="companyId">
-                    <el-select
-                      v-model="infoForm.companyId"
-                      placeholder="请选择主体企业"
-                      clearable
-                      v-loadMore="nextCompanyList"
-                      style="width: 100%"
-                      @change="companyChange"
-                    >
-                      <el-option
-                        v-for="item in companyOptions"
-                        :key="item.id"
-                        :label="item.companyName"
-                        :value="item.id"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-col>
-              <el-col :span="24" v-if="isShowCompanyInfo">
-                <div class="company-info">
-                  <div class="company-info-items">
-                    <div :span="12">
-                      企业归属：{{ companyInfo.areaName || "--" }}
-                    </div>
-                    <div :span="12">
-                      联系人：{{ companyInfo.contactUser || "--" }}
-                    </div>
-                    <div :span="12">
-                      公司地址：{{ companyInfo.address || "--" }}
-                    </div>
-                  </div>
-                  <div class="company-info-items">
-                    <div :span="12">
-                      社会信用代码：{{ companyInfo.socialCreditAgency || "--" }}
-                    </div>
-                    <div :span="12">
-                      联系电话：{{ companyInfo.contactPhone || "--" }}
-                    </div>
-                  </div>
-                </div>
-              </el-col>
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="系统类型" prop="systemType">
-                  <el-radio-group v-model="infoForm.systemType">
-                    <el-radio
-                      v-for="v in systemTypeOptions"
-                      :key="v.Id"
-                      :label="v.Id"
-                      @change="initSystemClassList"
-                      >{{ v.FullName }}</el-radio
-                    >
-                  </el-radio-group>
+                  <el-input
+                    v-model="infoForm.systemTypeName"
+                    placeholder="--"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="系统名称" prop="systemName">
                   <el-input
                     v-model="infoForm.systemName"
-                    placeholder="请输入系统名称"
-                    maxlength="50"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="系统分类" prop="systemClass">
-                  <el-select
-                    v-model="infoForm.systemClass"
-                    placeholder="请选择系统分类"
-                    :disabled="!infoForm.systemType"
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in systemClassOptions"
-                      :key="item.Id"
-                      :label="item.ClassName"
-                      :value="item.Id"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="备案号" prop="systemRecordNumber">
                   <el-input
-                    v-model="infoForm.systemRecordNumber"
-                    placeholder="请输入备案号"
-                    maxlength="200"
+                    v-model="infoForm.systemClassName"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -125,8 +55,7 @@
                 <el-form-item label="备案许可证" prop="recordLicense">
                   <el-input
                     v-model="infoForm.recordLicense"
-                    placeholder="请输入备案许可证"
-                    maxlength="200"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -134,8 +63,7 @@
                 <el-form-item label="归属平台" prop="platform">
                   <el-input
                     v-model="infoForm.platform"
-                    placeholder="请输入归属平台"
-                    maxlength="200"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -143,8 +71,7 @@
                 <el-form-item label="域名" prop="domain">
                   <el-input
                     v-model="infoForm.domain"
-                    placeholder="请输入域名"
-                    maxlength="200"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -152,8 +79,7 @@
                 <el-form-item label="下载量" prop="systemDownloadVolume">
                   <el-input
                     v-model.number="infoForm.systemDownloadVolume"
-                    maxlength="200"
-                    placeholder="请输入下载量"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -161,8 +87,7 @@
                 <el-form-item label="版本" prop="version">
                   <el-input
                     v-model="infoForm.version"
-                    maxlength="200"
-                    placeholder="请输入版本"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -170,8 +95,7 @@
                 <el-form-item label="负责人姓名" prop="principalName">
                   <el-input
                     v-model="infoForm.principalName"
-                    maxlength="50"
-                    placeholder="请输入负责人姓名"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -179,8 +103,7 @@
                 <el-form-item label="负责人电话" prop="principalPhone">
                   <el-input
                     v-model="infoForm.principalPhone"
-                    maxlength="20"
-                    placeholder="请输入负责人电话"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -188,8 +111,7 @@
                 <el-form-item label="办公地址" prop="officeAddress">
                   <el-input
                     v-model="infoForm.officeAddress"
-                    maxlength="200"
-                    placeholder="请输入办公地址"
+                    placeholder="--"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -212,29 +134,52 @@
                   </el-upload>
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="所属区县" prop="areaId">
-                  <el-radio-group
-                    v-model="infoForm.areaId"
-                    placeholder="请选择所属区县"
-                    style="line-height: 22px"
-                  >
-                    <el-radio
-                      v-for="v in areaOptions"
-                      :key="v.id"
-                      :label="v.id"
-                      >{{ v.fullName }}</el-radio
-                    >
-                  </el-radio-group>
+                  <el-input
+                    v-model="infoForm.areaName"
+                    placeholder="--"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="主体企业" prop="companyId">
+                  <el-input
+                    v-model="infoForm.companyName"
+                    placeholder="--"
+                  ></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="24" v-if="isShowCompanyInfo">
+                <div class="company-info">
+                  <div class="company-info-items">
+                    <div :span="12">
+                      企业归属：{{ companyInfo.areaName || "--" }}
+                    </div>
+                    <div :span="12">
+                      联系人：{{ companyInfo.contactUser || "--" }}
+                    </div>
+                    <div :span="12">
+                      公司地址：{{ companyInfo.address || "--" }}
+                    </div>
+                  </div>
+                  <div class="company-info-items">
+                    <div :span="12">
+                      社会信用代码：{{ companyInfo.socialCreditAgency || "--" }}
+                    </div>
+                    <div :span="12">
+                      联系电话：{{ companyInfo.contactPhone || "--" }}
+                    </div>
+                  </div>
+                </div>
+              </el-col>
             </el-row>
           </el-form>
         </el-col>
         <el-col :span="10">
           <el-col :span="24"> 修改记录： </el-col>
           <el-col :span="24">
-            <el-timeline v-loading="record_loading">
+            <el-timeline v-loading="record_loading" style="max-height: 570px; overflow-y: scroll">
               <template v-if="updataRecordList.length">
                 <el-timeline-item
                   placement="top"
@@ -245,9 +190,9 @@
                     <h4 v-if="v.content">
                       更新
                       <p v-for="(item, index) in v.updataList" :key="index">
-                        将“{{ item.PropertyName }}”从“{{ item.OldValue }}”改为“{{
-                          item.NewValue
-                        }}”
+                        将“{{ item.PropertyName }}”从“{{
+                          item.OldValue
+                        }}”改为“{{ item.NewValue }}”
                       </p>
                     </h4>
                     <h4 v-else>
@@ -310,39 +255,9 @@ export default {
         officeAddress: "",
         systemIcon: "",
         areaId: "",
+        systemClassName: '',
       },
-      infoRules: {
-        systemName: {
-          required: true,
-          message: "请输入系统名称",
-          trigger: "blur",
-        },
-        systemClass: {
-          required: true,
-          message: "请输入系统分类",
-          trigger: "change",
-        },
-        systemType: {
-          required: true,
-          message: "请输入系统类型",
-          trigger: "change",
-        },
-        companyId: {
-          required: true,
-          message: "请输入主体企业",
-          trigger: "change",
-        },
-        areaId: {
-          required: true,
-          message: "请输入所属区县",
-          trigger: "change",
-        },
-        pincipalPhone: {
-          pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-          message: "请输入正确的手机号码",
-          trigger: "blur",
-        },
-      },
+      infoRules: {},
       value: "",
       companyOptions: [],
       listQuery_company: {
@@ -378,6 +293,7 @@ export default {
     async companyChange(val) {
       // 公司信息
       let { data } = await getCompanyInfoById(val);
+      this.infoForm.companyName = data.companyName;
       this.companyInfo = data;
       this.isShowCompanyInfo = true;
     },
@@ -436,10 +352,15 @@ export default {
     },
     async initForm() {
       let { data } = await getSystemDetail(this.systemId);
+      data.systemTypeName = this.systemTypeOptions.find(v => v.Id == data.systemType).FullName;
+      data.areaName = this.areaOptions.find(v => v.id == data.areaId).fullName;
       this.infoForm = data;
       this.initSystemClassList(data.systemType);
       await this.companyChange(data.companyId);
-      this.$forceUpdate();
+      this.$nextTick(() => {
+        this.infoForm.systemClassName = this.systemClassOptions.find(v => v.Id == this.infoForm.systemClass).ClassName;
+        this.$forceUpdate();
+      })
     },
   },
 };
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index 3b0a758..a336adb 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -23,7 +23,7 @@
         v-loading="infoForm_loading"
         label-width="100px"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="20" style="margin: unset;">
           <el-col :span="24">
             <el-col :span="12">
               <el-form-item label="主体企业" prop="companyId">
@@ -113,15 +113,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="备案号" prop="systemRecordNumber">
-              <el-input
-                v-model="infoForm.systemRecordNumber"
-                placeholder="请输入备案号"
-                maxlength="200"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="备案许可证" prop="recordLicense">
               <el-input
                 v-model="infoForm.recordLicense"
diff --git a/vue.config.js b/vue.config.js
index 0d36ddf..3da7707 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,6 +6,7 @@ function resolve(dir) {
 const CompressionPlugin = require('compression-webpack-plugin')
 
 module.exports = defineConfig({
+
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
   transpileDependencies: true,
@@ -48,6 +49,33 @@ module.exports = defineConfig({
       })
     ],
   },
+  chainWebpack(config) {
+    config.externals({
+      // 'monaco-editor': 'monaco-editor',
+      'echarts': 'echarts'
+    })
+
+    // when there are many pages, it will cause too many meaningless requests
+    config.plugins.delete('prefetch')
+
+    // set svg-sprite-loader
+    config.module
+      .rule('svg')
+      .exclude.add(resolve('src/icons'))
+      .end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]'
+      })
+      .end()
+   
+  },
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
--
libgit2 0.21.4