数据采集录入的页面样式调整

.env.production

@@ -7,8 +7,8 @@ ENV = 'production'
 # 综合保税区管理系统/生产环境
 # VUE_APP_BASE_API = 'http://bsq-server.aseanbusiness.cn'
 # VUE_APP_BASE_API ='http://106.55.241.82:9001'
-# VUE_APP_BASE_API = 'http://116.252.25.42:8060/server'
-VUE_APP_BASE_API = 'http://bsq.bbwb.gxzf.gov.cn/server'
+ VUE_APP_BASE_API = 'http://localhost:9527'
+#VUE_APP_BASE_API = 'http://bsq.bbwb.gxzf.gov.cn/server'
 # 请求、响应数据加密
 VUE_APP_AES_ENCRYPT_ENABLED = 'false'
 # 请求数据加密秘钥串

package-lock.json

@@ -4514,7 +4514,7 @@
     },
     "crypto-js": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
       "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
     },
     "css-color-names": {

src/views/GATHER/index.vue

@@ -164,7 +164,7 @@
         </template>
       </el-table-column>
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="单位名称" fixed width="150"  align="center" prop="deptId_dictText">
+      <el-table-column label="综保区名称" fixed width="150"  align="center" prop="deptId_dictText">
         <template slot-scope="scope">
           {{ scope.row.deptId_dictText }}
         </template>
@@ -337,23 +337,6 @@
               >
           </template>
 
-          <!-- <template
-          v-if="
-            scope.row.approveStatus == 1 &&
-            checkPermi(['gather:GATHER:check'])
-          "
-          >
-            <el-button
-              @click="handleApprove(scope.row)"
-              style="margin: 0 2px"
-              size="mini"
-              type="text"
-              slot="reference"
-              >审核绩效</el-button
-            >
-          </template> -->
-
-          <!--              已采集，审核通过，未上报 -->
           <template
             v-if="
               scope.row.collStatus == 1 &&
@@ -439,21 +422,7 @@
         :rules="rules"
         label-width="120px"
       >
-        <!--        <el-form-item label="数据类型" prop="type">-->
-        <!--          <el-select-->
-        <!--            v-model="uploadForm.type"-->
-        <!--            placeholder="请选择数据类型"-->
-        <!--            clearable-->
-        <!--            filterable-->
-        <!--          >-->
-        <!--            <el-option-->
-        <!--              v-for="dict in typeList"-->
-        <!--              :key="dict.value + 'typeList'"-->
-        <!--              :label="dict.label"-->
-        <!--              :value="dict.value"-->
-        <!--            />-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
+
         <el-form-item label="文件" prop="linkUrl">
           <el-upload
             class="upload-demo"
@@ -487,18 +456,10 @@
       center
       :title="title"
       :visible.sync="open"
-      width="95%"
+      width="1080px"
       append-to-body
       :close-on-click-modal="false"
     >
-      <!-- <el-tabs
-        v-if="this.form.type == 0"
-        v-model="activeName"
-        type="border-card"
-        @tab-click="handleClick"
-      > -->
-
-
        <div
        v-for="(item, index) in tabList"
           :key="index + 'tabs'"
@@ -507,10 +468,10 @@
        >
 
        <el-col :span="24"
-       style="border:1px solid rgba(0, 0, 0, .05); margin-bottom: 5px; padding: 4px;"
+       style=" margin-bottom: 5px; padding: 4px;"
        >
-        <p style="font-weight: 600;margin:0;margin-bottom: 5px; font-size: 17px;">{{ item.normName }}</p>
-
+<!--        <p style="font-weight: 600;margin:0;margin-bottom: 5px; font-size: 17px;">{{ item.normName }}</p>-->
+         <el-divider content-position="left" ><span style="font-weight: bold; font-size: 16px">{{ item.normName }}</span></el-divider>
           <template v-for="listItem in form.feeLists">
               <el-form
 
@@ -526,11 +487,9 @@
                 :ref="'form' + listItem.normfeeId"
                 :key="listItem.normfeeId"
                 :disabled="listItem.sendValue == 1 || (listItem.sendValue == undefined)"
-                label-width="350px"
+                label-width="360px"
               >
-              <!-- <span>{{ listItem.sendValue == 1 }}</span> -->
-
-                <el-col :span="8">
+                <el-col :span="12">
                   <el-form-item
 
                   style="padding:10px;"
@@ -541,86 +500,17 @@
                   >
 
                     <el-input
+                      size="small"
                       v-model="listItem.collCalue"
-                      :placeholder="'请输入' + listItem.normfeeName"
+                      style="width: 150px"
                     ></el-input>
                   </el-form-item>
                 </el-col>
               </el-form>
             </template>
       </el-col>
-          <!-- <el-col :span="8" v-else
-          style="padding:10px;border:1px solid rgba(0, 0, 0, .05);width: 32%;margin: 5px;"
-          >
-            {{ item.normName }}
-            <template v-for="listItem in form.feeLists">
-              <el-form
-                v-if="listItem.normId == item.normId"
-                :rules="
-                  validatorList(
-                    listItem.normfeeCode,
-                    listItem.normfeeName,
-                    listItem.sendValue
-                  )
-                "
-                :model="listItem"
-                :ref="'form' + listItem.normfeeId"
-                :key="listItem.normfeeId"
-                :disabled="listItem.sendValue == 1"
-              >
-                <el-col :span="24">
-                  <el-form-item
-                    :label="
-                      listItem.normfeeName + '（' + listItem.funitName + '）'
-                    "
-                    prop="collCalue"
-                  >
-
-                    <el-input
-                      v-model="listItem.collCalue"
-                      :placeholder="'请输入' + listItem.normfeeName"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-form>
-            </template>
-          </el-col> -->
-
-         <!-- <template v-for="listItem in form.feeLists">
-              <el-form
-                v-if="listItem.normId == item.normId"
-                :rules="
-                  validatorList(
-                    listItem.normfeeCode,
-                    listItem.normfeeName,
-                    listItem.sendValue
-                  )
-                "
-                :model="listItem"
-                :ref="'form' + listItem.normfeeId"
-                :key="listItem.normfeeId"
-                :disabled="listItem.sendValue == 1"
-              >
-                <el-col :span="8">
-                  <el-form-item
-                    :label="
-                      listItem.normfeeName + '（' + listItem.funitName + '）'
-                    "
-                    prop="collCalue"
-                  >
-
-                    <el-input
-                      v-model="listItem.collCalue"
-                      :placeholder="'请输入' + listItem.normfeeName"
-                    ></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-form>
-            </template> -->
-
        </div>
 
-      <!-- </el-tabs> -->
 
       <div slot="footer" class="dialog-footer">
         <el-button v-if="checkPermi(['gather:GATHER:add'])" type="primary" @click="submitForm('add')">确 定</el-button>
@@ -647,7 +537,7 @@
        >
 
        <el-col :span="24"
-       style="border:1px solid rgba(0, 0, 0, .05); margin-bottom: 5px; padding: 4px"
+       style="border:1px solid rgba(0, 0, 0, .05); margin-bottom: 5px; padding: 4px;border-radius: 10px"
        >
         <p style="font-weight: 600;margin:0; margin-bottom: 5px; font-size: 17px;">{{ item.normName }}</p>
 
@@ -985,7 +875,6 @@ export default {
         updateTime: null,
         updateBy: null,
         delFlag: null,
-        deptId: null,
         type: null,
         year: null,
         month: null,
@@ -1546,7 +1435,7 @@ export default {
           });
         });
       }
