懒羊羊
2024-01-05 6c872a08cd597d8acbac3eeb7667665b59ea253d
Merge remote-tracking branch 'origin/master'
已修改3个文件
147 ■■■■ 文件已修改
jcdm-ui/src/views/index.vue 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/da/collectionParamConf/index.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/da/passingStationCollection/index.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/index.vue
@@ -4,10 +4,6 @@
      <el-col :sm="24" :lg="24">
        <blockquote class="text-warning" style="font-size: 14px">
          江宸MES管理系统
          <br />
          为了发挥上海中心城市的区域优势,吸引优秀人才,我公司在上海组建了产品研发中心,
          <br />
          员工规模已达30余人,开展发动机/变速箱总成、混合动力及新能源等方面的研究, 公司始终坚持在产品研发方面的大力投入,保持公司产品的领先性,满足客户需求。
        </blockquote>
        <hr />
@@ -17,30 +13,7 @@
      <el-col :sm="24" :lg="12" style="padding-left: 20px">
        <h2>江宸MES管理框架</h2>
        <p>
          一直想做一款后台管理系统,看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了江宸MES管理系统,她可以用于所有的Web应用程序,如网站管理后台,网站会员中心,CMS,CRM,OA等等,当然,您也可以对她进行深度定制,以做出更强系统。所有前端后台代码封装过后十分精简易上手,出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
        </p>
        <p>
          <b>当前版本:</b> <span>v{{ version }}</span>
        </p>
        <p>
          <el-tag type="danger">&yen;免费开源</el-tag>
        </p>
        <p>
          <el-button
            type="primary"
            size="mini"
            icon="el-icon-cloudy"
            plain
            @click="goTarget('http://admin@192.168.0.189:8442/r/Jcdm-Mes.git')"
            >访问码云</el-button
          >
          <el-button
            size="mini"
            icon="el-icon-s-home"
            plain
            @click="goTarget('http://www.nbjcae.com')"
            >访问主页</el-button
          >
        </p>
      </el-col>
@@ -83,85 +56,30 @@
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>联系信息</span>
            <span>信息</span>
          </div>
          <div class="body">
            <p>
              <i class="el-icon-s-promotion"></i> 官网:<el-link
                href="http://www.nbjcae.com"
                target="_blank"
                >http://www.nbjcae.com/</el-link
              >
            </p>
            <p>
              <i class="el-icon-user-solid"></i> QQ群:<s> ********* </s>
              <a href="http://www.nbjcae.com" target="_blank">*********</a>
            </p>
            <p>
              <i class="el-icon-chat-dot-round"></i> 微信:<a
                href="javascript:;"
                >/ *江宸</a
              >
            </p>
            <p>
              <i class="el-icon-money"></i> 支付宝:<a
                href="javascript:;"
                class="支付宝信息"
                >/ *江宸</a
              >
            </p>
          </div>
        </el-card>
      </el-col>
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>更新日志</span>
            <span>日志</span>
          </div>
          <el-collapse accordion>
            <el-collapse-item title="v3.8.6 - 2023-06-30">
              <ol>
                <li>支持登录IP黑名单限制</li>
                <li>新增监控页面图标显示</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v1.1.0 - 2019-11-11">
              <ol>
                <li>新增在线用户管理</li>
                <li>新增按钮组功能实现(批量删除、导出、清空)</li>
                <li>新增查询条件重置按钮</li>
                <li>新增Swagger全局Token配置</li>
                <li>新增后端参数校验</li>
                <li>修复字典管理页面的日期查询异常</li>
                <li>修改时间函数命名防止冲突</li>
                <li>去除菜单上级校验,默认为顶级</li>
                <li>修复用户密码无法修改问题</li>
                <li>修复菜单类型为按钮时不显示权限标识</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v1.0.0 - 2019-10-08">
              <ol>
                <li>前后端分离系统正式发布</li>
              </ol>
            </el-collapse-item>
          </el-collapse>
          <div class="body">
          </div>
        </el-card>
      </el-col>
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>捐赠支持</span>
            <span>支持</span>
          </div>
          <div class="body">
            <img
              src="@/assets/images/pay.png"
              alt="donate"
              width="100%"
            />
            <span style="display: inline-block; height: 30px; line-height: 30px"
              >你可以请作者喝杯咖啡表示鼓励</span
            >
          </div>
        </el-card>
      </el-col>
jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -125,36 +125,39 @@
        <el-table border v-loading="loading" :data="collectionParamConfList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