-      
+
       let msg = "";
       Promise.all(p)
         .then(() => {

src/views/norm/feeindex.vue

@@ -1,8 +1,8 @@
 <template>
   <el-dialog
-    title="指标权重明细"
+    title="指标管理"
     :visible.sync="isShowNormDialog"
-    :width="'80%'"
+    width="1280px"
     :close-on-click-modal="false"
     :before-close="closeHandler"
   >
@@ -75,9 +75,9 @@
         <el-table-column
         fixed
           label="指标参数名称"
-          align="center"
+          align="left"
           prop="fname"
-          width="150"
+          width="250"
           show-overflow-tooltip
         />
 <!--        <el-table-column label="分类占比" width="80" show-overflow-tooltip align="center" prop="normRatio" />-->
@@ -114,11 +114,27 @@
         </template>
       </el-table-column>
         <el-table-column
-          label="权数"
+          label="分数"
           align="center"
           prop="fnumber"
           width="80"
         />
+
+        <el-table-column
+          label="是否启用"
+          align="center"
+          prop="status"
+          width="100"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.status"
+              @change="changeSwitchHandler(scope.row)"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            ></el-switch>
+          </template>
+        </el-table-column>
         <el-table-column
           label="排序"
           align="center"
@@ -126,14 +142,14 @@
           width="80"
         />
         <el-table-column
-          label="绩效公差上下公差占比"
+          label="绩效公差上下公差(%)"
           align="center"
           prop="msRetio"
           width="180"
           show-overflow-tooltip
         />
         <el-table-column
-          label="采集公差上下公差占比"
+          label="采集公差上下公差(%)"
           align="center"
           prop="dfRetio"
           width="180"
@@ -150,31 +166,6 @@
           prop="meritsValue"
           width="130"
         />
-
-        <el-table-column
-          label="是否启用"
-          align="center"
-          prop="status"
-          width="100"
-        >
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              @change="changeSwitchHandler(scope.row)"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-            ></el-switch>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="启用时间" align="center" prop="startTime" />
-        <el-table-column label="停用时间" align="center" prop="stopTime" /> -->
-        <el-table-column
-          label="备注"
-          align="center"
-          prop="remark"
-          width="220"
-          show-overflow-tooltip
-        />
         <el-table-column label="操作" align="center" fixed="right" width="220">
           <template slot-scope="scope">
             <el-button
@@ -216,70 +207,73 @@
       <el-dialog
         :title="title"
         :visible.sync="open"
-        width="600px"
+        width="1080px"
         :close-on-click-modal="false"
         append-to-body
       >
         <el-form ref="form" :model="form" :rules="rules" label-width="170px">
-          <el-form-item label="指标编码" prop="fcode">
-            <el-input v-model="form.fcode"></el-input>
-          </el-form-item>
-          <el-form-item label="权数" prop="fnumber">
-            <el-input
-              v-model="form.fnumber"
-              aria-placeholder="请输入数值"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="排序" prop="sort">
-            <el-input
-              v-model="form.sort"
-              aria-placeholder="请输入数值"
-            ></el-input>
-          </el-form-item>
-
-          <el-form-item label="分类占比" prop="normRatio">
-            <el-input v-model="form.normRatio"></el-input>
-          </el-form-item>
-
-          <el-form-item label="计量单位" prop="funit">
-            <el-select
-              v-model="form.funit"
-              @change="selUnitHandler"
-              placeholder="请选择"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="dict in unitSel"
-                :key="dict.dictCode"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="指标参数名称" prop="fname">
-            <el-input v-model="form.fname"></el-input>
-          </el-form-item>
+          <el-row>
+            <el-col span="12">
+              <el-form-item label="指标参数名称" prop="fname">
+                <el-input v-model="form.fname" ></el-input>
+              </el-form-item>
+              <el-form-item label="指标编码" prop="fcode">
+                <el-input v-model="form.fcode" :disabled="title.indexOf('修改')!==-1"></el-input>
+              </el-form-item>
+              <el-form-item label="分数" prop="fnumber">
+                <el-input
+                  v-model="form.fnumber"
+                  aria-placeholder="请输入数值"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="计量单位" prop="funit">
+                <el-select
+                  v-model="form.funit"
+                  @change="selUnitHandler"
+                  placeholder="请选择"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="dict in unitSel"
+                    :key="dict.dictCode"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="排序" prop="sort">
+                <el-input
+                  v-model="form.sort"
+                  aria-placeholder="请输入数值"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="分类占比" prop="normRatio">
+                <el-input v-model="form.normRatio"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col span="12">
 
-          <el-form-item label="采集公差上下公差占比" prop="dfRetio">
-            <el-input v-model="form.dfRetio"></el-input>
-          </el-form-item>
+              <el-form-item label="采集参考值" prop="collValue">
+                <el-input v-model="form.collValue"></el-input>
+              </el-form-item>
 
-          <el-form-item label="绩效公差上下公差占比" prop="dfRetio">
-            <el-input v-model="form.msRetio"></el-input>
-          </el-form-item>
+              <el-form-item label="绩效参考值" prop="meritsValue">
+                <el-input v-model="form.meritsValue"></el-input>
+              </el-form-item>
+              <el-form-item label="采集公差上下公差(%)" prop="dfRetio">
+                <el-input v-model="form.dfRetio"></el-input>
+              </el-form-item>
 
-          <el-form-item label="采集参考值" prop="collValue">
-            <el-input v-model="form.collValue"></el-input>
-          </el-form-item>
+              <el-form-item label="绩效公差上下公差(%)" prop="dfRetio">
+                <el-input v-model="form.msRetio"></el-input>
+              </el-form-item>
 
-          <el-form-item label="绩效参考值" prop="meritsValue">
-            <el-input v-model="form.meritsValue"></el-input>
-          </el-form-item>
 
-          <el-form-item label="备注">
-            <el-input type="textarea" v-model="form.remark"></el-input>
-          </el-form-item>
+              <el-form-item label="备注">
+                <el-input type="textarea" v-model="form.remark"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -364,22 +358,6 @@ export default {
         pageNum: 1,
         pageSize: 10,
         id: null,
-        // createTime: null,
-        // createBy: null,
-        // updateTime: null,
-        // updateBy: null,
-        // delFlag: null,
-        // deptId: null,
-        // normId: null,
-        // normRatio: null,
-        // fname: null,
-        // funit: null,
-        // fnumber: null,
-        // fvalue: null,
-        // status: null,
-        // startTime: null,
-        // stopTime: null,
-        // remark: null
       },
       // 表单参数
       form: {},
@@ -518,7 +496,7 @@ export default {
         this.form = response.data;
         this.open = true;
         // this.form = row;
-        this.title = "修改指标权重明细";
+        this.title = "修改指标";
       });
     },
     /** 提交按钮 */

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://bsq.bbwb.gxzf.gov.cn/server`,
+        target: `http://localhost:9527`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -134,4 +134,4 @@ module.exports = {
         }
       )
   }
-}
+}