<!--          <el-table-column label="主键id" align="center" prop="id" />-->
          <el-table-column label="工序编号" align="center" width="130" prop="processesCode">
          <el-table-column label="产品编码" align="center" width="150" prop="productCode">
          </el-table-column>
          <el-table-column label="工序编号" align="center" width="80" prop="processesCode">
          </el-table-column>
          <el-table-column label="参数集编码" align="center" width="130" prop="parameterSetCode">
          </el-table-column>
          <el-table-column label="参数集名称" align="center" width="160" prop="parameterSetName">
          </el-table-column>
          <el-table-column label="采集参数ID" align="center" width="130" prop="collectParameterId">
          <el-table-column label="参数编码" align="center" width="130" prop="collectParameterId">
          </el-table-column>
          <el-table-column label="采集参数名称" align="center" width="160" prop="collectParameterName">
          <el-table-column label="参数名称" align="center" width="160" prop="collectParameterName">
          </el-table-column>
<!--          <el-table-column label="是否作为对比参数" align="center" prop="contrastParameterFlag">-->
<!--          </el-table-column>-->
          <el-table-column label="采集参数类型" align="center" width="130" prop="collectParameterType">
          <el-table-column label="采集地址" align="center" width="180" prop="gatherAddress">
          </el-table-column>
          <el-table-column label="采集参数单位" align="center" width="130" prop="collectParameterUnit">
          <el-table-column label="采集顺序" align="center" width="80" prop="gatherSequence">
          </el-table-column>
          <el-table-column label="数据描述" align="center" width="160" prop="Descriptives">
          <el-table-column label="参数类型" align="center" width="130" prop="collectParameterType">
          </el-table-column>
          <el-table-column label="单位" align="center" width="80" prop="collectParameterUnit">
          </el-table-column>
<!--          <el-table-column label="数据描述" align="center" width="160" prop="Descriptives">
          </el-table-column>-->
          <el-table-column label="上限值" align="center" prop="paramUpper">
          </el-table-column>
          <el-table-column label="下限值" align="center" prop="paramLower">
          </el-table-column>
          <el-table-column label="中心值" align="center" prop="paramCentral">
          </el-table-column>
          <el-table-column label="产品编码" align="center" width="150" prop="productCode">
          </el-table-column>
          <el-table-column label="采集地址" align="center" width="130" prop="gatherAddress">
          </el-table-column>
          <el-table-column label="采集顺序" align="center" width="130" prop="gatherSequence">
          </el-table-column>
          <el-table-column label="备注" align="center" width="160" prop="remarks">
          </el-table-column>
          <el-table-column label="创建用户" align="center" prop="createUser">
jcdm-ui/src/views/main/da/passingStationCollection/index.vue
@@ -83,8 +83,8 @@
      </el-table-column>
      <el-table-column label="工位编号" align="center" prop="locationCode">
      </el-table-column>
      <el-table-column label="设备编号" align="center" prop="equipmentNo">
      </el-table-column>
<!--      <el-table-column label="设备编号" align="center" prop="equipmentNo">
      </el-table-column>-->
      <el-table-column label="入站时间" align="center" prop="inboundTime" width="100">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
@@ -95,13 +95,13 @@
          <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="入站是否合格" align="center" prop="inRsSign">
<!--      <el-table-column label="入站是否合格" align="center" prop="inRsSign">
      </el-table-column>
      <el-table-column label="入站NG原因" align="center" prop="inMsgSign">
      </el-table-column>-->
      <el-table-column label="是否合格" align="center" prop="outRsSign">
      </el-table-column>
      <el-table-column label="出站是否合格" align="center" prop="outRsSign">
      </el-table-column>
      <el-table-column label="出站NG原因" align="center" prop="outMsgSign">
      <el-table-column label="NG原因" align="center" prop="outMsgSign">
      </el-table-column>
      <el-table-column label="采集时间" align="center" prop="collectionTime" width="180">
        <template slot-scope="scope">
@@ -183,16 +183,16 @@
            placeholder="请选择出站时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="入站是否合格" prop="inRsSign">
<!--        <el-form-item label="入站是否合格" prop="inRsSign">
          <el-input v-model="form.inRsSign" placeholder="请输入入站是否合格" />
        </el-form-item>
        <el-form-item label="入站NG原因" prop="inMsgSign">
          <el-input v-model="form.inMsgSign" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="出站是否合格" prop="outRsSign">
        </el-form-item>-->
        <el-form-item label="是否合格" prop="outRsSign">
          <el-input v-model="form.outRsSign" placeholder="请输入出站是否合格" />
        </el-form-item>
        <el-form-item label="出站NG原因" prop="outMsgSign">
        <el-form-item label="NG原因" prop="outMsgSign">
          <el-input v-model="form.outMsgSign" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="采集时间" prop="collectionTime">